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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 GetProxy(&media_renderer_service_provider)); | 92 GetProxy(&media_renderer_service_provider)); |
93 media_renderer_factory.reset(new media::MojoRendererFactory(make_scoped_ptr( | 93 media_renderer_factory.reset(new media::MojoRendererFactory(make_scoped_ptr( |
94 new RendererServiceProvider(media_renderer_service_provider.Pass())))); | 94 new RendererServiceProvider(media_renderer_service_provider.Pass())))); |
95 } else { | 95 } else { |
96 media_renderer_factory.reset( | 96 media_renderer_factory.reset( |
97 new media::DefaultRendererFactory(media_log, | 97 new media::DefaultRendererFactory(media_log, |
98 nullptr, // No GPU factory. | 98 nullptr, // No GPU factory. |
99 GetAudioHardwareConfig())); | 99 GetAudioHardwareConfig())); |
100 } | 100 } |
101 | 101 |
102 media::WebMediaPlayerParams params( | 102 media::WebMediaPlayerParams params(media::WebMediaPlayerParams::DeferLoadCB(), |
103 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(), | 103 CreateAudioRendererSink(), media_log, |
104 media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, | 104 GetMediaThreadTaskRunner(), |
105 media::WebMediaPlayerParams::Context3DCB(), initial_cdm); | 105 compositor_task_runner_, initial_cdm); |
106 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; | 106 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; |
107 | 107 |
108 scoped_ptr<media::CdmFactory> cdm_factory(new media::DefaultCdmFactory()); | 108 scoped_ptr<media::CdmFactory> cdm_factory(new media::DefaultCdmFactory()); |
109 | 109 |
110 return new media::WebMediaPlayerImpl(frame, client, delegate, | 110 return new media::WebMediaPlayerImpl(frame, client, delegate, |
111 media_renderer_factory.Pass(), | 111 media_renderer_factory.Pass(), |
112 cdm_factory.Pass(), params); | 112 cdm_factory.Pass(), params); |
113 #endif | 113 #endif |
114 } | 114 } |
115 | 115 |
(...skipping 11 matching lines...) Expand all Loading... |
127 | 127 |
128 scoped_refptr<base::SingleThreadTaskRunner> | 128 scoped_refptr<base::SingleThreadTaskRunner> |
129 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { | 129 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { |
130 if (!media_thread_.IsRunning()) | 130 if (!media_thread_.IsRunning()) |
131 media_thread_.Start(); | 131 media_thread_.Start(); |
132 | 132 |
133 return media_thread_.message_loop_proxy(); | 133 return media_thread_.message_loop_proxy(); |
134 } | 134 } |
135 | 135 |
136 } // namespace html_viewer | 136 } // namespace html_viewer |
OLD | NEW |