Feed the render data to MediaStreamAudioProcessor and used AudioBus in render callback

content/renderer/media/media_stream_audio_processor_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/time/time.h"
@@ skipping 62 matching lines @@
     ReadDataFromSpeechFile(capture_data.get(), length);
     const int16* data_ptr = reinterpret_cast<const int16*>(capture_data.get());
     scoped_ptr<media::AudioBus> data_bus = media::AudioBus::Create(
         params_.channels(), params_.frames_per_buffer());
     for (int i = 0; i < kNumberOfPacketsForTest; ++i) {
       data_bus->FromInterleaved(data_ptr, data_bus->frames(), 2);
       audio_processor->PushCaptureData(data_bus.get());
 
       // |audio_processor| does nothing when the audio processing is off in
       // the processor.
-      audio_processor->PushRenderData(
-          data_ptr,
-          params_.sample_rate(), params_.channels(),
-          params_.frames_per_buffer(), base::TimeDelta::FromMilliseconds(10));
+      webrtc::AudioProcessing* ap = audio_processor->audio_processing_.get();
+#if defined(OS_ANDROID) || defined(OS_IOS)
+      const bool is_aec_enabled = ap && ap->echo_control_mobile()->is_enabled();

[tommi (sloooow) - chröme, 2014/02/17 15:03:44]

out of curiosity, what's the difference between echo_control_mobile() and
echo_cancellation()?

[no longer working on chromium, 2014/02/17 17:15:32]

echo_control_mobile() is the AEC used by mobile, and echo_cancellation() is the
AEC used by desktop. They are different components and have different
interfaces.

[tommi (sloooow) - chröme, 2014/02/18 12:54:12]

What I'm trying to understand is the difference between the two.
Will echo_cancellation() return NULL on Android?
If not, will echo_cancellation()->is_enabled() be a different value than
echo_control_mobile()->is_enabled() on android?

[no longer working on chromium, 2014/02/18 17:37:53]

Comment has been addressed offline, the answer is the question is "yes".
I have already added a DCHECK(!ap || !ap->echo_cancellation()->is_enabled());

+#else
+      const bool is_aec_enabled = ap && ap->echo_cancellation()->is_enabled();
+#endif
+      if (is_aec_enabled) {
+        audio_processor->OnPlayoutData(data_bus.get(), params_.sample_rate(),
+                                       10);
+      }
 
       int16* output = NULL;
       int new_volume = 0;
       while(audio_processor->ProcessAndConsumeData(
           base::TimeDelta::FromMilliseconds(10), 255, false, &new_volume,
           &output)) {
         EXPECT_TRUE(output != NULL);
         EXPECT_EQ(audio_processor->OutputFormat().sample_rate(),
                   expected_output_sample_rate);
         EXPECT_EQ(audio_processor->OutputFormat().channels(),
@@ skipping 41 matching lines @@
 #endif
   }
 
   media::AudioParameters params_;
 };
 
 TEST_F(MediaStreamAudioProcessorTest, WithoutAudioProcessing) {
   // Setup the audio processor without enabling the flag.
   blink::WebMediaConstraints constraints;
   scoped_refptr<MediaStreamAudioProcessor> audio_processor(
-      new MediaStreamAudioProcessor(params_, constraints, 0));
+      new MediaStreamAudioProcessor(params_, constraints, 0, NULL));
   EXPECT_FALSE(audio_processor->has_audio_processing());
 
   ProcessDataAndVerifyFormat(audio_processor,
                              params_.sample_rate(),
                              params_.channels(),
                              params_.sample_rate() / 100);
 }
 
 TEST_F(MediaStreamAudioProcessorTest, WithAudioProcessing) {
   // Setup the audio processor with enabling the flag.
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableAudioTrackProcessing);
   blink::WebMediaConstraints constraints;
   scoped_refptr<MediaStreamAudioProcessor> audio_processor(
-      new MediaStreamAudioProcessor(params_, constraints, 0));
+      new MediaStreamAudioProcessor(params_, constraints, 0, NULL));
   EXPECT_TRUE(audio_processor->has_audio_processing());
   VerifyDefaultComponents(audio_processor);
 
   ProcessDataAndVerifyFormat(audio_processor,
                              kAudioProcessingSampleRate,
                              kAudioProcessingNumberOfChannel,
                              kAudioProcessingSampleRate / 100);
 }
 
 }  // namespace content