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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
46 blink::WebMediaPlayerClient* client) { | 46 blink::WebMediaPlayerClient* client) { |
47 #if defined(OS_ANDROID) | 47 #if defined(OS_ANDROID) |
48 return NULL; | 48 return NULL; |
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>(), |
dshwang
2014/10/13 17:07:42
mojo didn't care of gpu decoding because of null G
| |
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 media::WebMediaPlayerParams::ContextProviderCB(), | |
60 NULL); | 61 NULL); |
61 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; | 62 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; |
62 | 63 |
63 return new media::WebMediaPlayerImpl(frame, client, delegate, params); | 64 return new media::WebMediaPlayerImpl(frame, client, delegate, params); |
64 #endif | 65 #endif |
65 } | 66 } |
66 | 67 |
67 const media::AudioHardwareConfig& | 68 const media::AudioHardwareConfig& |
68 WebMediaPlayerFactory::GetAudioHardwareConfig() { | 69 WebMediaPlayerFactory::GetAudioHardwareConfig() { |
69 return audio_hardware_config_; | 70 return audio_hardware_config_; |
70 } | 71 } |
71 | 72 |
72 scoped_refptr<media::AudioRendererSink> | 73 scoped_refptr<media::AudioRendererSink> |
73 WebMediaPlayerFactory::CreateAudioRendererSink() { | 74 WebMediaPlayerFactory::CreateAudioRendererSink() { |
74 // TODO(acolwell): Replace this with an AudioRendererSink implementation | 75 // TODO(acolwell): Replace this with an AudioRendererSink implementation |
75 // that actually talks to the audio device or an audio mojo service. | 76 // that actually talks to the audio device or an audio mojo service. |
76 return new media::NullAudioSink(GetMediaThreadTaskRunner()); | 77 return new media::NullAudioSink(GetMediaThreadTaskRunner()); |
77 } | 78 } |
78 | 79 |
79 scoped_refptr<base::SingleThreadTaskRunner> | 80 scoped_refptr<base::SingleThreadTaskRunner> |
80 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { | 81 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { |
81 if (!media_thread_.IsRunning()) | 82 if (!media_thread_.IsRunning()) |
82 media_thread_.Start(); | 83 media_thread_.Start(); |
83 | 84 |
84 return media_thread_.message_loop_proxy(); | 85 return media_thread_.message_loop_proxy(); |
85 } | 86 } |
86 | 87 |
87 } // namespace mojo | 88 } // namespace mojo |
OLD | NEW |