diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 21:40:50 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 21:40:50 +0000 |
commit | a0e7e86682f9804b06d59d9163f8118484e30c91 (patch) | |
tree | 2d85734289e5b6dfdf54c24c5de5d8e3f8e0eb39 /media/tools | |
parent | b2a34d53b43b5c81b36d9c40caeed8353bb3c433 (diff) | |
download | chromium_src-a0e7e86682f9804b06d59d9163f8118484e30c91.zip chromium_src-a0e7e86682f9804b06d59d9163f8118484e30c91.tar.gz chromium_src-a0e7e86682f9804b06d59d9163f8118484e30c91.tar.bz2 |
Replace MessageLoopProxy with SingleThreadTaskRunner for the rest of media/.
BUG=315922
R=dalecurtis@chromium.org
TBR=jam
Review URL: https://codereview.chromium.org/66183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
-rw-r--r-- | media/tools/player_x11/player_x11.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index fe3beec..32e5019 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -108,21 +108,22 @@ static void SaveStatusAndSignal(base::WaitableEvent* event, } // TODO(vrk): Re-enabled audio. (crbug.com/112159) -void InitPipeline(media::Pipeline* pipeline, - const scoped_refptr<base::MessageLoopProxy>& message_loop, - media::Demuxer* demuxer, - const PaintCB& paint_cb, - bool /* enable_audio */, - base::MessageLoop* paint_message_loop) { +void InitPipeline( + media::Pipeline* pipeline, + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, + media::Demuxer* demuxer, + const PaintCB& paint_cb, + bool /* enable_audio */, + base::MessageLoop* paint_message_loop) { // Create our filter factories. scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); collection->SetDemuxer(demuxer); ScopedVector<media::VideoDecoder> video_decoders; - video_decoders.push_back(new media::FFmpegVideoDecoder(message_loop)); + video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner)); scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl( - message_loop, + task_runner, video_decoders.Pass(), media::SetDecryptorReadyCB(), base::Bind(&Paint, paint_message_loop, paint_cb), @@ -131,10 +132,10 @@ void InitPipeline(media::Pipeline* pipeline, collection->SetVideoRenderer(video_renderer.Pass()); ScopedVector<media::AudioDecoder> audio_decoders; - audio_decoders.push_back(new media::FFmpegAudioDecoder(message_loop)); + audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner)); scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl( - message_loop, - new media::NullAudioSink(message_loop), + task_runner, + new media::NullAudioSink(task_runner), audio_decoders.Pass(), media::SetDecryptorReadyCB())); collection->SetAudioRenderer(audio_renderer.Pass()); |