Integrate HTMLMediaElement with Web Audio API's MediaElementAudioSourceNode

webkit/media/webmediaplayer_impl.cc

Index: webkit/media/webmediaplayer_impl.cc
===================================================================
--- webkit/media/webmediaplayer_impl.cc	(revision 114311)
+++ webkit/media/webmediaplayer_impl.cc	(working copy)
@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.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"
@@ -24,6 +25,8 @@
 #include "media/filters/ffmpeg_demuxer_factory.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/null_audio_renderer.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProviderClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
@@ -102,6 +105,7 @@
     WebKit::WebMediaPlayerClient* client,
     base::WeakPtr<WebMediaPlayerDelegate> delegate,
     media::FilterCollection* collection,
+    media::AudioRendererSink::RenderCallback* render_callback,

[acolwell GONE FROM CHROMIUM, 2011/12/19 23:01:49]

nit: Consider changing this to WebAudioSourceProvider* so we don't have to leak
unnecessary implementation details into this class.

[Chris Rogers, 2011/12/19 23:28:14]

Actually, I was hoping to remove this constructor argument and create the
AudioRendererImpl directly in WebMediaPlayerImpl::WebMediaPlayerImpl() instead
of in RenderViewImpl.

This goes hand-in-hand with your other comment about changing
RenderAudioSourceProvider::RenderAudioSourceProvider() to directly take an
AudioRendererImpl.  And also is necessary so that we can get move
SetAudioRendererSink() out of the abstract interface and make it a simple method
on AudioRendererImpl.

On 2011/12/19 23:01:49, acolwell wrote:

[acolwell GONE FROM CHROMIUM, 2011/12/20 01:04:06]

I am definitely in favor of doing that in this CL.
I'm not sure I'd go that far. I just think it means that
RenderAudioSourceProvider and AudioRendererImpl should be constructed and hooked
up in the same source file so we don't burden other code with their coupling.

[Chris Rogers, 2011/12/21 01:38:17]

Done.

     media::MessageLoopFactory* message_loop_factory,
     MediaStreamClient* media_stream_client,
     media::MediaLog* media_log)
@@ -121,7 +125,8 @@
       media_stream_client_(media_stream_client),
       media_log_(media_log),
       is_accelerated_compositing_active_(false),
-      incremented_externally_allocated_memory_(false) {
+      incremented_externally_allocated_memory_(false),
+      audio_source_provider_(new RenderAudioSourceProvider(render_callback)) {
   // Saves the current message loop.
   DCHECK(!main_loop_);
   main_loop_ = MessageLoop::current();
@@ -919,6 +924,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;