| 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" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 new media::MojoRendererFactory(media_renderer_service_provider.Pass())); | 66 new media::MojoRendererFactory(media_renderer_service_provider.Pass())); |
| 67 } else { | 67 } else { |
| 68 media_renderer_factory.reset( | 68 media_renderer_factory.reset( |
| 69 new media::DefaultRendererFactory(media_log, | 69 new media::DefaultRendererFactory(media_log, |
| 70 nullptr, // No GPU factory. | 70 nullptr, // No GPU factory. |
| 71 GetAudioHardwareConfig())); | 71 GetAudioHardwareConfig())); |
| 72 } | 72 } |
| 73 | 73 |
| 74 media::WebMediaPlayerParams params( | 74 media::WebMediaPlayerParams params( |
| 75 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(), | 75 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(), |
| 76 media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, nullptr); | 76 media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, |
| 77 media::WebMediaPlayerParams::Context3DCB(), nullptr); |
| 77 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; | 78 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; |
| 78 | 79 |
| 79 // TODO(xhwang): Provide a media based CdmFactory implementation. | 80 // TODO(xhwang): Provide a media based CdmFactory implementation. |
| 80 return new media::WebMediaPlayerImpl( | 81 return new media::WebMediaPlayerImpl( |
| 81 frame, client, delegate, media_renderer_factory.Pass(), nullptr, params); | 82 frame, client, delegate, media_renderer_factory.Pass(), nullptr, params); |
| 82 #endif | 83 #endif |
| 83 } | 84 } |
| 84 | 85 |
| 85 const media::AudioHardwareConfig& | 86 const media::AudioHardwareConfig& |
| 86 WebMediaPlayerFactory::GetAudioHardwareConfig() { | 87 WebMediaPlayerFactory::GetAudioHardwareConfig() { |
| 87 return audio_hardware_config_; | 88 return audio_hardware_config_; |
| 88 } | 89 } |
| 89 | 90 |
| 90 scoped_refptr<media::AudioRendererSink> | 91 scoped_refptr<media::AudioRendererSink> |
| 91 WebMediaPlayerFactory::CreateAudioRendererSink() { | 92 WebMediaPlayerFactory::CreateAudioRendererSink() { |
| 92 // TODO(dalecurtis): Replace this with an interface to an actual mojo service; | 93 // TODO(dalecurtis): Replace this with an interface to an actual mojo service; |
| 93 // the AudioOutputStreamSink will not work in sandboxed processes. | 94 // the AudioOutputStreamSink will not work in sandboxed processes. |
| 94 return new media::AudioOutputStreamSink(); | 95 return new media::AudioOutputStreamSink(); |
| 95 } | 96 } |
| 96 | 97 |
| 97 scoped_refptr<base::SingleThreadTaskRunner> | 98 scoped_refptr<base::SingleThreadTaskRunner> |
| 98 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { | 99 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { |
| 99 if (!media_thread_.IsRunning()) | 100 if (!media_thread_.IsRunning()) |
| 100 media_thread_.Start(); | 101 media_thread_.Start(); |
| 101 | 102 |
| 102 return media_thread_.message_loop_proxy(); | 103 return media_thread_.message_loop_proxy(); |
| 103 } | 104 } |
| 104 | 105 |
| 105 } // namespace mojo | 106 } // namespace mojo |
| OLD | NEW |