commit 3daedb6c8837644816689248b663a84395e9c4bc
author Per Åhgren <peah@webrtc.org> Fri Nov 22 12:11:40 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Nov 22 15:32:55 2019 +0000
tree c2f2dd7392cc74d8f4651ed5d2a63dee5ba4f0ce
parent 5b82ba37cc9be0afee4cc4e3d1132bc663cdb376

Making the Analog AGC properly support multi-channel

This CL adds proper multi-channel support to the analog AGC.

Beyond that, it prepares adding multi-channel support to the digital
AGC by removing the tight dependency between the analog and digital
AGC codes.

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

modules/audio_processing/audio_processing_impl.h

diff --git a/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h
index a5717d3..61bf151 100644
--- a/modules/audio_processing/audio_processing_impl.h
+++ b/modules/audio_processing/audio_processing_impl.h
@@ -325,23 +325,11 @@
     Submodules(std::unique_ptr<CustomProcessing> capture_post_processor,
                std::unique_ptr<CustomProcessing> render_pre_processor,
                rtc::scoped_refptr<EchoDetector> echo_detector,
-               std::unique_ptr<CustomAudioAnalyzer> capture_analyzer,
-               int agc_startup_min_volume,
-               int agc_clipped_level_min,
-               bool use_experimental_agc,
-               bool use_experimental_agc_agc2_level_estimation,
-               bool use_experimental_agc_agc2_digital_adaptive)
+               std::unique_ptr<CustomAudioAnalyzer> capture_analyzer)
         : echo_detector(std::move(echo_detector)),
           capture_post_processor(std::move(capture_post_processor)),
           render_pre_processor(std::move(render_pre_processor)),
-          capture_analyzer(std::move(capture_analyzer)) {
-      if (use_experimental_agc) {
-        agc_manager = std::make_unique<AgcManagerDirect>(
-            agc_startup_min_volume, agc_clipped_level_min,
-            use_experimental_agc_agc2_level_estimation,
-            use_experimental_agc_agc2_digital_adaptive);
-      }
-    }
+          capture_analyzer(std::move(capture_analyzer)) {}
     // Accessed internally from capture or during initialization.
     std::unique_ptr<AgcManagerDirect> agc_manager;
     std::unique_ptr<GainControlImpl> gain_control;
@@ -381,15 +369,29 @@
 
   // APM constants.
   const struct ApmConstants {
-    ApmConstants(int agc_clipped_level_min,
+    ApmConstants(int agc_startup_min_volume,
+                 int agc_clipped_level_min,
+                 bool use_experimental_agc,
+                 bool use_experimental_agc_agc2_level_estimation,
+                 bool use_experimental_agc_agc2_digital_adaptive,
                  bool experimental_multi_channel_render_support,
                  bool experimental_multi_channel_capture_support)
-        : agc_clipped_level_min(agc_clipped_level_min),
+        : agc_startup_min_volume(agc_startup_min_volume),
+          agc_clipped_level_min(agc_clipped_level_min),
+          use_experimental_agc(use_experimental_agc),
+          use_experimental_agc_agc2_level_estimation(
+              use_experimental_agc_agc2_level_estimation),
+          use_experimental_agc_agc2_digital_adaptive(
+              use_experimental_agc_agc2_digital_adaptive),
           experimental_multi_channel_render_support(
               experimental_multi_channel_render_support),
           experimental_multi_channel_capture_support(
               experimental_multi_channel_capture_support) {}
+    int agc_startup_min_volume;
     int agc_clipped_level_min;
+    bool use_experimental_agc;
+    bool use_experimental_agc_agc2_level_estimation;
+    bool use_experimental_agc_agc2_digital_adaptive;
     bool experimental_multi_channel_render_support;
     bool experimental_multi_channel_capture_support;
   } constants_;