Add channel_count parameter back to AudioBuffer creation methods.

media/filters/opus_audio_decoder.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.
 
 #include "media/filters/opus_audio_decoder.h"
 
 #include <cmath>
 
 #include "base/single_thread_task_runner.h"
 #include "base/sys_byteorder.h"
@@ skipping 446 matching lines @@
 void OpusAudioDecoder::ResetTimestampState() {
   output_timestamp_helper_->SetBaseTimestamp(kNoTimestamp());
   last_input_timestamp_ = kNoTimestamp();
   frames_to_discard_ = TimeDeltaToAudioFrames(config_.seek_preroll(),
                                               config_.samples_per_second());
 }
 
 bool OpusAudioDecoder::Decode(const scoped_refptr<DecoderBuffer>& input,
                               scoped_refptr<AudioBuffer>* output_buffer) {
   // Allocate a buffer for the output samples.
-  *output_buffer = AudioBuffer::CreateBuffer(config_.sample_format(),
-                                             config_.channel_layout(),
-                                             config_.samples_per_second(),
-                                             kMaxOpusOutputPacketSizeSamples);
+  *output_buffer = AudioBuffer::CreateBuffer(
+      config_.sample_format(),
+      config_.channel_layout(),
+      ChannelLayoutToChannelCount(config_.channel_layout()),
+      config_.samples_per_second(),
+      kMaxOpusOutputPacketSizeSamples);
   const int buffer_size =
       output_buffer->get()->channel_count() *
       output_buffer->get()->frame_count() *
       SampleFormatToBytesPerChannel(config_.sample_format());
 
   float* float_output_buffer = reinterpret_cast<float*>(
       output_buffer->get()->channel_data()[0]);
   const int frames_decoded =
       opus_multistream_decode_float(opus_decoder_,
                                     input->data(),
@@ skipping 54 matching lines @@
   output_timestamp_helper_->AddFrames(frames_decoded);
 
   // Discard the buffer to indicate we need more data.
   if (!frames_to_output)
     *output_buffer = NULL;
 
   return true;
 }
 
 }  // namespace media