| Index: media/base/fake_audio_render_callback.cc
|
| diff --git a/media/base/fake_audio_render_callback.cc b/media/base/fake_audio_render_callback.cc
|
| index 15986fd3c91e9c8fa1bcb43741464da0c041bb85..6adf569030eb8194f497808bbe19af0e8dd99a0e 100644
|
| --- a/media/base/fake_audio_render_callback.cc
|
| +++ b/media/base/fake_audio_render_callback.cc
|
| @@ -19,21 +19,21 @@ FakeAudioRenderCallback::FakeAudioRenderCallback(double step)
|
|
|
| FakeAudioRenderCallback::~FakeAudioRenderCallback() {}
|
|
|
| -int FakeAudioRenderCallback::Render(const std::vector<float*>& audio_data,
|
| - int number_of_frames,
|
| +int FakeAudioRenderCallback::Render(AudioBus* audio_bus,
|
| int audio_delay_milliseconds) {
|
| + int number_of_frames = audio_bus->frames();
|
| if (half_fill_)
|
| number_of_frames /= 2;
|
|
|
| // Fill first channel with a sine wave.
|
| for (int i = 0; i < number_of_frames; ++i)
|
| - audio_data[0][i] = sin(2 * M_PI * (x_ + step_ * i));
|
| + audio_bus->channel(0)[i] = sin(2 * M_PI * (x_ + step_ * i));
|
| x_ += number_of_frames * step_;
|
|
|
| // Copy first channel into the rest of the channels.
|
| - for (size_t i = 1; i < audio_data.size(); ++i)
|
| - memcpy(audio_data[i], audio_data[0],
|
| - number_of_frames * sizeof(*audio_data[0]));
|
| + for (int i = 1; i < audio_bus->channels(); ++i)
|
| + memcpy(audio_bus->channel(i), audio_bus->channel(0),
|
| + number_of_frames * sizeof(*audio_bus->channel(i)));
|
|
|
| return number_of_frames;
|
| }
|
|
|