Removed the dependency in GainControlImpl on the ProcessingComponent class

webrtc/modules/audio_processing/audio_processing_impl.cc

Index: 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 cb225870a36b1955393a84967a5ce3672f768f8c..9d8ff42e16f3d1b7caa6aad651f25f6f6cc1e1f2 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -81,13 +81,11 @@ static_assert(AudioProcessing::kNoError == 0, "kNoError must be zero");
 
 struct AudioProcessingImpl::ApmPublicSubmodules {
   ApmPublicSubmodules()
-      : echo_cancellation(nullptr),
-        echo_control_mobile(nullptr),
-        gain_control(nullptr) {}
+      : echo_cancellation(nullptr), echo_control_mobile(nullptr) {}

[the sun, 2016/03/09 09:42:10]

Need a rebase?

[peah-webrtc, 2016/03/09 12:23:39]

Yes definitely, I delayed that though as that would introduce noise in the code
review. 

   // Accessed externally of APM without any lock acquired.
   std::unique_ptr<EchoCancellationImpl> echo_cancellation;
   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;
@@ -172,8 +170,8 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config,
         new EchoCancellationImpl(this, &crit_render_, &crit_capture_));
     public_submodules_->echo_control_mobile =
         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(
@@ -183,10 +181,8 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config,
     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);
@@ -317,6 +313,7 @@ int AudioProcessingImpl::InitializeLocked() {
     }
   }
 
+  InitializeGainController();
   InitializeEchoCanceller();
   InitializeEchoControlMobile();
   InitializeExperimentalAgc();
@@ -1101,7 +1098,7 @@ GainControl* AudioProcessingImpl::gain_control() const {
   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 {
@@ -1135,7 +1132,8 @@ bool AudioProcessingImpl::is_data_processed() const {
       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;
   }
 
@@ -1199,7 +1197,7 @@ void AudioProcessingImpl::InitializeExperimentalAgc() {
   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));
     }
@@ -1254,6 +1252,10 @@ void AudioProcessingImpl::InitializeEchoCanceller() {
   public_submodules_->echo_cancellation->Initialize();
 }
 
+void AudioProcessingImpl::InitializeGainController() {
+  public_submodules_->gain_control->Initialize();
+}
+
 void AudioProcessingImpl::InitializeEchoControlMobile() {
   public_submodules_->echo_control_mobile->Initialize();
 }