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 <stdint.h> | 7 #include <stdint.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "media/blink/webencryptedmediaclient_impl.h" | 22 #include "media/blink/webencryptedmediaclient_impl.h" |
23 #include "media/blink/webmediaplayer_impl.h" | 23 #include "media/blink/webmediaplayer_impl.h" |
24 #include "media/blink/webmediaplayer_params.h" | 24 #include "media/blink/webmediaplayer_params.h" |
25 #include "media/cdm/default_cdm_factory.h" | 25 #include "media/cdm/default_cdm_factory.h" |
26 #include "media/filters/default_media_permission.h" | 26 #include "media/filters/default_media_permission.h" |
27 #include "media/mojo/interfaces/renderer.mojom.h" | 27 #include "media/mojo/interfaces/renderer.mojom.h" |
28 #include "media/mojo/services/mojo_cdm_factory.h" | 28 #include "media/mojo/services/mojo_cdm_factory.h" |
29 #include "media/mojo/services/mojo_renderer_factory.h" | 29 #include "media/mojo/services/mojo_renderer_factory.h" |
30 #include "media/renderers/default_renderer_factory.h" | 30 #include "media/renderers/default_renderer_factory.h" |
31 #include "media/renderers/gpu_video_accelerator_factories.h" | 31 #include "media/renderers/gpu_video_accelerator_factories.h" |
32 #include "mojo/application/public/cpp/connect.h" | 32 #include "mojo/shell/public/cpp/connect.h" |
33 #include "mojo/application/public/interfaces/shell.mojom.h" | 33 #include "mojo/shell/public/interfaces/shell.mojom.h" |
34 #include "third_party/WebKit/public/web/WebKit.h" | 34 #include "third_party/WebKit/public/web/WebKit.h" |
35 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 35 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
36 #include "v8/include/v8.h" | 36 #include "v8/include/v8.h" |
37 | 37 |
38 namespace html_viewer { | 38 namespace html_viewer { |
39 | 39 |
40 namespace { | 40 namespace { |
41 | 41 |
42 // Enable mojo media Renderer in media pipeline instead of using the internal | 42 // Enable mojo media Renderer in media pipeline instead of using the internal |
43 // media::Renderer implementation. | 43 // media::Renderer implementation. |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 scoped_refptr<base::SingleThreadTaskRunner> | 178 scoped_refptr<base::SingleThreadTaskRunner> |
179 MediaFactory::GetMediaThreadTaskRunner() { | 179 MediaFactory::GetMediaThreadTaskRunner() { |
180 if (!media_thread_.IsRunning()) | 180 if (!media_thread_.IsRunning()) |
181 media_thread_.Start(); | 181 media_thread_.Start(); |
182 | 182 |
183 return media_thread_.task_runner(); | 183 return media_thread_.task_runner(); |
184 } | 184 } |
185 #endif // !defined(OS_ANDROID) | 185 #endif // !defined(OS_ANDROID) |
186 | 186 |
187 } // namespace html_viewer | 187 } // namespace html_viewer |
OLD | NEW |