Removed the AudioProcessing dependency in 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 9c587c25c7940b1cebb230caba6d6ea807eba628..5be6c5944ecb4768796884d16b6955229f0eceba 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -715,7 +715,23 @@ int AudioProcessingImpl::ProcessStreamLocked() {
   public_submodules_->high_pass_filter->ProcessCaptureAudio(ca);
   RETURN_ON_ERR(public_submodules_->gain_control->AnalyzeCaptureAudio(ca));
   public_submodules_->noise_suppression->AnalyzeCaptureAudio(ca);
-  RETURN_ON_ERR(public_submodules_->echo_cancellation->ProcessCaptureAudio(ca));
+
+  // Ensure that not both the AEC and AECM are active at the same time.
+  // TODO(peah): Simplify once the public API Enable functions for these
+  // are moved to APM.
+  if (public_submodules_->echo_cancellation->is_enabled() &&

[the sun, 2016/03/11 10:14:12]

Make this a DCHECK and move it to the beginning of the method.

+      public_submodules_->echo_control_mobile->is_enabled()) {
+    return AudioProcessing::kBadParameterError;
+  }
+
+  // Ensure that the stream delay was set before the call to the
+  // AEC ProcessCaptureAudio function.
+  if (!was_stream_delay_set()) {

[the sun, 2016/03/11 10:14:13]

Likewise, this is a precondition, so move to beginning of method. It's also a
logic error (and one which we should make impossible by setting property at
construction) so make it a DCHECK.

+    return AudioProcessing::kBadParameterError;
+  }
+
+  RETURN_ON_ERR(public_submodules_->echo_cancellation->ProcessCaptureAudio(
+      ca, stream_delay_ms()));
 
   if (public_submodules_->echo_control_mobile->is_enabled() &&
       public_submodules_->noise_suppression->is_enabled()) {
@@ -1251,7 +1267,9 @@ void AudioProcessingImpl::InitializeNoiseSuppression() {
 }
 
 void AudioProcessingImpl::InitializeEchoCanceller() {
-  public_submodules_->echo_cancellation->Initialize();
+  public_submodules_->echo_cancellation->Initialize(
+      proc_sample_rate_hz(), num_reverse_channels(), num_output_channels(),
+      num_proc_channels());
 }
 
 void AudioProcessingImpl::InitializeLevelEstimator() {