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

Unified Diff: media/tools/player_x11/player_x11.cc

Issue 66183002: Replace MessageLoopProxy with SingleThreadTaskRunner for the rest of media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win and audio tests Created 6 years, 11 months 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
« no previous file with comments | « media/media.gyp ('k') | media/video/capture/mac/video_capture_device_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index fe3beec5a8b8c1c5838055f7197266194a069b99..32e501955e1d279cdd49ac810051a011b4523bb1 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());
« no previous file with comments | « media/media.gyp ('k') | media/video/capture/mac/video_capture_device_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698