Chromium Code Reviews| Index: chromecast/renderer/media/chromecast_media_renderer_factory.cc |
| diff --git a/chromecast/renderer/media/chromecast_media_renderer_factory.cc b/chromecast/renderer/media/chromecast_media_renderer_factory.cc |
| index cdfab39f13920068b510c6d9ff84a027cddaa264..62fe7716a3d9770f28d3e2fa8ad841e6ea3dcd6a 100644 |
| --- a/chromecast/renderer/media/chromecast_media_renderer_factory.cc |
| +++ b/chromecast/renderer/media/chromecast_media_renderer_factory.cc |
| @@ -29,7 +29,8 @@ ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() { |
| scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer( |
| const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| - ::media::AudioRendererSink* audio_renderer_sink) { |
| + ::media::AudioRendererSink* audio_renderer_sink, |
| + ::media::VideoRendererSink* video_renderer_sink) { |
| if (!default_render_factory_) { |
| // Chromecast doesn't have input audio devices, so leave this uninitialized |
| ::media::AudioParameters input_audio_params; |
| @@ -61,10 +62,11 @@ scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer( |
| content::RenderThread::Get()->GetIOMessageLoopProxy(), |
| cma_load_type)); |
| scoped_ptr<CmaRenderer> cma_renderer( |
| - new CmaRenderer(cma_media_pipeline.Pass())); |
| + new CmaRenderer(cma_media_pipeline.Pass(), video_renderer_sink)); |
|
DaleCurtis
2015/04/15 16:30:58
This looks fine to me, but it's up to your team if
gunsch
2015/04/15 16:38:09
MediaPipelineProxy mostly coordinates a few dumb p
|
| scoped_ptr<::media::Renderer> default_media_render( |
| default_render_factory_->CreateRenderer(media_task_runner, |
| - audio_renderer_sink)); |
| + audio_renderer_sink, |
| + video_renderer_sink)); |
|
DaleCurtis
2015/04/15 16:30:58
Note, you'll need to be careful about who starts a
gunsch
2015/04/15 16:38:09
Good thought. We only ever initialize one of the r
|
| scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer( |
| default_media_render.Pass(), cma_renderer.Pass())); |
| return media_renderer.Pass(); |