commit bfa971198d8f7047e6f74840307b3c1a17df6fb4
author peah <peah@webrtc.org> Thu Mar 10 21:09:04 2016 -0800
committer Commit bot <commit-bot@chromium.org> Fri Mar 11 05:09:11 2016 +0000
tree 3fee8bf70b8fa3e62d23071a416cde82cb43344d
parent 932fdd947843bbd24963938b755b1708436e887e

Removed the dependency in GainControlImpl on the ProcessingComponent class

BUG=webrtc:5353

Review URL: https://codereview.webrtc.org/1768943002

Cr-Commit-Position: refs/heads/master@{#11949}

webrtc/modules/audio_processing/audio_processing_impl.cc

diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index 119eee9..37a824b 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -80,11 +80,11 @@
 static_assert(AudioProcessing::kNoError == 0, "kNoError must be zero");
 
 struct AudioProcessingImpl::ApmPublicSubmodules {
-  ApmPublicSubmodules() : gain_control(nullptr) {}
+  ApmPublicSubmodules() {}
   // Accessed externally of APM without any lock acquired.
   std::unique_ptr<EchoCancellationImpl> echo_cancellation;
   std::unique_ptr<EchoControlMobileImpl> echo_control_mobile;
-  GainControlImpl* gain_control;
+  std::unique_ptr<GainControlImpl> gain_control;
   std::unique_ptr<HighPassFilterImpl> high_pass_filter;
   std::unique_ptr<LevelEstimatorImpl> level_estimator;
   std::unique_ptr<NoiseSuppressionImpl> noise_suppression;
@@ -173,8 +173,8 @@
         new EchoCancellationImpl(this, &crit_render_, &crit_capture_));
     public_submodules_->echo_control_mobile.reset(
         new EchoControlMobileImpl(this, &crit_render_, &crit_capture_));
-    public_submodules_->gain_control =
-        new GainControlImpl(this, &crit_capture_, &crit_capture_);
+    public_submodules_->gain_control.reset(
+        new GainControlImpl(this, &crit_capture_, &crit_capture_));
     public_submodules_->high_pass_filter.reset(
         new HighPassFilterImpl(&crit_capture_));
     public_submodules_->level_estimator.reset(
@@ -184,10 +184,8 @@
     public_submodules_->voice_detection.reset(
         new VoiceDetectionImpl(&crit_capture_));
     public_submodules_->gain_control_for_experimental_agc.reset(
-        new GainControlForExperimentalAgc(public_submodules_->gain_control,
-                                          &crit_capture_));
-    private_submodules_->component_list.push_back(
-        public_submodules_->gain_control);
+        new GainControlForExperimentalAgc(
+            public_submodules_->gain_control.get(), &crit_capture_));
   }
 
   SetExtraOptions(config);
@@ -318,6 +316,7 @@
     }
   }
 
+  InitializeGainController();
   InitializeEchoCanceller();
   InitializeEchoControlMobile();
   InitializeExperimentalAgc();
@@ -1093,7 +1092,7 @@
   if (constants_.use_experimental_agc) {
     return public_submodules_->gain_control_for_experimental_agc.get();
   }
-  return public_submodules_->gain_control;
+  return public_submodules_->gain_control.get();
 }
 
 HighPassFilter* AudioProcessingImpl::high_pass_filter() const {
@@ -1127,7 +1126,8 @@
       public_submodules_->high_pass_filter->is_enabled() ||
       public_submodules_->noise_suppression->is_enabled() ||
       public_submodules_->echo_cancellation->is_enabled() ||
-      public_submodules_->echo_control_mobile->is_enabled()) {
+      public_submodules_->echo_control_mobile->is_enabled() ||
+      public_submodules_->gain_control->is_enabled()) {
     return true;
   }
 
@@ -1191,7 +1191,7 @@
   if (constants_.use_experimental_agc) {
     if (!private_submodules_->agc_manager.get()) {
       private_submodules_->agc_manager.reset(new AgcManagerDirect(
-          public_submodules_->gain_control,
+          public_submodules_->gain_control.get(),
           public_submodules_->gain_control_for_experimental_agc.get(),
           constants_.agc_startup_min_volume));
     }
@@ -1247,6 +1247,10 @@
   public_submodules_->echo_cancellation->Initialize();
 }
 
+void AudioProcessingImpl::InitializeGainController() {
+  public_submodules_->gain_control->Initialize();
+}
+
 void AudioProcessingImpl::InitializeEchoControlMobile() {
   public_submodules_->echo_control_mobile->Initialize();
 }