Add channel_count parameter back to AudioBuffer creation methods.

media/base/audio_buffer.h

 // Copyright 2013 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.
 
 #ifndef MEDIA_BASE_AUDIO_BUFFER_H_
 #define MEDIA_BASE_AUDIO_BUFFER_H_
 
 #include <vector>
 
 #include "base/memory/aligned_memory.h"
@@ skipping 20 matching lines @@
 
   // Create an AudioBuffer whose channel data is copied from |data|. For
   // interleaved data, only the first buffer is used. For planar data, the
   // number of buffers must be equal to |channel_count|. |frame_count| is the
   // number of frames in each buffer. |data| must not be null and |frame_count|
   // must be >= 0.
   //
   // TODO(jrummell): Compute duration rather than pass it in.
   static scoped_refptr<AudioBuffer> CopyFrom(SampleFormat sample_format,
                                              ChannelLayout channel_layout,
+                                             int channel_count,
                                              int sample_rate,
                                              int frame_count,
                                              const uint8* const* data,
                                              const base::TimeDelta timestamp,
                                              const base::TimeDelta duration);
 
   // Create an AudioBuffer with |frame_count| frames. Buffer is allocated, but
   // not initialized. Timestamp and duration are set to kNoTimestamp().
   static scoped_refptr<AudioBuffer> CreateBuffer(SampleFormat sample_format,
                                                  ChannelLayout channel_layout,
+                                                 int channel_count,
                                                  int sample_rate,
                                                  int frame_count);
 
   // Create an empty AudioBuffer with |frame_count| frames.
   static scoped_refptr<AudioBuffer> CreateEmptyBuffer(
       ChannelLayout channel_layout,
+      int channel_count,
       int sample_rate,
       int frame_count,
       const base::TimeDelta timestamp,
       const base::TimeDelta duration);
 
   // Create a AudioBuffer indicating we've reached end of stream.
   // Calling any method other than end_of_stream() on the resulting buffer
   // is disallowed.
   static scoped_refptr<AudioBuffer> CreateEOSBuffer();
 
@@ skipping 49 matching lines @@
  private:
   friend class base::RefCountedThreadSafe<AudioBuffer>;
 
   // Allocates aligned contiguous buffer to hold all channel data (1 block for
   // interleaved data, |channel_count| blocks for planar data), copies
   // [data,data+data_size) to the allocated buffer(s). If |data| is null, no
   // data is copied. If |create_buffer| is false, no data buffer is created (or
   // copied to).
   AudioBuffer(SampleFormat sample_format,
               ChannelLayout channel_layout,
+              int channel_count,
               int sample_rate,
               int frame_count,
               bool create_buffer,
               const uint8* const* data,
               const base::TimeDelta timestamp,
               const base::TimeDelta duration);
 
   virtual ~AudioBuffer();
 
   const SampleFormat sample_format_;
@@ skipping 11 matching lines @@
 
   // For planar data, points to each channels data.
   std::vector<uint8*> channel_data_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AudioBuffer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_BUFFER_H_