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

Unified Diff: webkit/media/webmediaplayer_impl.cc

Issue 8980008: Integrate HTMLMediaElement with Web Audio API's MediaElementAudioSourceNode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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: webkit/media/webmediaplayer_impl.cc
===================================================================
--- webkit/media/webmediaplayer_impl.cc (revision 115436)
+++ webkit/media/webmediaplayer_impl.cc (working copy)
@@ -11,6 +11,8 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/metrics/histogram.h"
+#include "content/renderer/media/audio_renderer_impl.h"
+#include "content/renderer/render_audiosourceprovider.h"
#include "media/base/composite_data_source_factory.h"
#include "media/base/filter_collection.h"
#include "media/base/limits.h"
@@ -102,6 +104,7 @@
WebKit::WebMediaPlayerClient* client,
base::WeakPtr<WebMediaPlayerDelegate> delegate,
media::FilterCollection* collection,
+ bool disable_audio,
media::MessageLoopFactory* message_loop_factory,
MediaStreamClient* media_stream_client,
media::MediaLog* media_log)
@@ -123,6 +126,17 @@
media_log_(media_log),
is_accelerated_compositing_active_(false),
incremented_externally_allocated_memory_(false) {
+ if (!disable_audio) {
+ // audio_source_provider_ is a "provider" to WebKit, and a sink
+ // from the perspective of the audio renderer.
+ audio_source_provider_ = new RenderAudioSourceProvider();
+ // Add the chrome specific audio renderer, using audio_source_provider_
+ // as the sink.
+ AudioRendererImpl* audio_renderer =
+ new AudioRendererImpl(audio_source_provider_.get());
+ collection->AddAudioRenderer(audio_renderer);
+ }
+
// Saves the current message loop.
DCHECK(!main_loop_);
main_loop_ = MessageLoop::current();
@@ -926,6 +940,10 @@
return client_;
}
+WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() {
+ return audio_source_provider_;
+}
+
void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
DCHECK_EQ(main_loop_, MessageLoop::current());
incremented_externally_allocated_memory_ = true;
« chrome/renderer/chrome_content_renderer_client.cc ('K') | « webkit/media/webmediaplayer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698