diff options
Diffstat (limited to 'chromium/media/base/channel_mixer_unittest.cc')
| -rw-r--r-- | chromium/media/base/channel_mixer_unittest.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/chromium/media/base/channel_mixer_unittest.cc b/chromium/media/base/channel_mixer_unittest.cc index eddbc1b90ba..e048f8d9fc5 100644 --- a/chromium/media/base/channel_mixer_unittest.cc +++ b/chromium/media/base/channel_mixer_unittest.cc @@ -100,20 +100,26 @@ TEST_P(ChannelMixerTest, Mixing) { scoped_ptr<AudioBus> input_bus = AudioBus::Create(input_channels, kFrames); AudioParameters input_audio(AudioParameters::AUDIO_PCM_LINEAR, input_layout, + input_layout == CHANNEL_LAYOUT_DISCRETE ? + input_channels : + ChannelLayoutToChannelCount(input_layout), + 0, AudioParameters::kAudioCDSampleRate, 16, - kFrames); - if (input_layout == CHANNEL_LAYOUT_DISCRETE) - input_audio.SetDiscreteChannels(input_channels); + kFrames, + AudioParameters::NO_EFFECTS); ChannelLayout output_layout = GetParam().output_layout; int output_channels = GetParam().output_channels; scoped_ptr<AudioBus> output_bus = AudioBus::Create(output_channels, kFrames); AudioParameters output_audio(AudioParameters::AUDIO_PCM_LINEAR, output_layout, + output_layout == CHANNEL_LAYOUT_DISCRETE ? + output_channels : + ChannelLayoutToChannelCount(output_layout), + 0, AudioParameters::kAudioCDSampleRate, 16, - kFrames); - if (output_layout == CHANNEL_LAYOUT_DISCRETE) - output_audio.SetDiscreteChannels(output_channels); + kFrames, + AudioParameters::NO_EFFECTS); const float* channel_values = GetParam().channel_values; ASSERT_EQ(input_bus->channels(), GetParam().num_channel_values); |