Fix muted audio when playback rate != 1.0 or 0.0

media/filters/audio_renderer_base_unittest.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 "base/bind.h"
 #include "base/gtest_prod_util.h"
 #include "base/stl_util.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filter_host.h"
@@ skipping 166 matching lines @@
   }
 
   // Attempts to consume |size| bytes from |renderer_|'s internal buffer,
   // returning true if all |size| bytes were consumed, false if less than
   // |size| bytes were consumed.
   //
   // |muted| is optional and if passed will get set if the byte value of
   // the consumed data is muted audio.
   bool ConsumeBufferedData(uint32 size, bool* muted) {
     scoped_array<uint8> buffer(new uint8[size]);
-    uint32 bytes_read = renderer_->FillBuffer(buffer.get(), size,
-                                              base::TimeDelta());
-    if (bytes_read > 0 && muted) {
+    uint32 bytes_per_frame = (decoder_->bits_per_channel() / 8) *

[acolwell GONE FROM CHROMIUM, 2012/02/22 07:51:40]

It feels like we are doing this computation in a lot of places. Perhaps a TODO
somewhere to add a helper method to AudioDecoder?

[vrk (LEFT CHROMIUM), 2012/02/23 20:33:06]

Done in AudioRendererBase.

+        ChannelLayoutToChannelCount(decoder_->channel_layout());
+    uint32 requested_frames = size / bytes_per_frame;
+    uint32 frames_read = renderer_->FillBuffer(
+        buffer.get(), requested_frames, base::TimeDelta());
+
+    if (frames_read > 0 && muted) {
       *muted = (buffer[0] == kMutedAudio);
     }
-    return (bytes_read == size);
+    return (frames_read == requested_frames);
   }
 
   uint32 bytes_buffered() {
     return renderer_->algorithm_->bytes_buffered();
   }
 
   uint32 buffer_capacity() {
     return renderer_->algorithm_->QueueCapacity();
   }
 
@@ skipping 227 matching lines @@
   EXPECT_TRUE(ConsumeBufferedData(bytes_buffered() / 2, NULL));
 
   renderer_->Pause(NewExpectedClosure());
 
   AbortPendingRead();
 
   Seek(base::TimeDelta::FromSeconds(1));
 }
 
 }  // namespace media