Ensure that AEC3 is not run in tandem with AEC2

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 c253775f14e8bcf08d9881baf92439431a3d63a2..14d6a26d1a7d6cec84a88ad2f0b69a1b3428f646 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -1187,11 +1187,11 @@ int AudioProcessingImpl::ProcessCaptureStreamLocked() {
 
   if (private_submodules_->echo_canceller3) {
     private_submodules_->echo_canceller3->ProcessCapture(capture_buffer, false);
+  } else {
+    RETURN_ON_ERR(public_submodules_->echo_cancellation->ProcessCaptureAudio(
+        capture_buffer, stream_delay_ms()));
   }
 
-  RETURN_ON_ERR(public_submodules_->echo_cancellation->ProcessCaptureAudio(

[aleloi, 2017/02/03 15:24:11]

Did we rely on that public_submodules_->echo_cancellation->enabled_ was false
previously?

[peah-webrtc, 2017/02/04 22:57:28]

Yes we did. 

-      capture_buffer, stream_delay_ms()));
-
   if (public_submodules_->echo_control_mobile->is_enabled() &&
       public_submodules_->noise_suppression->is_enabled()) {
     capture_buffer->CopyLowPassToReference();