commit ecf6315a7f4c6ac242fa63afdc4fe10dedb58bc6
author Alessio Bazzica <alessiob@webrtc.org> Wed Nov 21 10:47:37 2018
committer Commit Bot <commit-bot@chromium.org> Wed Nov 21 15:01:28 2018
tree 9bb9d4f6056ed342eb0bb01dc99cb3ee223dc451
parent 8da7b350cf93beff4ecef4b3aced5b80707dcc1b

AGC2 adaptive digital: remove unnecessary flag.

Bug: webrtc:7494
Change-Id: I03d854ab082cb8fcf3f01a431c06496f93d3063b
Reviewed-on: https://webrtc-review.googlesource.com/c/111601
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25729}

modules/audio_processing/gain_controller2.cc

diff --git a/modules/audio_processing/gain_controller2.cc b/modules/audio_processing/gain_controller2.cc
index 9b8cf45..2a32744 100644
--- a/modules/audio_processing/gain_controller2.cc
+++ b/modules/audio_processing/gain_controller2.cc
@@ -47,14 +47,14 @@
                                     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 @@
     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_));
 }
 

modules/audio_processing/gain_controller2.h

diff --git a/modules/audio_processing/gain_controller2.h b/modules/audio_processing/gain_controller2.h
index 013385d..3a11810 100644
--- a/modules/audio_processing/gain_controller2.h
+++ b/modules/audio_processing/gain_controller2.h
@@ -49,7 +49,6 @@
   std::unique_ptr<AdaptiveAgc> adaptive_agc_;
   Limiter limiter_;
   int analog_level_ = -1;
-  bool adaptive_digital_mode_ = true;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(GainController2);
 };