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/cdm/default_cdm_factory.h" | 19 #include "media/cdm/default_cdm_factory.h" |
20 #include "media/filters/default_renderer_factory.h" | 20 #include "media/filters/default_renderer_factory.h" |
21 #include "media/filters/gpu_video_accelerator_factories.h" | 21 #include "media/filters/gpu_video_accelerator_factories.h" |
22 #include "media/mojo/interfaces/content_decryption_module_factory.mojom.h" | |
22 #include "media/mojo/interfaces/media_renderer.mojom.h" | 23 #include "media/mojo/interfaces/media_renderer.mojom.h" |
24 #include "media/mojo/services/mojo_cdm_factory.h" | |
23 #include "media/mojo/services/mojo_renderer_factory.h" | 25 #include "media/mojo/services/mojo_renderer_factory.h" |
24 #include "mojo/public/cpp/application/connect.h" | 26 #include "mojo/public/cpp/application/connect.h" |
25 #include "mojo/public/interfaces/application/shell.mojom.h" | 27 #include "mojo/public/interfaces/application/shell.mojom.h" |
26 | 28 |
27 using mojo::ServiceProviderPtr; | 29 using mojo::ServiceProviderPtr; |
28 | 30 |
29 namespace html_viewer { | 31 namespace html_viewer { |
30 | 32 |
31 #if !defined(OS_ANDROID) | 33 #if !defined(OS_ANDROID) |
32 namespace { | 34 namespace { |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
78 blink::WebLocalFrame* frame, | 80 blink::WebLocalFrame* frame, |
79 const blink::WebURL& url, | 81 const blink::WebURL& url, |
80 blink::WebMediaPlayerClient* client, | 82 blink::WebMediaPlayerClient* client, |
81 blink::WebContentDecryptionModule* initial_cdm, | 83 blink::WebContentDecryptionModule* initial_cdm, |
82 mojo::Shell* shell) { | 84 mojo::Shell* shell) { |
83 #if defined(OS_ANDROID) | 85 #if defined(OS_ANDROID) |
84 return nullptr; | 86 return nullptr; |
85 #else | 87 #else |
86 scoped_refptr<media::MediaLog> media_log(new media::MediaLog()); | 88 scoped_refptr<media::MediaLog> media_log(new media::MediaLog()); |
87 scoped_ptr<media::RendererFactory> media_renderer_factory; | 89 scoped_ptr<media::RendererFactory> media_renderer_factory; |
90 scoped_ptr<media::CdmFactory> cdm_factory; | |
88 | 91 |
89 if (enable_mojo_media_renderer_) { | 92 if (enable_mojo_media_renderer_) { |
90 ServiceProviderPtr media_renderer_service_provider; | 93 ServiceProviderPtr media_service_provider; |
91 shell->ConnectToApplication("mojo:media", | 94 shell->ConnectToApplication("mojo:media", |
92 GetProxy(&media_renderer_service_provider)); | 95 GetProxy(&media_service_provider)); |
96 | |
97 // TODO(xhwang): Create only one |cdm_factory_ptr| per process. | |
98 mojo::ContentDecryptionModuleFactoryPtr cdm_factory_ptr; | |
99 mojo::ConnectToService(media_service_provider.get(), &cdm_factory_ptr); | |
100 cdm_factory.reset(new media::MojoCdmFactory(cdm_factory_ptr.Pass())); | |
xhwang
2015/01/05 23:52:38
Background for another CL (https://codereview.chro
| |
101 | |
93 media_renderer_factory.reset(new media::MojoRendererFactory(make_scoped_ptr( | 102 media_renderer_factory.reset(new media::MojoRendererFactory(make_scoped_ptr( |
94 new RendererServiceProvider(media_renderer_service_provider.Pass())))); | 103 new RendererServiceProvider(media_service_provider.Pass())))); |
95 } else { | 104 } else { |
96 media_renderer_factory.reset( | 105 media_renderer_factory.reset( |
97 new media::DefaultRendererFactory(media_log, | 106 new media::DefaultRendererFactory(media_log, |
98 nullptr, // No GPU factory. | 107 nullptr, // No GPU factory. |
99 GetAudioHardwareConfig())); | 108 GetAudioHardwareConfig())); |
109 cdm_factory.reset(new media::DefaultCdmFactory()); | |
100 } | 110 } |
101 | 111 |
102 media::WebMediaPlayerParams params(media::WebMediaPlayerParams::DeferLoadCB(), | 112 media::WebMediaPlayerParams params(media::WebMediaPlayerParams::DeferLoadCB(), |
103 CreateAudioRendererSink(), media_log, | 113 CreateAudioRendererSink(), media_log, |
104 GetMediaThreadTaskRunner(), | 114 GetMediaThreadTaskRunner(), |
105 compositor_task_runner_, initial_cdm); | 115 compositor_task_runner_, initial_cdm); |
106 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; | 116 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; |
107 | 117 |
108 scoped_ptr<media::CdmFactory> cdm_factory(new media::DefaultCdmFactory()); | |
109 | |
110 return new media::WebMediaPlayerImpl(frame, client, delegate, | 118 return new media::WebMediaPlayerImpl(frame, client, delegate, |
111 media_renderer_factory.Pass(), | 119 media_renderer_factory.Pass(), |
112 cdm_factory.Pass(), params); | 120 cdm_factory.Pass(), params); |
113 #endif | 121 #endif |
114 } | 122 } |
115 | 123 |
116 const media::AudioHardwareConfig& | 124 const media::AudioHardwareConfig& |
117 WebMediaPlayerFactory::GetAudioHardwareConfig() { | 125 WebMediaPlayerFactory::GetAudioHardwareConfig() { |
118 return audio_hardware_config_; | 126 return audio_hardware_config_; |
119 } | 127 } |
120 | 128 |
121 scoped_refptr<media::AudioRendererSink> | 129 scoped_refptr<media::AudioRendererSink> |
122 WebMediaPlayerFactory::CreateAudioRendererSink() { | 130 WebMediaPlayerFactory::CreateAudioRendererSink() { |
123 // TODO(dalecurtis): Replace this with an interface to an actual mojo service; | 131 // TODO(dalecurtis): Replace this with an interface to an actual mojo service; |
124 // the AudioOutputStreamSink will not work in sandboxed processes. | 132 // the AudioOutputStreamSink will not work in sandboxed processes. |
125 return new media::AudioOutputStreamSink(); | 133 return new media::AudioOutputStreamSink(); |
126 } | 134 } |
127 | 135 |
128 scoped_refptr<base::SingleThreadTaskRunner> | 136 scoped_refptr<base::SingleThreadTaskRunner> |
129 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { | 137 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { |
130 if (!media_thread_.IsRunning()) | 138 if (!media_thread_.IsRunning()) |
131 media_thread_.Start(); | 139 media_thread_.Start(); |
132 | 140 |
133 return media_thread_.message_loop_proxy(); | 141 return media_thread_.message_loop_proxy(); |
134 } | 142 } |
135 | 143 |
136 } // namespace html_viewer | 144 } // namespace html_viewer |
OLD | NEW |