| Index: media/audio/android/audio_android_unittest.cc
|
| diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
|
| index 64b3b4ba61361c3e58f6aa257b82aa5382a67356..241322d3ed3d655dfe439acc868da7d418696689 100644
|
| --- a/media/audio/android/audio_android_unittest.cc
|
| +++ b/media/audio/android/audio_android_unittest.cc
|
| @@ -591,13 +591,14 @@ class AudioAndroidInputTest : public AudioAndroidOutputTest,
|
|
|
| // Override the platform effects setting to use the AudioRecord or OpenSLES
|
| // path as requested.
|
| - int effects = GetParam() ? AudioParameters::ECHO_CANCELLER :
|
| - AudioParameters::NO_EFFECTS;
|
| + AudioParameters::PlatformEffectsMask effects =
|
| + GetParam() ? AudioParameters::ECHO_CANCELLER
|
| + : AudioParameters::NO_EFFECTS;
|
| AudioParameters params(audio_input_parameters().format(),
|
| audio_input_parameters().channel_layout(),
|
| audio_input_parameters().sample_rate(),
|
| audio_input_parameters().bits_per_sample(),
|
| - audio_input_parameters().frames_per_buffer(),
|
| + audio_input_parameters().frames_per_buffer(), "",
|
| effects);
|
| return params;
|
| }
|
| @@ -802,6 +803,7 @@ TEST_P(AudioAndroidInputTest,
|
| native_params.sample_rate(),
|
| native_params.bits_per_sample(),
|
| native_params.sample_rate() / 100,
|
| + "",
|
| native_params.effects());
|
| StartInputStreamCallbacks(params);
|
| }
|
| @@ -934,12 +936,13 @@ TEST_P(AudioAndroidInputTest,
|
| // the output stream will be a mono stream since mono is default for input
|
| // audio on Android.
|
| AudioParameters io_params(default_input_params.format(),
|
| - default_input_params.channel_layout(),
|
| ChannelLayoutToChannelCount(
|
| default_input_params.channel_layout()),
|
| + default_input_params.channel_layout(),
|
| default_input_params.sample_rate(),
|
| default_input_params.bits_per_sample(),
|
| default_input_params.sample_rate() / 100,
|
| + "",
|
| default_input_params.effects());
|
| DVLOG(1) << io_params;
|
|
|
|
|