OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/android_mojo_media_client.h" | 5 #include "media/mojo/services/android_mojo_media_client.h" |
6 | 6 |
7 #include "media/base/android/android_cdm_factory.h" | 7 #include "media/base/android/android_cdm_factory.h" |
| 8 #include "media/filters/android/media_codec_audio_decoder.h" |
8 #include "media/mojo/interfaces/provision_fetcher.mojom.h" | 9 #include "media/mojo/interfaces/provision_fetcher.mojom.h" |
9 #include "media/mojo/services/mojo_provision_fetcher.h" | 10 #include "media/mojo/services/mojo_provision_fetcher.h" |
10 #include "mojo/shell/public/cpp/connect.h" | 11 #include "mojo/shell/public/cpp/connect.h" |
11 | 12 |
12 namespace media { | 13 namespace media { |
13 | 14 |
14 namespace { | 15 namespace { |
15 | 16 |
16 scoped_ptr<ProvisionFetcher> CreateProvisionFetcher( | 17 scoped_ptr<ProvisionFetcher> CreateProvisionFetcher( |
17 mojo::shell::mojom::InterfaceProvider* interface_provider) { | 18 mojo::shell::mojom::InterfaceProvider* interface_provider) { |
18 interfaces::ProvisionFetcherPtr provision_fetcher_ptr; | 19 interfaces::ProvisionFetcherPtr provision_fetcher_ptr; |
19 mojo::GetInterface(interface_provider, &provision_fetcher_ptr); | 20 mojo::GetInterface(interface_provider, &provision_fetcher_ptr); |
20 return make_scoped_ptr( | 21 return make_scoped_ptr( |
21 new MojoProvisionFetcher(std::move(provision_fetcher_ptr))); | 22 new MojoProvisionFetcher(std::move(provision_fetcher_ptr))); |
22 } | 23 } |
23 | 24 |
24 } // namespace | 25 } // namespace |
25 | 26 |
26 AndroidMojoMediaClient::AndroidMojoMediaClient() {} | 27 AndroidMojoMediaClient::AndroidMojoMediaClient() {} |
27 | 28 |
28 AndroidMojoMediaClient::~AndroidMojoMediaClient() {} | 29 AndroidMojoMediaClient::~AndroidMojoMediaClient() {} |
29 | 30 |
30 // MojoMediaClient overrides. | 31 // MojoMediaClient overrides. |
| 32 |
| 33 scoped_ptr<AudioDecoder> AndroidMojoMediaClient::CreateAudioDecoder( |
| 34 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { |
| 35 return make_scoped_ptr(new MediaCodecAudioDecoder(task_runner)); |
| 36 } |
| 37 |
31 scoped_ptr<CdmFactory> AndroidMojoMediaClient::CreateCdmFactory( | 38 scoped_ptr<CdmFactory> AndroidMojoMediaClient::CreateCdmFactory( |
32 mojo::shell::mojom::InterfaceProvider* interface_provider) { | 39 mojo::shell::mojom::InterfaceProvider* interface_provider) { |
33 return make_scoped_ptr(new AndroidCdmFactory( | 40 return make_scoped_ptr(new AndroidCdmFactory( |
34 base::Bind(&CreateProvisionFetcher, interface_provider))); | 41 base::Bind(&CreateProvisionFetcher, interface_provider))); |
35 } | 42 } |
36 | 43 |
37 } // namespace media | 44 } // namespace media |
OLD | NEW |