commit b8c1be5b6e5d7a3d9c65aa126f0ba9c02c23fbcc
author Per Åhgren <peah@webrtc.org> Thu Nov 07 20:35:50 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Thu Nov 07 22:44:08 2019 +0000
tree 3314493692cf27d44a2f98a82da0ece1ae66f5f9
parent 6b838beb4d2afb2c288521d2782f881164e25f9a

Further AGC refactoring in preparation for adding multichannel support

Bug: webrtc:10859
Change-Id: If7d58a615a365a0b0f7b49e0cc2392b9bd5e2a0c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/159028
Commit-Queue: Per Åhgren <peah@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29736}

modules/audio_processing/audio_processing_impl.cc

diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index c718838..abfcc05 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -330,12 +330,10 @@
                  /* enabled= */ false,
                  /* enabled_agc2_level_estimator= */ false,
                  /* digital_adaptive_disabled= */ false,
-                 /* analyze_before_aec= */ false,
 #else
                  config.Get<ExperimentalAgc>().enabled,
                  config.Get<ExperimentalAgc>().enabled_agc2_level_estimator,
                  config.Get<ExperimentalAgc>().digital_adaptive_disabled,
-                 config.Get<ExperimentalAgc>().analyze_before_aec,
 #endif
                  !field_trial::IsEnabled(
                      "WebRTC-ApmExperimentalMultiChannelRenderKillSwitch"),
@@ -1288,13 +1286,6 @@
     submodules_.agc_manager->AnalyzePreProcess(
         capture_buffer->channels_const(), capture_buffer->num_channels(),
         capture_nonlocked_.capture_processing_format.num_frames());
-
-    if (constants_.use_experimental_agc_process_before_aec) {
-      submodules_.agc_manager->Process(
-          capture_buffer->channels_const()[0],
-          capture_nonlocked_.capture_processing_format.num_frames(),
-          capture_nonlocked_.capture_processing_format.sample_rate_hz());
-    }
   }
 
   if (submodule_states_.CaptureMultiBandSubModulesActive() &&
@@ -1379,8 +1370,7 @@
   }
 
   if (constants_.use_experimental_agc &&
-      submodules_.gain_control->is_enabled() &&
-      !constants_.use_experimental_agc_process_before_aec) {
+      submodules_.gain_control->is_enabled()) {
     submodules_.agc_manager->Process(
         capture_buffer->split_bands_const_f(0)[kBand0To8kHz],
         capture_buffer->num_frames_per_band(), capture_nonlocked_.split_rate);