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

Side by Side Diff: mojo/services/html_viewer/webmediaplayer_factory.cc

Issue 970023002: Moved gpu factories to media/renderers/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed mojo webmediaplayer_factory.cc Created 5 years, 9 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
« no previous file with comments | « media/renderers/mock_gpu_video_accelerator_factories.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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"
11 #include "media/audio/audio_manager.h" 11 #include "media/audio/audio_manager.h"
12 #include "media/audio/audio_manager_base.h" 12 #include "media/audio/audio_manager_base.h"
13 #include "media/audio/audio_output_stream_sink.h" 13 #include "media/audio/audio_output_stream_sink.h"
14 #include "media/base/audio_hardware_config.h" 14 #include "media/base/audio_hardware_config.h"
15 #include "media/base/media.h" 15 #include "media/base/media.h"
16 #include "media/base/media_log.h" 16 #include "media/base/media_log.h"
17 #include "media/blink/webmediaplayer_impl.h" 17 #include "media/blink/webmediaplayer_impl.h"
18 #include "media/blink/webmediaplayer_params.h" 18 #include "media/blink/webmediaplayer_params.h"
19 #include "media/cdm/default_cdm_factory.h" 19 #include "media/cdm/default_cdm_factory.h"
20 #include "media/filters/gpu_video_accelerator_factories.h"
21 #include "media/mojo/interfaces/media_renderer.mojom.h" 20 #include "media/mojo/interfaces/media_renderer.mojom.h"
22 #include "media/mojo/services/mojo_renderer_factory.h" 21 #include "media/mojo/services/mojo_renderer_factory.h"
23 #include "media/renderers/default_renderer_factory.h" 22 #include "media/renderers/default_renderer_factory.h"
23 #include "media/renderers/gpu_video_accelerator_factories.h"
24 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h" 24 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
25 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" 25 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"
26 26
27 using mojo::ServiceProviderPtr; 27 using mojo::ServiceProviderPtr;
28 28
29 namespace html_viewer { 29 namespace html_viewer {
30 30
31 #if !defined(OS_ANDROID) 31 #if !defined(OS_ANDROID)
32 namespace { 32 namespace {
33 33
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 scoped_refptr<base::SingleThreadTaskRunner> 130 scoped_refptr<base::SingleThreadTaskRunner>
131 WebMediaPlayerFactory::GetMediaThreadTaskRunner() { 131 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
132 if (!media_thread_.IsRunning()) 132 if (!media_thread_.IsRunning())
133 media_thread_.Start(); 133 media_thread_.Start();
134 134
135 return media_thread_.message_loop_proxy(); 135 return media_thread_.message_loop_proxy();
136 } 136 }
137 137
138 } // namespace html_viewer 138 } // namespace html_viewer
OLDNEW
« no previous file with comments | « media/renderers/mock_gpu_video_accelerator_factories.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698