commit b624d8c852fbe8eff8ff8888f673191b8a411421
author peah <peah@webrtc.org> Sat Mar 05 03:01:14 2016 -0800
committer Commit bot <commit-bot@chromium.org> Sat Mar 05 11:01:22 2016 +0000
tree dd7b9103136abeb30791d649780ff070ce7b914a
parent 6ec641b0ee9bb1a5d941050221964ac865ba3d2c

Removed the inheritance from ProcessingComponent for EchoCancellerImpl.

BUG=webrtc:5352

Committed: https://crrev.com/3af0a009f8a7f2dfb630a4f4730044cbbd95bee8
Cr-Commit-Position: refs/heads/master@{#11876}

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

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

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 a92f13c..9c587c2 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -85,7 +85,7 @@
         echo_control_mobile(nullptr),
         gain_control(nullptr) {}
   // Accessed externally of APM without any lock acquired.
-  EchoCancellationImpl* echo_cancellation;
+  std::unique_ptr<EchoCancellationImpl> echo_cancellation;
   EchoControlMobileImpl* echo_control_mobile;
   GainControlImpl* gain_control;
   std::unique_ptr<HighPassFilterImpl> high_pass_filter;
@@ -168,8 +168,8 @@
     rtc::CritScope cs_render(&crit_render_);
     rtc::CritScope cs_capture(&crit_capture_);
 
-    public_submodules_->echo_cancellation =
-        new EchoCancellationImpl(this, &crit_render_, &crit_capture_);
+    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_->gain_control =
@@ -185,9 +185,6 @@
     public_submodules_->gain_control_for_experimental_agc.reset(
         new GainControlForExperimentalAgc(public_submodules_->gain_control,
                                           &crit_capture_));
-
-    private_submodules_->component_list.push_back(
-        public_submodules_->echo_cancellation);
     private_submodules_->component_list.push_back(
         public_submodules_->echo_control_mobile);
     private_submodules_->component_list.push_back(
@@ -322,6 +319,7 @@
     }
   }
 
+  InitializeEchoCanceller();
   InitializeExperimentalAgc();
   InitializeTransient();
   InitializeBeamformer();
@@ -423,6 +421,8 @@
     item->SetExtraOptions(config);
   }
 
+  public_submodules_->echo_cancellation->SetExtraOptions(config);
+
   if (capture_.transient_suppressor_enabled !=
       config.Get<ExperimentalNs>().enabled) {
     capture_.transient_suppressor_enabled =
@@ -1087,7 +1087,7 @@
 EchoCancellation* AudioProcessingImpl::echo_cancellation() const {
   // Adding a lock here has no effect as it allows any access to the submodule
   // from the returned pointer.
-  return public_submodules_->echo_cancellation;
+  return public_submodules_->echo_cancellation.get();
 }
 
 EchoControlMobile* AudioProcessingImpl::echo_control_mobile() const {
@@ -1134,7 +1134,8 @@
   // modify the data.
   if (capture_nonlocked_.beamformer_enabled ||
       public_submodules_->high_pass_filter->is_enabled() ||
-      public_submodules_->noise_suppression->is_enabled()) {
+      public_submodules_->noise_suppression->is_enabled() ||
+      public_submodules_->echo_cancellation->is_enabled()) {
     return true;
   }
 
@@ -1249,6 +1250,10 @@
                                                     proc_sample_rate_hz());
 }
 
+void AudioProcessingImpl::InitializeEchoCanceller() {
+  public_submodules_->echo_cancellation->Initialize();
+}
+
 void AudioProcessingImpl::InitializeLevelEstimator() {
   public_submodules_->level_estimator->Initialize();
 }