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