Chromium Code Reviews| Index: media/filters/audio_renderer_base_unittest.cc |
| diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_base_unittest.cc |
| index 4ada3e4a8607fa1fbafc7c3da38a03fd7b09ab21..58bc59f43f8368dae31f97daf9078c7bfc67a430 100644 |
| --- a/media/filters/audio_renderer_base_unittest.cc |
| +++ b/media/filters/audio_renderer_base_unittest.cc |
| @@ -184,12 +184,16 @@ class AudioRendererBaseTest : public ::testing::Test { |
| // 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 l
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() { |