Refactor AudioParameters member setting.

media/cast/test/fake_media_source.cc

 // Copyright 2014 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.
 
 #include "media/cast/test/fake_media_source.h"
 
 #include "base/bind.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 147 matching lines @@
         LOG(ERROR) << "Unsupported audio channels layout.";
         continue;
       }
       if (audio_stream_index_ != -1) {
         LOG(WARNING) << "Found multiple audio streams.";
       }
       audio_stream_index_ = static_cast<int>(i);
       source_audio_params_.Reset(
           AudioParameters::AUDIO_PCM_LINEAR,
           layout,
-          av_codec_context->channels,
           av_codec_context->sample_rate,
           8 * av_get_bytes_per_sample(av_codec_context->sample_fmt),
           av_codec_context->sample_rate / kAudioPacketsPerSecond);
+      source_audio_params_.set_channels_for_discrete(
+          av_codec_context->channels);
       CHECK(source_audio_params_.IsValid());
       LOG(INFO) << "Source file has audio.";
     } else if (av_codec->type == AVMEDIA_TYPE_VIDEO) {
       VideoPixelFormat format =
           AVPixelFormatToVideoPixelFormat(av_codec_context->pix_fmt);
       if (format != PIXEL_FORMAT_YV12) {
         LOG(ERROR) << "Cannot handle non YV12 video format: " << format;
         continue;
       }
       if (video_stream_index_ != -1) {
@@ skipping 186 matching lines @@
       bus.Pass(), start_time_ + audio_time);
 
   // Make sure queue is not empty.
   Decode(true);
   return true;
 }
 
 void FakeMediaSource::SendNextFrame() {
   // Send as much as possible. Audio is sent according to
   // system time.
-  while (SendNextTranscodedAudio(clock_->NowTicks() - start_time_));
+  while (SendNextTranscodedAudio(clock_->NowTicks() - start_time_)) {
+  }
 
   // Video is sync'ed to audio.
-  while (SendNextTranscodedVideo(audio_sent_ts_->GetTimestamp()));
+  while (SendNextTranscodedVideo(audio_sent_ts_->GetTimestamp())) {
+  }
 
   if (audio_bus_queue_.empty() && video_frame_queue_.empty()) {
     // Both queues are empty can only mean that we have reached
     // the end of the stream.
     LOG(INFO) << "Rewind.";
     Rewind();
   }
 
   // Send next send.
   task_runner_->PostDelayedTask(
@@ skipping 218 matching lines @@
 AVCodecContext* FakeMediaSource::av_audio_context() {
   return av_audio_stream()->codec;
 }
 
 AVCodecContext* FakeMediaSource::av_video_context() {
   return av_video_stream()->codec;
 }
 
 }  // namespace cast
 }  // namespace media