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 "components/html_viewer/media_factory.h" | 5 #include "components/html_viewer/media_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 new media::MojoRendererFactory(GetMediaServiceFactory())); | 87 new media::MojoRendererFactory(GetMediaServiceFactory())); |
88 } else { | 88 } else { |
89 media_renderer_factory.reset( | 89 media_renderer_factory.reset( |
90 new media::DefaultRendererFactory(media_log, | 90 new media::DefaultRendererFactory(media_log, |
91 nullptr, // No GPU factory. | 91 nullptr, // No GPU factory. |
92 GetAudioHardwareConfig())); | 92 GetAudioHardwareConfig())); |
93 } | 93 } |
94 | 94 |
95 media::WebMediaPlayerParams params( | 95 media::WebMediaPlayerParams params( |
96 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(), | 96 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(), |
97 media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, | 97 media_log, GetMediaThreadTaskRunner(), GetMediaThreadTaskRunner(), |
98 media::WebMediaPlayerParams::Context3DCB(), GetMediaPermission(), | 98 compositor_task_runner_, media::WebMediaPlayerParams::Context3DCB(), |
99 initial_cdm); | 99 GetMediaPermission(), initial_cdm); |
100 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; | 100 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; |
101 | 101 |
102 return new media::WebMediaPlayerImpl(frame, client, encrypted_client, | 102 return new media::WebMediaPlayerImpl(frame, client, encrypted_client, |
103 delegate, media_renderer_factory.Pass(), | 103 delegate, media_renderer_factory.Pass(), |
104 GetCdmFactory(), params); | 104 GetCdmFactory(), params); |
105 #endif // defined(OS_ANDROID) | 105 #endif // defined(OS_ANDROID) |
106 } | 106 } |
107 | 107 |
108 blink::WebEncryptedMediaClient* MediaFactory::GetEncryptedMediaClient() { | 108 blink::WebEncryptedMediaClient* MediaFactory::GetEncryptedMediaClient() { |
109 if (!web_encrypted_media_client_) { | 109 if (!web_encrypted_media_client_) { |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 scoped_refptr<base::SingleThreadTaskRunner> | 163 scoped_refptr<base::SingleThreadTaskRunner> |
164 MediaFactory::GetMediaThreadTaskRunner() { | 164 MediaFactory::GetMediaThreadTaskRunner() { |
165 if (!media_thread_.IsRunning()) | 165 if (!media_thread_.IsRunning()) |
166 media_thread_.Start(); | 166 media_thread_.Start(); |
167 | 167 |
168 return media_thread_.task_runner(); | 168 return media_thread_.task_runner(); |
169 } | 169 } |
170 #endif // !defined(OS_ANDROID) | 170 #endif // !defined(OS_ANDROID) |
171 | 171 |
172 } // namespace html_viewer | 172 } // namespace html_viewer |
OLD | NEW |