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/base/renderer.h" | |
18 #include "media/blink/webmediaplayer_impl.h" | 17 #include "media/blink/webmediaplayer_impl.h" |
19 #include "media/blink/webmediaplayer_params.h" | 18 #include "media/blink/webmediaplayer_params.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_impl.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 namespace mojo { |
27 | 27 |
28 WebMediaPlayerFactory::WebMediaPlayerFactory( | 28 WebMediaPlayerFactory::WebMediaPlayerFactory( |
29 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, | 29 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
30 bool enable_mojo_media_renderer) | 30 bool enable_mojo_media_renderer) |
31 : compositor_task_runner_(compositor_task_runner), | 31 : compositor_task_runner_(compositor_task_runner), |
32 enable_mojo_media_renderer_(enable_mojo_media_renderer), | 32 enable_mojo_media_renderer_(enable_mojo_media_renderer), |
(...skipping 13 matching lines...) Expand all Loading... | |
46 | 46 |
47 WebMediaPlayerFactory::~WebMediaPlayerFactory() { | 47 WebMediaPlayerFactory::~WebMediaPlayerFactory() { |
48 } | 48 } |
49 | 49 |
50 blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer( | 50 blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer( |
51 blink::WebLocalFrame* frame, | 51 blink::WebLocalFrame* frame, |
52 const blink::WebURL& url, | 52 const blink::WebURL& url, |
53 blink::WebMediaPlayerClient* client, | 53 blink::WebMediaPlayerClient* client, |
54 Shell* shell) { | 54 Shell* shell) { |
55 #if defined(OS_ANDROID) | 55 #if defined(OS_ANDROID) |
56 return NULL; | 56 return nullptr; |
57 #else | 57 #else |
58 scoped_ptr<media::Renderer> renderer; | 58 scoped_refptr<media::MediaLog> media_log(new media::MediaLog()); |
59 scoped_ptr<media::RendererFactory> media_renderer_factory; | |
59 | 60 |
60 if (enable_mojo_media_renderer_) { | 61 if (enable_mojo_media_renderer_) { |
61 ServiceProviderPtr media_renderer_service_provider; | 62 ServiceProviderPtr media_renderer_service_provider; |
62 shell->ConnectToApplication("mojo:media", | 63 shell->ConnectToApplication("mojo:media", |
63 GetProxy(&media_renderer_service_provider)); | 64 GetProxy(&media_renderer_service_provider)); |
64 | 65 media_renderer_factory.reset( |
65 MediaRendererPtr mojo_media_renderer; | 66 new media::MojoRendererFactory(media_renderer_service_provider.Pass())); |
66 ConnectToService(media_renderer_service_provider.get(), | 67 } else { |
67 &mojo_media_renderer); | 68 media_renderer_factory.reset( |
68 | 69 new media::DefaultRendererFactory(media_log, |
69 renderer.reset(new media::MojoRendererImpl(GetMediaThreadTaskRunner(), | 70 nullptr, // No GPU factory. |
70 mojo_media_renderer.Pass())); | 71 GetAudioHardwareConfig())); |
71 } | 72 } |
72 | 73 |
73 media::WebMediaPlayerParams params( | 74 media::WebMediaPlayerParams params( |
74 media::WebMediaPlayerParams::DeferLoadCB(), | 75 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(), |
75 CreateAudioRendererSink(), | 76 media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, NULL); |
jamesr
2014/12/09 04:25:00
nullptr
xhwang
2014/12/09 18:05:52
Done.
| |
76 GetAudioHardwareConfig(), | |
77 new media::MediaLog(), | |
78 scoped_refptr<media::GpuVideoAcceleratorFactories>(), | |
79 GetMediaThreadTaskRunner(), | |
80 compositor_task_runner_, | |
81 NULL); | |
82 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; | 77 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; |
83 | 78 |
84 // TODO(xhwang): Provide a media based CdmFactory implementation. | 79 // TODO(xhwang): Provide a media based CdmFactory implementation. |
85 return new media::WebMediaPlayerImpl(frame, client, delegate, renderer.Pass(), | 80 return new media::WebMediaPlayerImpl( |
86 nullptr, params); | 81 frame, client, delegate, media_renderer_factory.Pass(), nullptr, params); |
87 #endif | 82 #endif |
88 } | 83 } |
89 | 84 |
90 const media::AudioHardwareConfig& | 85 const media::AudioHardwareConfig& |
91 WebMediaPlayerFactory::GetAudioHardwareConfig() { | 86 WebMediaPlayerFactory::GetAudioHardwareConfig() { |
92 return audio_hardware_config_; | 87 return audio_hardware_config_; |
93 } | 88 } |
94 | 89 |
95 scoped_refptr<media::AudioRendererSink> | 90 scoped_refptr<media::AudioRendererSink> |
96 WebMediaPlayerFactory::CreateAudioRendererSink() { | 91 WebMediaPlayerFactory::CreateAudioRendererSink() { |
97 // TODO(dalecurtis): Replace this with an interface to an actual mojo service; | 92 // TODO(dalecurtis): Replace this with an interface to an actual mojo service; |
98 // the AudioOutputStreamSink will not work in sandboxed processes. | 93 // the AudioOutputStreamSink will not work in sandboxed processes. |
99 return new media::AudioOutputStreamSink(); | 94 return new media::AudioOutputStreamSink(); |
100 } | 95 } |
101 | 96 |
102 scoped_refptr<base::SingleThreadTaskRunner> | 97 scoped_refptr<base::SingleThreadTaskRunner> |
103 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { | 98 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { |
104 if (!media_thread_.IsRunning()) | 99 if (!media_thread_.IsRunning()) |
105 media_thread_.Start(); | 100 media_thread_.Start(); |
106 | 101 |
107 return media_thread_.message_loop_proxy(); | 102 return media_thread_.message_loop_proxy(); |
108 } | 103 } |
109 | 104 |
110 } // namespace mojo | 105 } // namespace mojo |
OLD | NEW |