Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 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 | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "media/mojo/services/gpu_mojo_media_client.h" | |
| 6 | |
| 7 #include "media/base/audio_decoder.h" | |
| 8 #include "media/base/cdm_factory.h" | |
| 9 #include "media/base/video_decoder.h" | |
| 10 | |
| 11 #if defined(OS_ANDROID) | |
| 12 #include "base/memory/ptr_util.h" | |
| 13 #include "media/base/android/android_cdm_factory.h" | |
| 14 #include "media/filters/android/media_codec_audio_decoder.h" | |
| 15 #include "media/mojo/interfaces/provision_fetcher.mojom.h" | |
| 16 #include "media/mojo/services/mojo_provision_fetcher.h" | |
| 17 #include "services/service_manager/public/cpp/connect.h" | |
| 18 #endif // defined(OS_ANDROID) | |
| 19 | |
| 20 namespace media { | |
| 21 | |
| 22 namespace { | |
| 23 | |
| 24 #if defined(OS_ANDROID) | |
| 25 std::unique_ptr<ProvisionFetcher> CreateProvisionFetcher( | |
| 26 service_manager::mojom::InterfaceProvider* interface_provider) { | |
| 27 mojom::ProvisionFetcherPtr provision_fetcher_ptr; | |
| 28 service_manager::GetInterface(interface_provider, &provision_fetcher_ptr); | |
| 29 return base::MakeUnique<MojoProvisionFetcher>( | |
| 30 std::move(provision_fetcher_ptr)); | |
| 31 } | |
| 32 #endif // defined(OS_ANDROID) | |
|
xhwang
2016/11/23 06:58:03
It would be nice to avoid the duplication between
sandersd (OOO until July 31)
2016/11/23 21:21:02
It should be possible to just delete it soon. The
xhwang
2016/11/24 07:02:10
I am a bit lost. Do you mean the "construction pat
sandersd (OOO until July 31)
2016/11/28 00:56:15
Yes, that's what I mean. The paths that construct
| |
| 33 | |
| 34 } // namespace | |
| 35 | |
| 36 GpuMojoMediaClient::GpuMojoMediaClient( | |
| 37 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner, | |
| 38 MediaGpuChannelManager* media_gpu_channel_manager) | |
| 39 : media_task_runner_(media_task_runner), | |
| 40 media_gpu_channel_manager_(media_gpu_channel_manager) {} | |
| 41 | |
| 42 GpuMojoMediaClient::~GpuMojoMediaClient() {} | |
| 43 | |
| 44 std::unique_ptr<AudioDecoder> GpuMojoMediaClient::CreateAudioDecoder( | |
| 45 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { | |
| 46 #if defined(OS_ANDROID) | |
| 47 return base::MakeUnique<MediaCodecAudioDecoder>(task_runner); | |
| 48 #else | |
| 49 return nullptr; | |
| 50 #endif // defined(OS_ANDROID) | |
| 51 } | |
| 52 | |
| 53 std::unique_ptr<VideoDecoder> GpuMojoMediaClient::CreateVideoDecoder( | |
| 54 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { | |
| 55 (void)media_gpu_channel_manager_; | |
|
sandersd (OOO until July 31)
2016/11/22 23:07:59
This just avoids the compiler warning for unused p
| |
| 56 | |
| 57 // TODO(sandersd): Factory for VideoDecoders. | |
| 58 return nullptr; | |
| 59 } | |
| 60 | |
| 61 std::unique_ptr<CdmFactory> GpuMojoMediaClient::CreateCdmFactory( | |
| 62 service_manager::mojom::InterfaceProvider* interface_provider) { | |
| 63 #if defined(OS_ANDROID) | |
| 64 return base::MakeUnique<AndroidCdmFactory>( | |
| 65 base::Bind(&CreateProvisionFetcher, interface_provider)); | |
| 66 #else | |
| 67 return nullptr; | |
| 68 #endif // defined(OS_ANDROID) | |
| 69 } | |
| 70 | |
| 71 } // namespace media | |
| OLD | NEW |