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

Unified Diff: media/renderers/default_renderer_factory.cc

Issue 1094553002: Revert "Speculative revert by sheriff" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/renderers/default_renderer_factory.h ('k') | media/renderers/renderer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/default_renderer_factory.cc
diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc
index 81162d35e2a1956cb4e2aece8fde4b58cbd034d0..0ec129a47dd8bef26dc90ec628e40acc77e9da65 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -38,7 +38,8 @@ DefaultRendererFactory::~DefaultRendererFactory() {
// TODO(xhwang): Use RendererConfig to customize what decoders we use.
scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
- AudioRendererSink* audio_renderer_sink) {
+ AudioRendererSink* audio_renderer_sink,
+ VideoRendererSink* video_renderer_sink) {
DCHECK(audio_renderer_sink);
// Create our audio decoders and renderer.
@@ -75,8 +76,9 @@ scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner));
#endif
- scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
- media_task_runner, video_decoders.Pass(), true, media_log_));
+ scoped_ptr<VideoRenderer> video_renderer(
+ new VideoRendererImpl(media_task_runner, video_renderer_sink,
+ video_decoders.Pass(), true, media_log_));
// Create renderer.
return scoped_ptr<Renderer>(new RendererImpl(
« no previous file with comments | « media/renderers/default_renderer_factory.h ('k') | media/renderers/renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698