Index: media/base/channel_mixer_unittest.cc |
diff --git a/media/base/channel_mixer_unittest.cc b/media/base/channel_mixer_unittest.cc |
index 89b4eeedc44397281c1b03fa466d008c1127bffc..1d2d5f9fd5a54cec917122ddfcd763ada32db21d 100644 |
--- a/media/base/channel_mixer_unittest.cc |
+++ b/media/base/channel_mixer_unittest.cc |
@@ -105,25 +105,21 @@ TEST_P(ChannelMixerTest, Mixing) { |
int input_channels = GetParam().input_channels; |
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), |
- AudioParameters::kAudioCDSampleRate, 16, |
- kFrames, |
- AudioParameters::NO_EFFECTS); |
+ input_layout == CHANNEL_LAYOUT_DISCRETE |
+ ? input_channels |
+ : ChannelLayoutToChannelCount(input_layout), |
+ input_layout, AudioParameters::kAudioCDSampleRate, |
+ 16, kFrames); |
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), |
- AudioParameters::kAudioCDSampleRate, 16, |
- kFrames, |
- AudioParameters::NO_EFFECTS); |
+ AudioParameters output_audio( |
+ AudioParameters::AUDIO_PCM_LINEAR, |
+ output_layout == CHANNEL_LAYOUT_DISCRETE |
+ ? output_channels |
+ : ChannelLayoutToChannelCount(output_layout), |
+ output_layout, AudioParameters::kAudioCDSampleRate, 16, kFrames); |
const float* channel_values = GetParam().channel_values; |
ASSERT_EQ(input_bus->channels(), GetParam().num_channel_values); |