| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "media/mojo/clients/mojo_renderer_factory.h" | 5 #include "media/mojo/clients/mojo_renderer_factory.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "media/mojo/clients/mojo_renderer.h" | 9 #include "media/mojo/clients/mojo_renderer.h" |
| 10 #include "media/renderers/video_overlay_factory.h" | 10 #include "media/renderers/video_overlay_factory.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 DCHECK(interface_provider_); | 21 DCHECK(interface_provider_); |
| 22 } | 22 } |
| 23 | 23 |
| 24 MojoRendererFactory::~MojoRendererFactory() {} | 24 MojoRendererFactory::~MojoRendererFactory() {} |
| 25 | 25 |
| 26 std::unique_ptr<Renderer> MojoRendererFactory::CreateRenderer( | 26 std::unique_ptr<Renderer> MojoRendererFactory::CreateRenderer( |
| 27 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 27 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 28 const scoped_refptr<base::TaskRunner>& /* worker_task_runner */, | 28 const scoped_refptr<base::TaskRunner>& /* worker_task_runner */, |
| 29 AudioRendererSink* /* audio_renderer_sink */, | 29 AudioRendererSink* /* audio_renderer_sink */, |
| 30 VideoRendererSink* video_renderer_sink, | 30 VideoRendererSink* video_renderer_sink, |
| 31 const RequestSurfaceCB& /* request_surface_cb */) { | 31 const RequestOverlayInfoCB& /* request_overlay_info_cb */) { |
| 32 std::unique_ptr<VideoOverlayFactory> overlay_factory; | 32 std::unique_ptr<VideoOverlayFactory> overlay_factory; |
| 33 | 33 |
| 34 // |get_gpu_factories_cb_| can be null in the HLS/MediaPlayerRenderer case, | 34 // |get_gpu_factories_cb_| can be null in the HLS/MediaPlayerRenderer case, |
| 35 // when we do not need to create video overlays. | 35 // when we do not need to create video overlays. |
| 36 if (!get_gpu_factories_cb_.is_null()) { | 36 if (!get_gpu_factories_cb_.is_null()) { |
| 37 overlay_factory = | 37 overlay_factory = |
| 38 base::MakeUnique<VideoOverlayFactory>(get_gpu_factories_cb_.Run()); | 38 base::MakeUnique<VideoOverlayFactory>(get_gpu_factories_cb_.Run()); |
| 39 } | 39 } |
| 40 | 40 |
| 41 mojom::RendererPtr renderer_ptr; | 41 mojom::RendererPtr renderer_ptr; |
| 42 service_manager::GetInterface<mojom::Renderer>(interface_provider_, | 42 service_manager::GetInterface<mojom::Renderer>(interface_provider_, |
| 43 &renderer_ptr); | 43 &renderer_ptr); |
| 44 | 44 |
| 45 return std::unique_ptr<Renderer>( | 45 return std::unique_ptr<Renderer>( |
| 46 new MojoRenderer(media_task_runner, std::move(overlay_factory), | 46 new MojoRenderer(media_task_runner, std::move(overlay_factory), |
| 47 video_renderer_sink, std::move(renderer_ptr))); | 47 video_renderer_sink, std::move(renderer_ptr))); |
| 48 } | 48 } |
| 49 | 49 |
| 50 } // namespace media | 50 } // namespace media |
| OLD | NEW |