OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chromecast/renderer/media/chromecast_media_renderer_factory.h" | 5 #include "chromecast/renderer/media/chromecast_media_renderer_factory.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chromecast/media/base/switching_media_renderer.h" | 8 #include "chromecast/media/base/switching_media_renderer.h" |
9 #include "chromecast/media/cma/filters/cma_renderer.h" | 9 #include "chromecast/media/cma/filters/cma_renderer.h" |
10 #include "chromecast/renderer/media/media_pipeline_proxy.h" | 10 #include "chromecast/renderer/media/media_pipeline_proxy.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 : render_frame_id_(render_frame_id), | 24 : render_frame_id_(render_frame_id), |
25 gpu_factories_(gpu_factories), | 25 gpu_factories_(gpu_factories), |
26 media_log_(media_log) { | 26 media_log_(media_log) { |
27 } | 27 } |
28 | 28 |
29 ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() { | 29 ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() { |
30 } | 30 } |
31 | 31 |
32 scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer( | 32 scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer( |
33 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 33 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 34 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
34 ::media::AudioRendererSink* audio_renderer_sink, | 35 ::media::AudioRendererSink* audio_renderer_sink, |
35 ::media::VideoRendererSink* video_renderer_sink) { | 36 ::media::VideoRendererSink* video_renderer_sink) { |
36 if (!default_render_factory_) { | 37 if (!default_render_factory_) { |
37 // Chromecast doesn't have input audio devices, so leave this uninitialized | 38 // Chromecast doesn't have input audio devices, so leave this uninitialized |
38 ::media::AudioParameters input_audio_params; | 39 ::media::AudioParameters input_audio_params; |
39 // TODO(servolk): Audio parameters are hardcoded for now, but in the future | 40 // TODO(servolk): Audio parameters are hardcoded for now, but in the future |
40 // either we need to obtain AudioHardwareConfig from RenderThreadImpl, | 41 // either we need to obtain AudioHardwareConfig from RenderThreadImpl, |
41 // or media renderer needs to figure out optimal audio parameters itself. | 42 // or media renderer needs to figure out optimal audio parameters itself. |
42 const int kDefaultSamplingRate = 48000; | 43 const int kDefaultSamplingRate = 48000; |
43 const int kDefaultBitsPerSample = 16; | 44 const int kDefaultBitsPerSample = 16; |
(...skipping 16 matching lines...) Expand all Loading... |
60 // TODO(erickung): crbug.com/443956. Need to provide right LoadType. | 61 // TODO(erickung): crbug.com/443956. Need to provide right LoadType. |
61 LoadType cma_load_type = kLoadTypeMediaSource; | 62 LoadType cma_load_type = kLoadTypeMediaSource; |
62 scoped_ptr<MediaPipeline> cma_media_pipeline( | 63 scoped_ptr<MediaPipeline> cma_media_pipeline( |
63 new MediaPipelineProxy( | 64 new MediaPipelineProxy( |
64 render_frame_id_, | 65 render_frame_id_, |
65 content::RenderThread::Get()->GetIOMessageLoopProxy(), | 66 content::RenderThread::Get()->GetIOMessageLoopProxy(), |
66 cma_load_type)); | 67 cma_load_type)); |
67 scoped_ptr<CmaRenderer> cma_renderer(new CmaRenderer( | 68 scoped_ptr<CmaRenderer> cma_renderer(new CmaRenderer( |
68 cma_media_pipeline.Pass(), video_renderer_sink, gpu_factories_)); | 69 cma_media_pipeline.Pass(), video_renderer_sink, gpu_factories_)); |
69 scoped_ptr<::media::Renderer> default_media_render( | 70 scoped_ptr<::media::Renderer> default_media_render( |
70 default_render_factory_->CreateRenderer(media_task_runner, | 71 default_render_factory_->CreateRenderer( |
71 audio_renderer_sink, | 72 media_task_runner, media_task_runner, audio_renderer_sink, |
72 video_renderer_sink)); | 73 video_renderer_sink)); |
73 scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer( | 74 scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer( |
74 default_media_render.Pass(), cma_renderer.Pass())); | 75 default_media_render.Pass(), cma_renderer.Pass())); |
75 return media_renderer.Pass(); | 76 return media_renderer.Pass(); |
76 } | 77 } |
77 | 78 |
78 } // namespace media | 79 } // namespace media |
79 } // namespace chromecast | 80 } // namespace chromecast |
OLD | NEW |