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

Side by Side Diff: media/mojo/services/media_service_factory.cc

Issue 2643733002: Allow to use {FFmpeg/Vpx}VideoDecoder from a UtilityProcess (Closed)
Patch Set: Rebase Created 3 years, 10 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/mojo/services/media_service_factory.h" 5 #include "media/mojo/services/media_service_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "media/mojo/services/gpu_mojo_media_client.h" 9 #include "media/mojo/services/gpu_mojo_media_client.h"
10 #include "media/mojo/services/media_service.h" 10 #include "media/mojo/services/media_service.h"
11 #include "media/mojo/services/test_mojo_media_client.h" 11 #include "media/mojo/services/test_mojo_media_client.h"
12 #include "media/mojo/services/utility_mojo_media_client.h"
12 13
13 #if defined(OS_ANDROID) 14 #if defined(OS_ANDROID)
14 #include "media/mojo/services/android_mojo_media_client.h" // nogncheck 15 #include "media/mojo/services/android_mojo_media_client.h" // nogncheck
15 #endif 16 #endif
16 17
17 namespace media { 18 namespace media {
18 19
19 std::unique_ptr<service_manager::Service> CreateMediaService() { 20 std::unique_ptr<service_manager::Service> CreateMediaService() {
20 #if defined(ENABLE_TEST_MOJO_MEDIA_CLIENT) 21 #if defined(ENABLE_TEST_MOJO_MEDIA_CLIENT)
21 return CreateMediaServiceForTesting(); 22 return CreateMediaServiceForTesting();
(...skipping 12 matching lines...) Expand all
34 return std::unique_ptr<service_manager::Service>( 35 return std::unique_ptr<service_manager::Service>(
35 new MediaService(base::MakeUnique<GpuMojoMediaClient>( 36 new MediaService(base::MakeUnique<GpuMojoMediaClient>(
36 task_runner, media_gpu_channel_manager))); 37 task_runner, media_gpu_channel_manager)));
37 } 38 }
38 39
39 std::unique_ptr<service_manager::Service> CreateMediaServiceForTesting() { 40 std::unique_ptr<service_manager::Service> CreateMediaServiceForTesting() {
40 return std::unique_ptr<service_manager::Service>( 41 return std::unique_ptr<service_manager::Service>(
41 new MediaService(base::MakeUnique<TestMojoMediaClient>())); 42 new MediaService(base::MakeUnique<TestMojoMediaClient>()));
42 } 43 }
43 44
45 std::unique_ptr<service_manager::Service> CreateUtilityMediaService() {
46 return std::unique_ptr<service_manager::Service>(
47 new MediaService(base::MakeUnique<UtilityMojoMediaClient>()));
48 }
49
44 } // namespace media 50 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/media_service_factory.h ('k') | media/mojo/services/utility_mojo_media_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698