Refactor AudioParameters member setting.

media/base/audio_converter_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include <cmath>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 180 matching lines @@
   double epsilon_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioConverterTest);
 };
 
 // Ensure the buffer delay provided by AudioConverter is accurate.
 TEST(AudioConverterTest, AudioDelayAndDiscreteChannelCount) {
   // Choose input and output parameters such that the transform must make
   // multiple calls to fill the buffer.
   AudioParameters input_parameters(AudioParameters::AUDIO_PCM_LINEAR,
-                                   CHANNEL_LAYOUT_DISCRETE, 10, kSampleRate,
-                                   kBitsPerChannel, kLowLatencyBufferSize,
-                                   AudioParameters::NO_EFFECTS);
+                                   CHANNEL_LAYOUT_DISCRETE, kSampleRate,
+                                   kBitsPerChannel, kLowLatencyBufferSize);
+  input_parameters.set_channels_for_discrete(10);
   AudioParameters output_parameters(AudioParameters::AUDIO_PCM_LINEAR,
-                                    CHANNEL_LAYOUT_DISCRETE, 5, kSampleRate * 2,
-                                    kBitsPerChannel, kHighLatencyBufferSize,
-                                    AudioParameters::NO_EFFECTS);
+                                    CHANNEL_LAYOUT_DISCRETE, kSampleRate * 2,
+                                    kBitsPerChannel, kHighLatencyBufferSize);
+  output_parameters.set_channels_for_discrete(5);
 
   AudioConverter converter(input_parameters, output_parameters, false);
   FakeAudioRenderCallback callback(0.2);
   scoped_ptr<AudioBus> audio_bus = AudioBus::Create(output_parameters);
   converter.AddInput(&callback);
   converter.Convert(audio_bus.get());
 
   // Calculate the expected buffer delay for given AudioParameters.
   double input_sample_rate = input_parameters.sample_rate();
   int fill_count =
@@ skipping 37 matching lines @@
         // No resampling. No channel mixing.
         std::tr1::make_tuple(44100, 44100, CHANNEL_LAYOUT_STEREO, 0.00000048),
 
         // Upsampling. Channel upmixing.
         std::tr1::make_tuple(44100, 48000, CHANNEL_LAYOUT_QUAD, 0.033),
 
         // Downsampling. Channel downmixing.
         std::tr1::make_tuple(48000, 41000, CHANNEL_LAYOUT_MONO, 0.042)));
 
 }  // namespace media