Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: content/renderer/media/media_stream_audio_processor_unittest.cc

Issue 139303016: Feed the render data to MediaStreamAudioProcessor and used AudioBus in render callback (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: checked echo_control_mobile()->is_enabled()) for android and ios Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_stream_audio_processor_unittest.cc
diff --git a/content/renderer/media/media_stream_audio_processor_unittest.cc b/content/renderer/media/media_stream_audio_processor_unittest.cc
index f562055905169867fc91af330194afa3481a1c1f..4c8479b6b8623000611968053c643818845ced2a 100644
--- a/content/renderer/media/media_stream_audio_processor_unittest.cc
+++ b/content/renderer/media/media_stream_audio_processor_unittest.cc
@@ -80,10 +80,18 @@ class MediaStreamAudioProcessorTest : public ::testing::Test {
// |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();
+ // AEC should be turned off for mobiles.
+ 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;
@@ -145,7 +153,7 @@ 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,
@@ -160,7 +168,7 @@ TEST_F(MediaStreamAudioProcessorTest, WithAudioProcessing) {
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);

Powered by Google App Engine
This is Rietveld 408576698