commit bb9edbd04852fd0932642369b3938995c7e705fb
author peah <peah@webrtc.org> Thu Mar 10 12:54:25 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Mar 10 20:56:50 2016 +0000
tree 219f90bbe5823f384a8b76bd3a9d85a01a26c4e4
parent f0dcfe2c8143f44f07526a919d15bcf4858c6dd5

Removing dependency of the EchoControlMobileImpl class on ProcessingComponent.

BUG=webrtc:5351

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

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

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 7715134..119eee9 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -80,13 +80,10 @@
 static_assert(AudioProcessing::kNoError == 0, "kNoError must be zero");
 
 struct AudioProcessingImpl::ApmPublicSubmodules {
-  ApmPublicSubmodules()
-      : echo_cancellation(nullptr),
-        echo_control_mobile(nullptr),
-        gain_control(nullptr) {}
+  ApmPublicSubmodules() : gain_control(nullptr) {}
   // Accessed externally of APM without any lock acquired.
   std::unique_ptr<EchoCancellationImpl> echo_cancellation;
-  EchoControlMobileImpl* echo_control_mobile;
+  std::unique_ptr<EchoControlMobileImpl> echo_control_mobile;
   GainControlImpl* gain_control;
   std::unique_ptr<HighPassFilterImpl> high_pass_filter;
   std::unique_ptr<LevelEstimatorImpl> level_estimator;
@@ -174,8 +171,8 @@
 
     public_submodules_->echo_cancellation.reset(
         new EchoCancellationImpl(this, &crit_render_, &crit_capture_));
-    public_submodules_->echo_control_mobile =
-        new EchoControlMobileImpl(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_->high_pass_filter.reset(
@@ -190,8 +187,6 @@
         new GainControlForExperimentalAgc(public_submodules_->gain_control,
                                           &crit_capture_));
     private_submodules_->component_list.push_back(
-        public_submodules_->echo_control_mobile);
-    private_submodules_->component_list.push_back(
         public_submodules_->gain_control);
   }
 
@@ -324,6 +319,7 @@
   }
 
   InitializeEchoCanceller();
+  InitializeEchoControlMobile();
   InitializeExperimentalAgc();
   InitializeTransient();
   InitializeBeamformer();
@@ -1088,7 +1084,7 @@
 EchoControlMobile* AudioProcessingImpl::echo_control_mobile() const {
   // Adding a lock here has no effect as it allows any access to the submodule
   // from the returned pointer.
-  return public_submodules_->echo_control_mobile;
+  return public_submodules_->echo_control_mobile.get();
 }
 
 GainControl* AudioProcessingImpl::gain_control() const {
@@ -1130,7 +1126,8 @@
   if (capture_nonlocked_.beamformer_enabled ||
       public_submodules_->high_pass_filter->is_enabled() ||
       public_submodules_->noise_suppression->is_enabled() ||
-      public_submodules_->echo_cancellation->is_enabled()) {
+      public_submodules_->echo_cancellation->is_enabled() ||
+      public_submodules_->echo_control_mobile->is_enabled()) {
     return true;
   }
 
@@ -1250,6 +1247,10 @@
   public_submodules_->echo_cancellation->Initialize();
 }
 
+void AudioProcessingImpl::InitializeEchoControlMobile() {
+  public_submodules_->echo_control_mobile->Initialize();
+}
+
 void AudioProcessingImpl::InitializeLevelEstimator() {
   public_submodules_->level_estimator->Initialize();
 }