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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 #else | 49 #else |
50 | 50 |
51 media::WebMediaPlayerParams params( | 51 media::WebMediaPlayerParams params( |
52 media::WebMediaPlayerParams::DeferLoadCB(), | 52 media::WebMediaPlayerParams::DeferLoadCB(), |
53 CreateAudioRendererSink(), | 53 CreateAudioRendererSink(), |
54 GetAudioHardwareConfig(), | 54 GetAudioHardwareConfig(), |
55 new media::MediaLog(), | 55 new media::MediaLog(), |
56 scoped_refptr<media::GpuVideoAcceleratorFactories>(), | 56 scoped_refptr<media::GpuVideoAcceleratorFactories>(), |
57 GetMediaThreadTaskRunner(), | 57 GetMediaThreadTaskRunner(), |
58 compositor_task_runner_, | 58 compositor_task_runner_, |
59 base::Bind(&media::NullEncryptedMediaPlayerSupport::Create)); | 59 base::Bind(&media::NullEncryptedMediaPlayerSupport::Create), |
| 60 NULL); |
60 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; | 61 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; |
61 | 62 |
62 return new media::WebMediaPlayerImpl(frame, client, delegate, params); | 63 return new media::WebMediaPlayerImpl(frame, client, delegate, params); |
63 #endif | 64 #endif |
64 } | 65 } |
65 | 66 |
66 const media::AudioHardwareConfig& | 67 const media::AudioHardwareConfig& |
67 WebMediaPlayerFactory::GetAudioHardwareConfig() { | 68 WebMediaPlayerFactory::GetAudioHardwareConfig() { |
68 return audio_hardware_config_; | 69 return audio_hardware_config_; |
69 } | 70 } |
70 | 71 |
71 scoped_refptr<media::AudioRendererSink> | 72 scoped_refptr<media::AudioRendererSink> |
72 WebMediaPlayerFactory::CreateAudioRendererSink() { | 73 WebMediaPlayerFactory::CreateAudioRendererSink() { |
73 // TODO(acolwell): Replace this with an AudioRendererSink implementation | 74 // TODO(acolwell): Replace this with an AudioRendererSink implementation |
74 // that actually talks to the audio device or an audio mojo service. | 75 // that actually talks to the audio device or an audio mojo service. |
75 return new media::NullAudioSink(GetMediaThreadTaskRunner()); | 76 return new media::NullAudioSink(GetMediaThreadTaskRunner()); |
76 } | 77 } |
77 | 78 |
78 scoped_refptr<base::SingleThreadTaskRunner> | 79 scoped_refptr<base::SingleThreadTaskRunner> |
79 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { | 80 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { |
80 if (!media_thread_.IsRunning()) | 81 if (!media_thread_.IsRunning()) |
81 media_thread_.Start(); | 82 media_thread_.Start(); |
82 | 83 |
83 return media_thread_.message_loop_proxy(); | 84 return media_thread_.message_loop_proxy(); |
84 } | 85 } |
85 | 86 |
86 } // namespace mojo | 87 } // namespace mojo |
OLD | NEW |