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 "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "media/base/android/android_cdm_factory.h" | 8 #include "media/base/android/android_cdm_factory.h" |
9 #include "media/base/audio_decoder.h" | |
10 #include "media/base/cdm_factory.h" | |
11 #include "media/base/video_decoder.h" | |
xhwang
2016/04/20 21:09:27
why do you need these?
sandersd (OOO until July 31)
2016/04/20 21:16:07
Oops, video_decoder.h isn't necessary.
The others
| |
9 #include "media/filters/android/media_codec_audio_decoder.h" | 12 #include "media/filters/android/media_codec_audio_decoder.h" |
10 #include "media/mojo/interfaces/provision_fetcher.mojom.h" | 13 #include "media/mojo/interfaces/provision_fetcher.mojom.h" |
11 #include "media/mojo/services/mojo_provision_fetcher.h" | 14 #include "media/mojo/services/mojo_provision_fetcher.h" |
12 #include "services/shell/public/cpp/connect.h" | 15 #include "services/shell/public/cpp/connect.h" |
13 | 16 |
14 namespace media { | 17 namespace media { |
15 | 18 |
16 namespace { | 19 namespace { |
17 | 20 |
18 std::unique_ptr<ProvisionFetcher> CreateProvisionFetcher( | 21 std::unique_ptr<ProvisionFetcher> CreateProvisionFetcher( |
(...skipping 17 matching lines...) Expand all Loading... | |
36 return base::WrapUnique(new MediaCodecAudioDecoder(task_runner)); | 39 return base::WrapUnique(new MediaCodecAudioDecoder(task_runner)); |
37 } | 40 } |
38 | 41 |
39 std::unique_ptr<CdmFactory> AndroidMojoMediaClient::CreateCdmFactory( | 42 std::unique_ptr<CdmFactory> AndroidMojoMediaClient::CreateCdmFactory( |
40 shell::mojom::InterfaceProvider* interface_provider) { | 43 shell::mojom::InterfaceProvider* interface_provider) { |
41 return base::WrapUnique(new AndroidCdmFactory( | 44 return base::WrapUnique(new AndroidCdmFactory( |
42 base::Bind(&CreateProvisionFetcher, interface_provider))); | 45 base::Bind(&CreateProvisionFetcher, interface_provider))); |
43 } | 46 } |
44 | 47 |
45 } // namespace media | 48 } // namespace media |
OLD | NEW |