| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "chromecast/renderer/media/cma_renderer.h" | 9 #include "chromecast/renderer/media/cma_renderer.h" |
| 10 #include "chromecast/renderer/media/media_pipeline_proxy.h" | 10 #include "chromecast/renderer/media/media_pipeline_proxy.h" |
| 11 #include "content/public/renderer/render_thread.h" | 11 #include "content/public/renderer/render_thread.h" |
| 12 #include "media/renderers/gpu_video_accelerator_factories.h" | 12 #include "media/renderers/gpu_video_accelerator_factories.h" |
| 13 | 13 |
| 14 namespace chromecast { | 14 namespace chromecast { |
| 15 namespace media { | 15 namespace media { |
| 16 | 16 |
| 17 ChromecastMediaRendererFactory::ChromecastMediaRendererFactory( | 17 ChromecastMediaRendererFactory::ChromecastMediaRendererFactory( |
| 18 ::media::GpuVideoAcceleratorFactories* gpu_factories, | 18 ::media::GpuVideoAcceleratorFactories* gpu_factories, |
| 19 int render_frame_id) | 19 int render_frame_id) |
| 20 : render_frame_id_(render_frame_id), gpu_factories_(gpu_factories) {} | 20 : render_frame_id_(render_frame_id), gpu_factories_(gpu_factories) {} |
| 21 | 21 |
| 22 ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() { | 22 ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() { |
| 23 } | 23 } |
| 24 | 24 |
| 25 scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer( | 25 std::unique_ptr<::media::Renderer> |
| 26 ChromecastMediaRendererFactory::CreateRenderer( |
| 26 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 27 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 27 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 28 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
| 28 ::media::AudioRendererSink* audio_renderer_sink, | 29 ::media::AudioRendererSink* audio_renderer_sink, |
| 29 ::media::VideoRendererSink* video_renderer_sink, | 30 ::media::VideoRendererSink* video_renderer_sink, |
| 30 const ::media::RequestSurfaceCB& request_surface_cb) { | 31 const ::media::RequestSurfaceCB& request_surface_cb) { |
| 31 // TODO(erickung): crbug.com/443956. Need to provide right LoadType. | 32 // TODO(erickung): crbug.com/443956. Need to provide right LoadType. |
| 32 LoadType cma_load_type = kLoadTypeMediaSource; | 33 LoadType cma_load_type = kLoadTypeMediaSource; |
| 33 scoped_ptr<MediaPipelineProxy> cma_media_pipeline(new MediaPipelineProxy( | 34 std::unique_ptr<MediaPipelineProxy> cma_media_pipeline(new MediaPipelineProxy( |
| 34 render_frame_id_, | 35 render_frame_id_, content::RenderThread::Get()->GetIOMessageLoopProxy(), |
| 35 content::RenderThread::Get()->GetIOMessageLoopProxy(), | |
| 36 cma_load_type)); | 36 cma_load_type)); |
| 37 scoped_ptr<CmaRenderer> cma_renderer(new CmaRenderer( | 37 std::unique_ptr<CmaRenderer> cma_renderer(new CmaRenderer( |
| 38 std::move(cma_media_pipeline), video_renderer_sink, gpu_factories_)); | 38 std::move(cma_media_pipeline), video_renderer_sink, gpu_factories_)); |
| 39 return std::move(cma_renderer); | 39 return std::move(cma_renderer); |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace media | 42 } // namespace media |
| 43 } // namespace chromecast | 43 } // namespace chromecast |
| OLD | NEW |