| 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/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
| 10 #include "media/audio/audio_manager.h" | 10 #include "media/audio/audio_manager.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 } | 37 } |
| 38 } | 38 } |
| 39 | 39 |
| 40 WebMediaPlayerFactory::~WebMediaPlayerFactory() { | 40 WebMediaPlayerFactory::~WebMediaPlayerFactory() { |
| 41 } | 41 } |
| 42 | 42 |
| 43 blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer( | 43 blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer( |
| 44 blink::WebLocalFrame* frame, | 44 blink::WebLocalFrame* frame, |
| 45 const blink::WebURL& url, | 45 const blink::WebURL& url, |
| 46 blink::WebMediaPlayerClient* client) { | 46 blink::WebMediaPlayerClient* client) { |
| 47 #if defined(OS_ANDROID) |
| 48 return NULL; |
| 49 #else |
| 47 | 50 |
| 48 media::WebMediaPlayerParams params( | 51 media::WebMediaPlayerParams params( |
| 49 media::WebMediaPlayerParams::DeferLoadCB(), | 52 media::WebMediaPlayerParams::DeferLoadCB(), |
| 50 CreateAudioRendererSink(), | 53 CreateAudioRendererSink(), |
| 51 GetAudioHardwareConfig(), | 54 GetAudioHardwareConfig(), |
| 52 new media::MediaLog(), | 55 new media::MediaLog(), |
| 53 scoped_refptr<media::GpuVideoAcceleratorFactories>(), | 56 scoped_refptr<media::GpuVideoAcceleratorFactories>(), |
| 54 GetMediaThreadTaskRunner(), | 57 GetMediaThreadTaskRunner(), |
| 55 compositor_task_runner_, | 58 compositor_task_runner_, |
| 56 base::Bind(&media::NullEncryptedMediaPlayerSupport::Create)); | 59 base::Bind(&media::NullEncryptedMediaPlayerSupport::Create)); |
| 57 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; | 60 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; |
| 58 | 61 |
| 59 return new media::WebMediaPlayerImpl(frame, client, delegate, params); | 62 return new media::WebMediaPlayerImpl(frame, client, delegate, params); |
| 63 #endif |
| 60 } | 64 } |
| 61 | 65 |
| 62 const media::AudioHardwareConfig& | 66 const media::AudioHardwareConfig& |
| 63 WebMediaPlayerFactory::GetAudioHardwareConfig() { | 67 WebMediaPlayerFactory::GetAudioHardwareConfig() { |
| 64 return audio_hardware_config_; | 68 return audio_hardware_config_; |
| 65 } | 69 } |
| 66 | 70 |
| 67 scoped_refptr<media::AudioRendererSink> | 71 scoped_refptr<media::AudioRendererSink> |
| 68 WebMediaPlayerFactory::CreateAudioRendererSink() { | 72 WebMediaPlayerFactory::CreateAudioRendererSink() { |
| 69 // TODO(acolwell): Replace this with an AudioRendererSink implementation | 73 // TODO(acolwell): Replace this with an AudioRendererSink implementation |
| 70 // that actually talks to the audio device or an audio mojo service. | 74 // that actually talks to the audio device or an audio mojo service. |
| 71 return new media::NullAudioSink(GetMediaThreadTaskRunner()); | 75 return new media::NullAudioSink(GetMediaThreadTaskRunner()); |
| 72 } | 76 } |
| 73 | 77 |
| 74 scoped_refptr<base::SingleThreadTaskRunner> | 78 scoped_refptr<base::SingleThreadTaskRunner> |
| 75 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { | 79 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { |
| 76 if (!media_thread_.IsRunning()) | 80 if (!media_thread_.IsRunning()) |
| 77 media_thread_.Start(); | 81 media_thread_.Start(); |
| 78 | 82 |
| 79 return media_thread_.message_loop_proxy(); | 83 return media_thread_.message_loop_proxy(); |
| 80 } | 84 } |
| 81 | 85 |
| 82 } // namespace mojo | 86 } // namespace mojo |
| OLD | NEW |