Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2067)

Unified Diff: content/renderer/media/renderer_webaudiodevice_impl.cc

Issue 10823175: Switch AudioRenderSink::Callback to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup MCR AudioBus usage. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/renderer_webaudiodevice_impl.cc
diff --git a/content/renderer/media/renderer_webaudiodevice_impl.cc b/content/renderer/media/renderer_webaudiodevice_impl.cc
index 0ac56e8d967d2e3fe4d4139d33acd58dab87d308..c595b3d33227750fe58f22a491342fc03edb6b6f 100644
--- a/content/renderer/media/renderer_webaudiodevice_impl.cc
+++ b/content/renderer/media/renderer_webaudiodevice_impl.cc
@@ -42,20 +42,20 @@ double RendererWebAudioDeviceImpl::sampleRate() {
return 44100.0;
}
-int RendererWebAudioDeviceImpl::Render(const std::vector<float*>& audio_data,
- int number_of_frames,
+int RendererWebAudioDeviceImpl::Render(media::AudioBus* audio_bus,
int audio_delay_milliseconds) {
// Make the client callback to get rendered audio.
DCHECK(client_callback_);
if (client_callback_) {
// Wrap the pointers using WebVector.
- WebVector<float*> web_audio_data(audio_data.size());
- for (size_t i = 0; i < audio_data.size(); ++i)
- web_audio_data[i] = audio_data[i];
+ WebVector<float*> web_audio_data(
+ static_cast<size_t>(audio_bus->channels()));
+ for (int i = 0; i < audio_bus->channels(); ++i)
+ web_audio_data[i] = audio_bus->channel(i);
- client_callback_->render(web_audio_data, number_of_frames);
+ client_callback_->render(web_audio_data, audio_bus->frames());
}
- return number_of_frames;
+ return audio_bus->frames();
}
void RendererWebAudioDeviceImpl::OnRenderError() {
« no previous file with comments | « content/renderer/media/renderer_webaudiodevice_impl.h ('k') | content/renderer/media/webrtc_audio_device_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698