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 "mojo/services/html_viewer/webmediaplayer_factory.h" | 5 #include "mojo/services/html_viewer/webmediaplayer_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
11 #include "media/audio/audio_manager.h" | 11 #include "media/audio/audio_manager.h" |
12 #include "media/audio/audio_manager_base.h" | 12 #include "media/audio/audio_manager_base.h" |
13 #include "media/audio/audio_output_stream_sink.h" | 13 #include "media/audio/audio_output_stream_sink.h" |
14 #include "media/base/audio_hardware_config.h" | 14 #include "media/base/audio_hardware_config.h" |
15 #include "media/base/media.h" | 15 #include "media/base/media.h" |
16 #include "media/base/media_log.h" | 16 #include "media/base/media_log.h" |
17 #include "media/blink/webmediaplayer_impl.h" | 17 #include "media/blink/webmediaplayer_impl.h" |
18 #include "media/blink/webmediaplayer_params.h" | 18 #include "media/blink/webmediaplayer_params.h" |
19 #include "media/filters/default_renderer_factory.h" | 19 #include "media/filters/default_renderer_factory.h" |
20 #include "media/filters/gpu_video_accelerator_factories.h" | 20 #include "media/filters/gpu_video_accelerator_factories.h" |
21 #include "media/mojo/interfaces/media_renderer.mojom.h" | 21 #include "media/mojo/interfaces/media_renderer.mojom.h" |
22 #include "media/mojo/services/mojo_renderer_factory.h" | 22 #include "media/mojo/services/mojo_renderer_factory.h" |
23 #include "mojo/public/cpp/application/connect.h" | 23 #include "mojo/public/cpp/application/connect.h" |
24 #include "mojo/public/interfaces/application/shell.mojom.h" | 24 #include "mojo/public/interfaces/application/shell.mojom.h" |
25 | 25 |
26 namespace mojo { | 26 using mojo::ServiceProviderPtr; |
| 27 |
| 28 namespace html_viewer { |
27 | 29 |
28 #if !defined(OS_ANDROID) | 30 #if !defined(OS_ANDROID) |
29 namespace { | 31 namespace { |
30 | 32 |
31 class RendererServiceProvider | 33 class RendererServiceProvider |
32 : public media::MojoRendererFactory::ServiceProvider { | 34 : public media::MojoRendererFactory::ServiceProvider { |
33 public: | 35 public: |
34 explicit RendererServiceProvider(ServiceProviderPtr service_provider_ptr) | 36 explicit RendererServiceProvider(ServiceProviderPtr service_provider_ptr) |
35 : service_provider_ptr_(service_provider_ptr.Pass()) {} | 37 : service_provider_ptr_(service_provider_ptr.Pass()) {} |
36 ~RendererServiceProvider() final {} | 38 ~RendererServiceProvider() final {} |
37 | 39 |
38 void ConnectToService(InterfacePtr<MediaRenderer>* media_renderer_ptr) final { | 40 void ConnectToService( |
| 41 mojo::InterfacePtr<mojo::MediaRenderer>* media_renderer_ptr) final { |
39 mojo::ConnectToService(service_provider_ptr_.get(), media_renderer_ptr); | 42 mojo::ConnectToService(service_provider_ptr_.get(), media_renderer_ptr); |
40 } | 43 } |
41 | 44 |
42 private: | 45 private: |
43 ServiceProviderPtr service_provider_ptr_; | 46 ServiceProviderPtr service_provider_ptr_; |
44 | 47 |
45 DISALLOW_COPY_AND_ASSIGN(RendererServiceProvider); | 48 DISALLOW_COPY_AND_ASSIGN(RendererServiceProvider); |
46 }; | 49 }; |
47 | 50 |
48 } // namespace | 51 } // namespace |
(...skipping 18 matching lines...) Expand all Loading... |
67 } | 70 } |
68 } | 71 } |
69 | 72 |
70 WebMediaPlayerFactory::~WebMediaPlayerFactory() { | 73 WebMediaPlayerFactory::~WebMediaPlayerFactory() { |
71 } | 74 } |
72 | 75 |
73 blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer( | 76 blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer( |
74 blink::WebLocalFrame* frame, | 77 blink::WebLocalFrame* frame, |
75 const blink::WebURL& url, | 78 const blink::WebURL& url, |
76 blink::WebMediaPlayerClient* client, | 79 blink::WebMediaPlayerClient* client, |
77 Shell* shell) { | 80 mojo::Shell* shell) { |
78 #if defined(OS_ANDROID) | 81 #if defined(OS_ANDROID) |
79 return nullptr; | 82 return nullptr; |
80 #else | 83 #else |
81 scoped_refptr<media::MediaLog> media_log(new media::MediaLog()); | 84 scoped_refptr<media::MediaLog> media_log(new media::MediaLog()); |
82 scoped_ptr<media::RendererFactory> media_renderer_factory; | 85 scoped_ptr<media::RendererFactory> media_renderer_factory; |
83 | 86 |
84 if (enable_mojo_media_renderer_) { | 87 if (enable_mojo_media_renderer_) { |
85 ServiceProviderPtr media_renderer_service_provider; | 88 ServiceProviderPtr media_renderer_service_provider; |
86 shell->ConnectToApplication("mojo:media", | 89 shell->ConnectToApplication("mojo:media", |
87 GetProxy(&media_renderer_service_provider)); | 90 GetProxy(&media_renderer_service_provider)); |
(...skipping 30 matching lines...) Expand all Loading... |
118 } | 121 } |
119 | 122 |
120 scoped_refptr<base::SingleThreadTaskRunner> | 123 scoped_refptr<base::SingleThreadTaskRunner> |
121 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { | 124 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { |
122 if (!media_thread_.IsRunning()) | 125 if (!media_thread_.IsRunning()) |
123 media_thread_.Start(); | 126 media_thread_.Start(); |
124 | 127 |
125 return media_thread_.message_loop_proxy(); | 128 return media_thread_.message_loop_proxy(); |
126 } | 129 } |
127 | 130 |
128 } // namespace mojo | 131 } // namespace html_viewer |
OLD | NEW |