Add channel_count parameter back to AudioBuffer creation methods.

media/base/audio_buffer_queue_unittest.cc

 // 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.
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "media/base/audio_buffer.h"
@@ skipping 21 matching lines @@
 
 template <typename T>
 static scoped_refptr<AudioBuffer> MakeTestBuffer(SampleFormat format,
                                                  ChannelLayout channel_layout,
                                                  T start,
                                                  T end,
                                                  int frames) {
   const base::TimeDelta kNoTime = kNoTimestamp();
   return MakeAudioBuffer<T>(format,
                             channel_layout,
+                            ChannelLayoutToChannelCount(channel_layout),
                             kSampleRate,
                             start,
                             end,
                             frames,
                             kNoTime,
                             kNoTime);
 }
 
 TEST(AudioBufferQueueTest, AppendAndClear) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_MONO;
@@ skipping 329 matching lines @@
   const base::TimeDelta start_time2 = base::TimeDelta::FromSeconds(30);
   const base::TimeDelta duration = base::TimeDelta::FromSeconds(10);
   AudioBufferQueue buffer;
   scoped_ptr<AudioBus> bus = AudioBus::Create(channels, 100);
 
   // Add two buffers (second one added later):
   //   first:  start=0s,  duration=10s
   //   second: start=30s, duration=10s
   buffer.Append(MakeAudioBuffer<int16>(kSampleFormatS16,
                                        channel_layout,
+                                       channels,
                                        kSampleRate,
                                        1,
                                        1,
                                        10,
                                        start_time1,
                                        duration));
   EXPECT_EQ(10, buffer.frames());
 
   // Check starting time.
   EXPECT_EQ(start_time1, buffer.current_time());
 
   // Read 2 frames, should be 2s in (since duration is 1s per sample).
   EXPECT_EQ(2, buffer.ReadFrames(2, 0, bus.get()));
   EXPECT_EQ(start_time1 + base::TimeDelta::FromSeconds(2),
             buffer.current_time());
 
   // Skip 2 frames.
   buffer.SeekFrames(2);
   EXPECT_EQ(start_time1 + base::TimeDelta::FromSeconds(4),
             buffer.current_time());
 
   // Add second buffer for more data.
   buffer.Append(MakeAudioBuffer<int16>(kSampleFormatS16,
                                        channel_layout,
+                                       channels,
                                        kSampleRate,
                                        1,
                                        1,
                                        10,
                                        start_time2,
                                        duration));
   EXPECT_EQ(16, buffer.frames());
 
   // Read until almost the end of buffer1.
   EXPECT_EQ(5, buffer.ReadFrames(5, 0, bus.get()));
@@ skipping 51 matching lines @@
   // Read all 10 frames in buffer2.
   EXPECT_EQ(10, buffer.ReadFrames(10, 0, bus.get()));
   EXPECT_EQ(kNoTime, buffer.current_time());
 
   // Try to read more frames (which don't exist), timestamp should remain.
   EXPECT_EQ(0, buffer.ReadFrames(5, 0, bus.get()));
   EXPECT_EQ(kNoTime, buffer.current_time());
 }
 
 }  // namespace media