| Index: media/filters/audio_renderer_algorithm_default.cc
|
| ===================================================================
|
| --- media/filters/audio_renderer_algorithm_default.cc (revision 20829)
|
| +++ media/filters/audio_renderer_algorithm_default.cc (working copy)
|
| @@ -5,7 +5,6 @@
|
| #include "media/filters/audio_renderer_algorithm_default.h"
|
|
|
| #include "media/base/buffers.h"
|
| -#include "media/base/data_buffer.h"
|
|
|
| namespace media {
|
|
|
| @@ -15,7 +14,7 @@
|
| AudioRendererAlgorithmDefault::~AudioRendererAlgorithmDefault() {
|
| }
|
|
|
| -size_t AudioRendererAlgorithmDefault::FillBuffer(DataBuffer* buffer_out) {
|
| +size_t AudioRendererAlgorithmDefault::FillBuffer(uint8* dest, size_t length) {
|
| if (playback_rate() == 0.0f) {
|
| return 0;
|
| }
|
| @@ -23,20 +22,17 @@
|
| size_t dest_written = 0;
|
|
|
| if (playback_rate() == 1.0f) {
|
| - size_t dest_length = buffer_out->GetDataSize();
|
| - uint8* dest = buffer_out->GetWritableData();
|
| -
|
| // If we don't have enough data, copy what we have.
|
| - if (QueueSize() < dest_length)
|
| + if (QueueSize() < length)
|
| dest_written = CopyFromInput(dest, QueueSize());
|
| else
|
| - dest_written = CopyFromInput(dest, dest_length);
|
| + dest_written = CopyFromInput(dest, length);
|
| AdvanceInputPosition(dest_written);
|
| } else {
|
| // Mute (we will write to the whole buffer, so set |dest_written| to the
|
| // requested size).
|
| - dest_written = buffer_out->GetDataSize();
|
| - memset(buffer_out->GetWritableData(), 0, dest_written);
|
| + dest_written = length;
|
| + memset(dest, 0, dest_written);
|
|
|
| // Calculate the number of bytes we "used".
|
| size_t scaled_dest_length =
|
|
|