Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: components/html_viewer/media_factory.cc

Issue 1255083004: media: Mojo interfaces renaming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "media/audio/audio_manager.h" 13 #include "media/audio/audio_manager.h"
14 #include "media/audio/audio_manager_base.h" 14 #include "media/audio/audio_manager_base.h"
15 #include "media/audio/audio_output_stream_sink.h" 15 #include "media/audio/audio_output_stream_sink.h"
16 #include "media/base/audio_hardware_config.h" 16 #include "media/base/audio_hardware_config.h"
17 #include "media/base/media.h" 17 #include "media/base/media.h"
18 #include "media/base/media_log.h" 18 #include "media/base/media_log.h"
19 #include "media/blink/webencryptedmediaclient_impl.h" 19 #include "media/blink/webencryptedmediaclient_impl.h"
20 #include "media/blink/webmediaplayer_impl.h" 20 #include "media/blink/webmediaplayer_impl.h"
21 #include "media/blink/webmediaplayer_params.h" 21 #include "media/blink/webmediaplayer_params.h"
22 #include "media/cdm/default_cdm_factory.h" 22 #include "media/cdm/default_cdm_factory.h"
23 #include "media/filters/default_media_permission.h" 23 #include "media/filters/default_media_permission.h"
24 #include "media/mojo/interfaces/media_renderer.mojom.h" 24 #include "media/mojo/interfaces/renderer.mojom.h"
25 #include "media/mojo/services/mojo_cdm_factory.h" 25 #include "media/mojo/services/mojo_cdm_factory.h"
26 #include "media/mojo/services/mojo_renderer_factory.h" 26 #include "media/mojo/services/mojo_renderer_factory.h"
27 #include "media/renderers/default_renderer_factory.h" 27 #include "media/renderers/default_renderer_factory.h"
28 #include "media/renderers/gpu_video_accelerator_factories.h" 28 #include "media/renderers/gpu_video_accelerator_factories.h"
29 #include "mojo/application/public/cpp/connect.h" 29 #include "mojo/application/public/cpp/connect.h"
30 #include "mojo/application/public/interfaces/shell.mojom.h" 30 #include "mojo/application/public/interfaces/shell.mojom.h"
31 31
32 namespace html_viewer { 32 namespace html_viewer {
33 33
34 namespace { 34 namespace {
35 35
36 // Enable MediaRenderer in media pipeline instead of using the internal 36 // Enable mojo media Renderer in media pipeline instead of using the internal
37 // media::Renderer implementation. 37 // media::Renderer implementation.
38 // TODO(xhwang): Move this to media_switches.h. 38 // TODO(xhwang): Move this to media_switches.h.
39 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer"; 39 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer";
40 40
41 bool AreSecureCodecsSupported() { 41 bool AreSecureCodecsSupported() {
42 // Hardware-secure codecs are not currently supported by HTML Viewer on any 42 // Hardware-secure codecs are not currently supported by HTML Viewer on any
43 // platform. 43 // platform.
44 return false; 44 return false;
45 } 45 }
46 46
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | content/renderer/render_frame_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698