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/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
8 #include "media/mojo/clients/mojo_renderer_impl.h" | 9 #include "media/mojo/clients/mojo_renderer_impl.h" |
10 #include "media/media_features.h" | |
9 #include "media/renderers/video_overlay_factory.h" | 11 #include "media/renderers/video_overlay_factory.h" |
10 #include "services/shell/public/cpp/connect.h" | 12 #include "services/shell/public/cpp/connect.h" |
11 #include "services/shell/public/interfaces/interface_provider.mojom.h" | 13 #include "services/shell/public/interfaces/interface_provider.mojom.h" |
12 | 14 |
13 namespace media { | 15 namespace media { |
14 | 16 |
15 MojoRendererFactory::MojoRendererFactory( | 17 MojoRendererFactory::MojoRendererFactory( |
16 const GetGpuFactoriesCB& get_gpu_factories_cb, | 18 const GetGpuFactoriesCB& get_gpu_factories_cb, |
17 shell::mojom::InterfaceProvider* interface_provider) | 19 shell::mojom::InterfaceProvider* interface_provider, |
20 const GURL& url) | |
18 : get_gpu_factories_cb_(get_gpu_factories_cb), | 21 : get_gpu_factories_cb_(get_gpu_factories_cb), |
19 interface_provider_(interface_provider) { | 22 interface_provider_(interface_provider), |
23 url_(url) { | |
20 DCHECK(!get_gpu_factories_cb_.is_null()); | 24 DCHECK(!get_gpu_factories_cb_.is_null()); |
21 DCHECK(interface_provider_); | 25 DCHECK(interface_provider_); |
22 } | 26 } |
23 | 27 |
24 MojoRendererFactory::~MojoRendererFactory() {} | 28 MojoRendererFactory::~MojoRendererFactory() {} |
25 | 29 |
26 std::unique_ptr<Renderer> MojoRendererFactory::CreateRenderer( | 30 std::unique_ptr<Renderer> MojoRendererFactory::CreateRenderer( |
27 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 31 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
28 const scoped_refptr<base::TaskRunner>& /* worker_task_runner */, | 32 const scoped_refptr<base::TaskRunner>& /* worker_task_runner */, |
29 AudioRendererSink* /* audio_renderer_sink */, | 33 AudioRendererSink* /* audio_renderer_sink */, |
30 VideoRendererSink* video_renderer_sink, | 34 VideoRendererSink* video_renderer_sink, |
31 const RequestSurfaceCB& /* request_surface_cb */) { | 35 const RequestSurfaceCB& /* request_surface_cb */) { |
32 std::unique_ptr<VideoOverlayFactory> overlay_factory( | 36 std::unique_ptr<VideoOverlayFactory> overlay_factory( |
33 new VideoOverlayFactory(get_gpu_factories_cb_.Run())); | 37 new VideoOverlayFactory(get_gpu_factories_cb_.Run())); |
34 | 38 |
35 mojom::RendererPtr renderer_ptr; | 39 mojom::RendererPtr renderer_ptr; |
36 shell::GetInterface<mojom::Renderer>(interface_provider_, &renderer_ptr); | 40 shell::GetInterface<mojom::Renderer>(interface_provider_, &renderer_ptr); |
37 | 41 |
38 return std::unique_ptr<Renderer>( | 42 MojoRendererImpl* renderer = |
39 new MojoRendererImpl(media_task_runner, std::move(overlay_factory), | 43 new MojoRendererImpl(media_task_runner, std::move(overlay_factory), |
40 video_renderer_sink, std::move(renderer_ptr))); | 44 video_renderer_sink, std::move(renderer_ptr)); |
45 | |
46 #if defined(FORCE_MOJO_MEDIA_PLAYER_RENDERER) | |
47 renderer->SetUrl(url_); | |
xhwang
2016/06/22 17:39:02
Now I see why you have |url| in MojoRendererFactor
| |
48 #endif | |
49 | |
50 return base::WrapUnique(renderer); | |
41 } | 51 } |
42 | 52 |
43 } // namespace media | 53 } // namespace media |
OLD | NEW |