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 "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 namespace internal { | 9 namespace internal { |
10 extern scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient(); | 10 extern scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient(); |
(...skipping 30 matching lines...) Expand all Loading... |
41 | 41 |
42 scoped_ptr<VideoRendererSink> MojoMediaClient::GetVideoRendererSink( | 42 scoped_ptr<VideoRendererSink> MojoMediaClient::GetVideoRendererSink( |
43 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { | 43 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { |
44 return mojo_media_client_->GetVideoRendererSink(task_runner); | 44 return mojo_media_client_->GetVideoRendererSink(task_runner); |
45 } | 45 } |
46 | 46 |
47 const AudioHardwareConfig& MojoMediaClient::GetAudioHardwareConfig() { | 47 const AudioHardwareConfig& MojoMediaClient::GetAudioHardwareConfig() { |
48 return mojo_media_client_->GetAudioHardwareConfig(); | 48 return mojo_media_client_->GetAudioHardwareConfig(); |
49 } | 49 } |
50 | 50 |
| 51 scoped_ptr<CdmFactory> MojoMediaClient::GetCdmFactory() { |
| 52 return mojo_media_client_->GetCdmFactory(); |
| 53 } |
| 54 |
51 MojoMediaClient::MojoMediaClient() | 55 MojoMediaClient::MojoMediaClient() |
52 : mojo_media_client_(internal::CreatePlatformMojoMediaClient().Pass()) { | 56 : mojo_media_client_(internal::CreatePlatformMojoMediaClient().Pass()) { |
53 } | 57 } |
54 | 58 |
55 MojoMediaClient::~MojoMediaClient() { | 59 MojoMediaClient::~MojoMediaClient() { |
56 } | 60 } |
57 | 61 |
58 } // namespace media | 62 } // namespace media |
OLD | NEW |