diff --git a/modules/audio_processing/gain_controller2.cc b/modules/audio_processing/gain_controller2.cc index 9b8cf45fc6..2a327449df 100644 --- a/modules/audio_processing/gain_controller2.cc +++ b/modules/audio_processing/gain_controller2.cc @@ -47,14 +47,14 @@ void GainController2::Process(AudioBuffer* audio) { audio->num_frames()); // Apply fixed gain first, then the adaptive one. gain_applier_.ApplyGain(float_frame); - if (adaptive_digital_mode_) { + if (config_.adaptive_digital.enabled) { adaptive_agc_->Process(float_frame, limiter_.LastAudioLevel()); } limiter_.Process(float_frame); } void GainController2::NotifyAnalogLevel(int level) { - if (analog_level_ != level && adaptive_digital_mode_) { + if (analog_level_ != level && config_.adaptive_digital.enabled) { adaptive_agc_->Reset(); } analog_level_ = level; @@ -72,7 +72,6 @@ void GainController2::ApplyConfig( limiter_.Reset(); } gain_applier_.SetGainFactor(DbToRatio(config_.fixed_digital.gain_db)); - adaptive_digital_mode_ = config_.adaptive_digital.enabled; adaptive_agc_.reset(new AdaptiveAgc(data_dumper_.get(), config_)); } diff --git a/modules/audio_processing/gain_controller2.h b/modules/audio_processing/gain_controller2.h index 013385d9d3..3a11810bb5 100644 --- a/modules/audio_processing/gain_controller2.h +++ b/modules/audio_processing/gain_controller2.h @@ -49,7 +49,6 @@ class GainController2 { std::unique_ptr adaptive_agc_; Limiter limiter_; int analog_level_ = -1; - bool adaptive_digital_mode_ = true; RTC_DISALLOW_COPY_AND_ASSIGN(GainController2); };