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

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

Issue 418143005: media: Introduce Renderer interface and RendererImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor cleanup Created 6 years, 4 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
« media/filters/video_renderer_impl_unittest.cc ('K') | « media/media.gyp ('k') | no next file » | 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 94aac8aa61867888990a4fb193458a68cf75092b..f60d115cbdfab90116cb9c4ad9f035d38180a7a7 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -30,6 +30,7 @@
#include "media/filters/ffmpeg_demuxer.h"
#include "media/filters/ffmpeg_video_decoder.h"
#include "media/filters/file_data_source.h"
+#include "media/filters/renderer_impl.h"
#include "media/filters/video_renderer_impl.h"
#include "media/tools/player_x11/data_source_logger.h"
@@ -114,13 +115,12 @@ void InitPipeline(
ScopedVector<media::VideoDecoder> video_decoders;
video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner));
- scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl(
- task_runner,
- video_decoders.Pass(),
- media::SetDecryptorReadyCB(),
- paint_cb,
- true));
- collection->SetVideoRenderer(video_renderer.Pass());
+ scoped_ptr<media::VideoRenderer> video_renderer(
+ new media::VideoRendererImpl(task_runner,
+ video_decoders.Pass(),
+ media::SetDecryptorReadyCB(),
+ paint_cb,
+ true));
ScopedVector<media::AudioDecoder> audio_decoders;
audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner,
@@ -140,16 +140,21 @@ void InitPipeline(
media::SetDecryptorReadyCB(),
&hardware_config));
- collection->SetAudioRenderer(audio_renderer.Pass());
+ scoped_ptr<media::Renderer> renderer(new media::RendererImpl(
+ task_runner, demuxer, audio_renderer.Pass(), video_renderer.Pass()));
+
+ collection->SetRenderer(renderer.Pass());
base::WaitableEvent event(true, false);
media::PipelineStatus status;
- pipeline->Start(
- collection.Pass(), base::Bind(&DoNothing), base::Bind(&OnStatus),
- base::Bind(&SaveStatusAndSignal, &event, &status),
- base::Bind(&OnMetadata), base::Bind(&OnBufferingStateChanged),
- base::Bind(&DoNothing));
+ pipeline->Start(collection.Pass(),
+ base::Bind(&DoNothing),
+ base::Bind(&OnStatus),
+ base::Bind(&SaveStatusAndSignal, &event, &status),
+ base::Bind(&OnMetadata),
+ base::Bind(&OnBufferingStateChanged),
+ base::Bind(&DoNothing));
// Wait until the pipeline is fully initialized.
event.Wait();
« media/filters/video_renderer_impl_unittest.cc ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698