| 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 5a1d7a84c705966534ebb7e1b7bafffc27a77854..44192bd485864634c23ec0a5580d6057d042cdf4 100644
|
| --- a/content/renderer/media/media_stream_audio_processor_unittest.cc
|
| +++ b/content/renderer/media/media_stream_audio_processor_unittest.cc
|
| @@ -133,12 +133,12 @@ class MediaStreamAudioProcessorTest : public ::testing::Test {
|
| EXPECT_NEAR(input_capture_delay.InMillisecondsF(),
|
| capture_delay.InMillisecondsF(),
|
| output_buffer_duration.InMillisecondsF());
|
| - EXPECT_EQ(audio_processor->OutputFormat().sample_rate(),
|
| - expected_output_sample_rate);
|
| - EXPECT_EQ(audio_processor->OutputFormat().channels(),
|
| - expected_output_channels);
|
| - EXPECT_EQ(audio_processor->OutputFormat().frames_per_buffer(),
|
| - expected_output_buffer_size);
|
| + EXPECT_EQ(expected_output_sample_rate,
|
| + audio_processor->OutputFormat().sample_rate());
|
| + EXPECT_EQ(expected_output_channels,
|
| + audio_processor->OutputFormat().channels());
|
| + EXPECT_EQ(expected_output_buffer_size,
|
| + audio_processor->OutputFormat().frames_per_buffer());
|
| }
|
|
|
| data_ptr += params.frames_per_buffer() * params.channels();
|
| @@ -181,6 +181,7 @@ class MediaStreamAudioProcessorTest : public ::testing::Test {
|
| }
|
|
|
| media::AudioParameters params_;
|
| + MediaStreamDevice::AudioDeviceParameters input_device_params_;
|
| };
|
|
|
| // Test crashing with ASAN on Android. crbug.com/468762
|
| @@ -195,7 +196,7 @@ TEST_F(MediaStreamAudioProcessorTest, MAYBE_WithAudioProcessing) {
|
| new WebRtcAudioDeviceImpl());
|
| scoped_refptr<MediaStreamAudioProcessor> audio_processor(
|
| new rtc::RefCountedObject<MediaStreamAudioProcessor>(
|
| - constraint_factory.CreateWebMediaConstraints(), 0,
|
| + constraint_factory.CreateWebMediaConstraints(), input_device_params_,
|
| webrtc_audio_device.get()));
|
| EXPECT_TRUE(audio_processor->has_audio_processing());
|
| audio_processor->OnCaptureFormatChanged(params_);
|
| @@ -220,8 +221,8 @@ TEST_F(MediaStreamAudioProcessorTest, VerifyTabCaptureWithoutAudioProcessing) {
|
| tab_string);
|
| scoped_refptr<MediaStreamAudioProcessor> audio_processor(
|
| new rtc::RefCountedObject<MediaStreamAudioProcessor>(
|
| - tab_constraint_factory.CreateWebMediaConstraints(), 0,
|
| - webrtc_audio_device.get()));
|
| + tab_constraint_factory.CreateWebMediaConstraints(),
|
| + input_device_params_, webrtc_audio_device.get()));
|
| EXPECT_FALSE(audio_processor->has_audio_processing());
|
| audio_processor->OnCaptureFormatChanged(params_);
|
|
|
| @@ -237,8 +238,8 @@ TEST_F(MediaStreamAudioProcessorTest, VerifyTabCaptureWithoutAudioProcessing) {
|
| system_constraint_factory.AddMandatory(kMediaStreamSource,
|
| system_string);
|
| audio_processor = new rtc::RefCountedObject<MediaStreamAudioProcessor>(
|
| - system_constraint_factory.CreateWebMediaConstraints(), 0,
|
| - webrtc_audio_device.get());
|
| + system_constraint_factory.CreateWebMediaConstraints(),
|
| + input_device_params_, webrtc_audio_device.get());
|
| EXPECT_FALSE(audio_processor->has_audio_processing());
|
|
|
| // Set |audio_processor| to NULL to make sure |webrtc_audio_device| outlives
|
| @@ -254,7 +255,7 @@ TEST_F(MediaStreamAudioProcessorTest, TurnOffDefaultConstraints) {
|
| new WebRtcAudioDeviceImpl());
|
| scoped_refptr<MediaStreamAudioProcessor> audio_processor(
|
| new rtc::RefCountedObject<MediaStreamAudioProcessor>(
|
| - constraint_factory.CreateWebMediaConstraints(), 0,
|
| + constraint_factory.CreateWebMediaConstraints(), input_device_params_,
|
| webrtc_audio_device.get()));
|
| EXPECT_FALSE(audio_processor->has_audio_processing());
|
| audio_processor->OnCaptureFormatChanged(params_);
|
| @@ -384,7 +385,7 @@ TEST_F(MediaStreamAudioProcessorTest, MAYBE_TestAllSampleRates) {
|
| new WebRtcAudioDeviceImpl());
|
| scoped_refptr<MediaStreamAudioProcessor> audio_processor(
|
| new rtc::RefCountedObject<MediaStreamAudioProcessor>(
|
| - constraint_factory.CreateWebMediaConstraints(), 0,
|
| + constraint_factory.CreateWebMediaConstraints(), input_device_params_,
|
| webrtc_audio_device.get()));
|
| EXPECT_TRUE(audio_processor->has_audio_processing());
|
|
|
| @@ -425,7 +426,7 @@ TEST_F(MediaStreamAudioProcessorTest, GetAecDumpMessageFilter) {
|
| new WebRtcAudioDeviceImpl());
|
| scoped_refptr<MediaStreamAudioProcessor> audio_processor(
|
| new rtc::RefCountedObject<MediaStreamAudioProcessor>(
|
| - constraint_factory.CreateWebMediaConstraints(), 0,
|
| + constraint_factory.CreateWebMediaConstraints(), input_device_params_,
|
| webrtc_audio_device.get()));
|
|
|
| EXPECT_TRUE(audio_processor->aec_dump_message_filter_.get());
|
| @@ -445,7 +446,7 @@ TEST_F(MediaStreamAudioProcessorTest, TestStereoAudio) {
|
| new WebRtcAudioDeviceImpl());
|
| scoped_refptr<MediaStreamAudioProcessor> audio_processor(
|
| new rtc::RefCountedObject<MediaStreamAudioProcessor>(
|
| - constraint_factory.CreateWebMediaConstraints(), 0,
|
| + constraint_factory.CreateWebMediaConstraints(), input_device_params_,
|
| webrtc_audio_device.get()));
|
| EXPECT_FALSE(audio_processor->has_audio_processing());
|
| const media::AudioParameters source_params(
|
| @@ -509,7 +510,7 @@ TEST_F(MediaStreamAudioProcessorTest, MAYBE_TestWithKeyboardMicChannel) {
|
| new WebRtcAudioDeviceImpl());
|
| scoped_refptr<MediaStreamAudioProcessor> audio_processor(
|
| new rtc::RefCountedObject<MediaStreamAudioProcessor>(
|
| - constraint_factory.CreateWebMediaConstraints(), 0,
|
| + constraint_factory.CreateWebMediaConstraints(), input_device_params_,
|
| webrtc_audio_device.get()));
|
| EXPECT_TRUE(audio_processor->has_audio_processing());
|
|
|
|
|