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

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

Issue 1473233005: Revert of media: Add ProvisionFetcher mojo interface and implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/mojo/services/mojo_media_client.h ('k') | media/mojo/services/mojo_provision_fetcher.h » ('j') | 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 "media/mojo/services/mojo_media_client.h" 5 #include "media/mojo/services/mojo_media_client.h"
6 6
7 namespace media { 7 namespace media {
8 8
9 // PlatformMojoMediaClient default implementations. 9 // PlatformMojoMediaClient default implementations.
10 10
(...skipping 23 matching lines...) Expand all
34 34
35 scoped_ptr<VideoRendererSink> PlatformMojoMediaClient::CreateVideoRendererSink( 35 scoped_ptr<VideoRendererSink> PlatformMojoMediaClient::CreateVideoRendererSink(
36 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { 36 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
37 return nullptr; 37 return nullptr;
38 } 38 }
39 39
40 const AudioHardwareConfig* PlatformMojoMediaClient::GetAudioHardwareConfig() { 40 const AudioHardwareConfig* PlatformMojoMediaClient::GetAudioHardwareConfig() {
41 return nullptr; 41 return nullptr;
42 } 42 }
43 43
44 scoped_ptr<CdmFactory> PlatformMojoMediaClient::CreateCdmFactory( 44 scoped_ptr<CdmFactory> PlatformMojoMediaClient::CreateCdmFactory() {
45 mojo::ServiceProvider* service_provider) {
46 return nullptr; 45 return nullptr;
47 } 46 }
48 47
49 namespace internal { 48 namespace internal {
50 extern scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient(); 49 extern scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient();
51 } // namespace internal 50 } // namespace internal
52 51
53 static base::LazyInstance<MojoMediaClient>::Leaky g_mojo_media_client = 52 static base::LazyInstance<MojoMediaClient>::Leaky g_mojo_media_client =
54 LAZY_INSTANCE_INITIALIZER; 53 LAZY_INSTANCE_INITIALIZER;
55 54
(...skipping 25 matching lines...) Expand all
81 80
82 scoped_ptr<VideoRendererSink> MojoMediaClient::CreateVideoRendererSink( 81 scoped_ptr<VideoRendererSink> MojoMediaClient::CreateVideoRendererSink(
83 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { 82 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
84 return mojo_media_client_->CreateVideoRendererSink(task_runner); 83 return mojo_media_client_->CreateVideoRendererSink(task_runner);
85 } 84 }
86 85
87 const AudioHardwareConfig* MojoMediaClient::GetAudioHardwareConfig() { 86 const AudioHardwareConfig* MojoMediaClient::GetAudioHardwareConfig() {
88 return mojo_media_client_->GetAudioHardwareConfig(); 87 return mojo_media_client_->GetAudioHardwareConfig();
89 } 88 }
90 89
91 scoped_ptr<CdmFactory> MojoMediaClient::CreateCdmFactory( 90 scoped_ptr<CdmFactory> MojoMediaClient::CreateCdmFactory() {
92 mojo::ServiceProvider* service_provider) { 91 return mojo_media_client_->CreateCdmFactory();
93 return mojo_media_client_->CreateCdmFactory(service_provider);
94 } 92 }
95 93
96 MojoMediaClient::MojoMediaClient() 94 MojoMediaClient::MojoMediaClient()
97 : mojo_media_client_(internal::CreatePlatformMojoMediaClient()) { 95 : mojo_media_client_(internal::CreatePlatformMojoMediaClient().Pass()) {
98 DCHECK(mojo_media_client_); 96 DCHECK(mojo_media_client_);
99 } 97 }
100 98
101 MojoMediaClient::~MojoMediaClient() { 99 MojoMediaClient::~MojoMediaClient() {
102 } 100 }
103 101
104 } // namespace media 102 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_media_client.h ('k') | media/mojo/services/mojo_provision_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698