Integrate HTMLMediaElement with Web Audio API's MediaElementAudioSourceNode

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
 #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"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
 #include "media/base/pipeline_impl.h"
 #include "media/base/video_frame.h"
 #include "media/filters/chunk_demuxer_factory.h"
 #include "media/filters/dummy_demuxer_factory.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "v8/include/v8.h"
 #include "webkit/media/buffered_data_source.h"
 #include "webkit/media/media_stream_client.h"
 #include "webkit/media/simple_data_source.h"
 #include "webkit/media/video_renderer_impl.h"
@@ skipping 58 matching lines @@
 }
 
 }  // namespace
 
 namespace webkit_media {
 
 WebMediaPlayerImpl::WebMediaPlayerImpl(
     WebKit::WebMediaPlayerClient* client,
     base::WeakPtr<WebMediaPlayerDelegate> delegate,
     media::FilterCollection* collection,
+    media::AudioRendererSink::RenderCallback* render_callback,
     media::MessageLoopFactory* message_loop_factory,
     MediaStreamClient* media_stream_client,
     media::MediaLog* media_log)
-    : network_state_(WebKit::WebMediaPlayer::Empty),
+    : audio_source_provider_(0),

[tommi (sloooow) - chröme, 2011/12/19 15:26:24]

nit: this isn't needed since audio_source_provider_ is a scoped_refptr.  Also,
NULL should be used instead of 0.

[Chris Rogers, 2011/12/19 21:40:35]

Done.

+      network_state_(WebKit::WebMediaPlayer::Empty),
       ready_state_(WebKit::WebMediaPlayer::HaveNothing),
       main_loop_(NULL),
       filter_collection_(collection),
       pipeline_(NULL),
       message_loop_factory_(message_loop_factory),
       paused_(true),
       seeking_(false),
       playback_rate_(0.0f),
       pending_seek_(false),
       client_(client),
       proxy_(NULL),
       delegate_(delegate),
       media_stream_client_(media_stream_client),
       media_log_(media_log),
       is_accelerated_compositing_active_(false),
       incremented_externally_allocated_memory_(false) {
   // Saves the current message loop.
   DCHECK(!main_loop_);
   main_loop_ = MessageLoop::current();
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
+
+  audio_sink_render_callback_ = render_callback;

[tommi (sloooow) - chröme, 2011/12/19 15:26:24]

initialize in initializer list

+  audio_source_provider_ =
+      new RenderAudioSourceProvider(audio_sink_render_callback_);

[tommi (sloooow) - chröme, 2011/12/19 15:26:24]

initialize this in the initializer list and provide render_callback as the
argument to RenderAudioSourceProvider()'s constructor.
Out of curiosity, why do we need to hang on to audio_sink_render_callback_?
Can we access it via audio_source_provider_?

[Chris Rogers, 2011/12/19 21:40:35]

Fixed to initialize in initializer list.  Also, I've simplified to not keep
track via audio_source_provider_ as you suggest.  We may be able to clean this
up further by creating the AudioRendererImpl directly here (not passing into
constructor) instead of in RenderViewImpl.

Aaron can help us there...


On 2011/12/19 15:26:24, tommi wrote:

 }
 
 bool WebMediaPlayerImpl::Initialize(
     WebKit::WebFrame* frame,
     bool use_simple_data_source) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   MessageLoop* pipeline_message_loop =
       message_loop_factory_->GetMessageLoop("PipelineThread");
   if (!pipeline_message_loop) {
     NOTREACHED() << "Could not start PipelineThread";
@@ skipping 772 matching lines @@
     proxy_ = NULL;
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   DCHECK(client_);
   return client_;
 }
 
+WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() {
+  if (!audio_sink_render_callback_)

[tommi (sloooow) - chröme, 2011/12/19 15:26:24]

maybe a comment on why we don't return the audio source provider if the callback
isn't set.

[Chris Rogers, 2011/12/19 21:40:35]

I've taken this out, since it's no longer relevant.  It was part of an older bit
of code where it was required.

On 2011/12/19 15:26:24, tommi wrote:

+    return NULL;
+
+  return audio_source_provider_;
+}
+
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media