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 11 matching lines...) Expand all Loading... |
22 int render_frame_id) | 22 int render_frame_id) |
23 : render_frame_id_(render_frame_id), | 23 : render_frame_id_(render_frame_id), |
24 media_log_(media_log) { | 24 media_log_(media_log) { |
25 } | 25 } |
26 | 26 |
27 ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() { | 27 ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() { |
28 } | 28 } |
29 | 29 |
30 scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer( | 30 scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer( |
31 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 31 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
32 ::media::AudioRendererSink* audio_renderer_sink) { | 32 ::media::AudioRendererSink* audio_renderer_sink, |
| 33 ::media::VideoRendererSink* video_renderer_sink) { |
33 if (!default_render_factory_) { | 34 if (!default_render_factory_) { |
34 // Chromecast doesn't have input audio devices, so leave this uninitialized | 35 // Chromecast doesn't have input audio devices, so leave this uninitialized |
35 ::media::AudioParameters input_audio_params; | 36 ::media::AudioParameters input_audio_params; |
36 // TODO(servolk): Audio parameters are hardcoded for now, but in the future | 37 // TODO(servolk): Audio parameters are hardcoded for now, but in the future |
37 // either we need to obtain AudioHardwareConfig from RenderThreadImpl, | 38 // either we need to obtain AudioHardwareConfig from RenderThreadImpl, |
38 // or media renderer needs to figure out optimal audio parameters itself. | 39 // or media renderer needs to figure out optimal audio parameters itself. |
39 const int kDefaultSamplingRate = 48000; | 40 const int kDefaultSamplingRate = 48000; |
40 const int kDefaultBitsPerSample = 16; | 41 const int kDefaultBitsPerSample = 16; |
41 // About 20ms of stereo (2 channels) 16bit (2 byte) audio | 42 // About 20ms of stereo (2 channels) 16bit (2 byte) audio |
42 int buffer_size = kDefaultSamplingRate * 20 * 2 * 2 / 1000; | 43 int buffer_size = kDefaultSamplingRate * 20 * 2 * 2 / 1000; |
(...skipping 11 matching lines...) Expand all Loading... |
54 | 55 |
55 DCHECK(default_render_factory_); | 56 DCHECK(default_render_factory_); |
56 // TODO(erickung): crbug.com/443956. Need to provide right LoadType. | 57 // TODO(erickung): crbug.com/443956. Need to provide right LoadType. |
57 LoadType cma_load_type = kLoadTypeMediaSource; | 58 LoadType cma_load_type = kLoadTypeMediaSource; |
58 scoped_ptr<MediaPipeline> cma_media_pipeline( | 59 scoped_ptr<MediaPipeline> cma_media_pipeline( |
59 new MediaPipelineProxy( | 60 new MediaPipelineProxy( |
60 render_frame_id_, | 61 render_frame_id_, |
61 content::RenderThread::Get()->GetIOMessageLoopProxy(), | 62 content::RenderThread::Get()->GetIOMessageLoopProxy(), |
62 cma_load_type)); | 63 cma_load_type)); |
63 scoped_ptr<CmaRenderer> cma_renderer( | 64 scoped_ptr<CmaRenderer> cma_renderer( |
64 new CmaRenderer(cma_media_pipeline.Pass())); | 65 new CmaRenderer(cma_media_pipeline.Pass(), video_renderer_sink)); |
65 scoped_ptr<::media::Renderer> default_media_render( | 66 scoped_ptr<::media::Renderer> default_media_render( |
66 default_render_factory_->CreateRenderer(media_task_runner, | 67 default_render_factory_->CreateRenderer(media_task_runner, |
67 audio_renderer_sink)); | 68 audio_renderer_sink, |
| 69 video_renderer_sink)); |
68 scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer( | 70 scoped_ptr<SwitchingMediaRenderer> media_renderer(new SwitchingMediaRenderer( |
69 default_media_render.Pass(), cma_renderer.Pass())); | 71 default_media_render.Pass(), cma_renderer.Pass())); |
70 return media_renderer.Pass(); | 72 return media_renderer.Pass(); |
71 } | 73 } |
72 | 74 |
73 } // namespace media | 75 } // namespace media |
74 } // namespace chromecast | 76 } // namespace chromecast |
OLD | NEW |