Fix AudioBuffer verification tests.

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/time/time.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_buffer_queue.h"
 #include "media/base/audio_bus.h"
 #include "media/base/buffers.h"
 #include "media/base/test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 const int kSampleRate = 44100;
 
 static void VerifyBus(AudioBus* bus,
                       int offset,
                       int frames,
                       int buffer_size,
                       float start,
                       float increment) {
   for (int ch = 0; ch < bus->channels(); ++ch) {
     const float v = start + ch * buffer_size * increment;
-    for (int i = offset; i < frames; ++i) {
+    for (int i = offset; i < offset + frames; ++i) {
       ASSERT_FLOAT_EQ(v + (i - offset) * increment, bus->channel(ch)[i])
           << "i=" << i << ", ch=" << ch;
     }
   }
 }
 
 template <typename T>
 static scoped_refptr<AudioBuffer> MakeTestBuffer(SampleFormat format,
                                                  ChannelLayout channel_layout,
                                                  T start,
@@ skipping 228 matching lines @@
 }
 
 TEST(AudioBufferQueueTest, ReadS16Planar) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   const int channels = ChannelLayoutToChannelCount(channel_layout);
   AudioBufferQueue buffer;
 
   // Add 24 frames of data.
   buffer.Append(
       MakeTestBuffer<int16>(kSampleFormatPlanarS16, channel_layout, 1, 1, 4));
-  buffer.Append(MakeTestBuffer<int16>(
-      kSampleFormatPlanarS16, channel_layout, 100, 5, 20));
+  buffer.Append(
+      MakeTestBuffer<int16>(kSampleFormatPlanarS16, channel_layout, 5, 1, 20));
   EXPECT_EQ(24, buffer.frames());
 
   // Read 6 frames from the buffer.
   scoped_ptr<AudioBus> bus = AudioBus::Create(channels, 100);
   EXPECT_EQ(6, buffer.ReadFrames(6, 0, bus.get()));
   EXPECT_EQ(18, buffer.frames());
   VerifyBus(bus.get(), 0, 4, 4, 1.0f / kint16max, 1.0f / kint16max);
   VerifyBus(bus.get(), 4, 2, 20, 5.0f / kint16max, 1.0f / kint16max);
 }
 
@@ skipping 170 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