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

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

Issue 148213002: Revert 246905 "Revert 246894 "Wire up AGC to the MediaStreamAudi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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: trunk/src/content/renderer/media/media_stream_audio_processor_unittest.cc
===================================================================
--- trunk/src/content/renderer/media/media_stream_audio_processor_unittest.cc (revision 247207)
+++ trunk/src/content/renderer/media/media_stream_audio_processor_unittest.cc (working copy)
@@ -86,8 +86,10 @@
params_.frames_per_buffer(), base::TimeDelta::FromMilliseconds(10));
int16* output = NULL;
+ int new_volume = 0;
while(audio_processor->ProcessAndConsumeData(
- base::TimeDelta::FromMilliseconds(10), 255, false, &output)) {
+ base::TimeDelta::FromMilliseconds(10), 255, false, &new_volume,
+ &output)) {
EXPECT_TRUE(output != NULL);
EXPECT_EQ(audio_processor->OutputFormat().sample_rate(),
expected_output_sample_rate);
@@ -101,6 +103,41 @@
}
}
+ void VerifyDefaultComponents(MediaStreamAudioProcessor* audio_processor) {
+ webrtc::AudioProcessing* audio_processing =
+ audio_processor->audio_processing_.get();
+#if defined(OS_ANDROID)
+ EXPECT_TRUE(audio_processing->echo_control_mobile()->is_enabled());
+ EXPECT_TRUE(audio_processing->echo_control_mobile()->routing_mode() ==
+ webrtc::EchoControlMobile::kSpeakerphone);
+ EXPECT_FALSE(audio_processing->echo_cancellation()->is_enabled());
+#elif !defined(OS_IOS)
+ EXPECT_TRUE(audio_processing->echo_cancellation()->is_enabled());
+ EXPECT_TRUE(audio_processing->echo_cancellation()->suppression_level() ==
+ webrtc::EchoCancellation::kHighSuppression);
+ EXPECT_TRUE(audio_processing->echo_cancellation()->are_metrics_enabled());
+ EXPECT_TRUE(
+ audio_processing->echo_cancellation()->is_delay_logging_enabled());
+#endif
+
+ EXPECT_TRUE(audio_processing->noise_suppression()->is_enabled());
+ EXPECT_TRUE(audio_processing->noise_suppression()->level() ==
+ webrtc::NoiseSuppression::kHigh);
+ EXPECT_TRUE(audio_processing->high_pass_filter()->is_enabled());
+ EXPECT_TRUE(audio_processing->gain_control()->is_enabled());
+#if defined(OS_ANDROID) || defined(OS_IOS)
+ EXPECT_TRUE(audio_processing->gain_control()->mode() ==
+ webrtc::GainControl::kFixedDigital);
+ EXPECT_FALSE(audio_processing->voice_detection()->is_enabled());
+#else
+ EXPECT_TRUE(audio_processing->gain_control()->mode() ==
+ webrtc::GainControl::kAdaptiveAnalog);
+ EXPECT_TRUE(audio_processing->voice_detection()->is_enabled());
+ EXPECT_TRUE(audio_processing->voice_detection()->likelihood() ==
+ webrtc::VoiceDetection::kVeryLowLikelihood);
+#endif
+ }
+
media::AudioParameters params_;
};
@@ -125,6 +162,7 @@
scoped_refptr<MediaStreamAudioProcessor> audio_processor(
new MediaStreamAudioProcessor(params_, constraints, 0));
EXPECT_TRUE(audio_processor->has_audio_processing());
+ VerifyDefaultComponents(audio_processor);
ProcessDataAndVerifyFormat(audio_processor,
kAudioProcessingSampleRate,

Powered by Google App Engine
This is Rietveld 408576698