Index: content/renderer/media/webmediaplayer_ms.cc |
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc |
index ab7dd718b9c5a0628a94fa80e8d110b8567fd9ba..ff2ac4eb621674c96037c3dedced937d59a21180 100644 |
--- a/content/renderer/media/webmediaplayer_ms.cc |
+++ b/content/renderer/media/webmediaplayer_ms.cc |
@@ -96,7 +96,10 @@ WebMediaPlayerMS::WebMediaPlayerMS( |
base::WeakPtr<media::WebMediaPlayerDelegate> delegate, |
media::MediaLog* media_log, |
scoped_ptr<MediaStreamRendererFactory> factory, |
- const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner) |
+ const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
+ const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
+ const scoped_refptr<base::TaskRunner>& worker_task_runner, |
+ const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories) |
: frame_(frame), |
network_state_(WebMediaPlayer::NetworkStateEmpty), |
ready_state_(WebMediaPlayer::ReadyStateHaveNothing), |
@@ -108,6 +111,9 @@ WebMediaPlayerMS::WebMediaPlayerMS( |
received_first_frame_(false), |
media_log_(media_log), |
renderer_factory_(factory.Pass()), |
+ media_task_runner_(media_task_runner), |
+ worker_task_runner_(worker_task_runner), |
+ gpu_factories_(gpu_factories), |
compositor_(new Compositor(compositor_task_runner)), |
compositor_task_runner_(compositor_task_runner) { |
DVLOG(1) << "WebMediaPlayerMS::ctor"; |
@@ -155,7 +161,10 @@ void WebMediaPlayerMS::load(LoadType load_type, |
video_frame_provider_ = renderer_factory_->GetVideoFrameProvider( |
url, |
base::Bind(&WebMediaPlayerMS::OnSourceError, AsWeakPtr()), |
- base::Bind(&WebMediaPlayerMS::OnFrameAvailable, AsWeakPtr())); |
+ base::Bind(&WebMediaPlayerMS::OnFrameAvailable, AsWeakPtr()), |
+ media_task_runner_, |
+ worker_task_runner_, |
+ gpu_factories_); |
RenderFrame* const frame = RenderFrame::FromWebFrame(frame_); |
audio_renderer_ = renderer_factory_->GetAudioRenderer( |