Removed the inheritance from ProcessingComponent for EchoCancellerImpl.

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 dbc04b7cf34f5fedf29b613139ba93a5b8c281fe..bc37195bcdadcb8717014dc1054f5ebbbc012617 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -85,7 +85,7 @@ struct AudioProcessingImpl::ApmPublicSubmodules {
         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 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config,
     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 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config,
     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 @@ int AudioProcessingImpl::InitializeLocked() {
     }
   }
 
+  InitializeEchoCanceller();
   InitializeExperimentalAgc();
   InitializeTransient();
   InitializeBeamformer();
@@ -423,6 +421,8 @@ void AudioProcessingImpl::SetExtraOptions(const Config& config) {
     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 @@ int AudioProcessingImpl::StopDebugRecording() {
 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 {
@@ -1145,6 +1145,10 @@ bool AudioProcessingImpl::is_data_processed() const {
     }
   }
 
+  if (public_submodules_->echo_cancellation->is_enabled()) {

[the sun, 2016/03/03 13:13:05]

I think you can put this in the first conditional in this function, with the hpf
and ns equivalents. Or make things consistent by having a separate condition for
each sub component.

[peah-webrtc, 2016/03/03 13:56:16]

Done.

+    return true;
+  }
+
   // The capture data is otherwise unchanged.
   return false;
 }
@@ -1249,6 +1253,10 @@ void AudioProcessingImpl::InitializeNoiseSuppression() {
                                                     proc_sample_rate_hz());
 }
 
+void AudioProcessingImpl::InitializeEchoCanceller() {
+  public_submodules_->echo_cancellation->Initialize();
+}
+
 void AudioProcessingImpl::InitializeLevelEstimator() {
   public_submodules_->level_estimator->Initialize();
 }