OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 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 | 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/gpu_mojo_media_client.h" | 5 #include "media/mojo/services/gpu_mojo_media_client.h" |
6 | 6 |
7 #include "media/base/audio_decoder.h" | 7 #include "media/base/audio_decoder.h" |
8 #include "media/base/cdm_factory.h" | 8 #include "media/base/cdm_factory.h" |
9 #include "media/base/video_decoder.h" | 9 #include "media/base/video_decoder.h" |
10 | 10 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 std::unique_ptr<AudioDecoder> GpuMojoMediaClient::CreateAudioDecoder( | 44 std::unique_ptr<AudioDecoder> GpuMojoMediaClient::CreateAudioDecoder( |
45 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { | 45 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { |
46 #if defined(OS_ANDROID) | 46 #if defined(OS_ANDROID) |
47 return base::MakeUnique<MediaCodecAudioDecoder>(task_runner); | 47 return base::MakeUnique<MediaCodecAudioDecoder>(task_runner); |
48 #else | 48 #else |
49 return nullptr; | 49 return nullptr; |
50 #endif // defined(OS_ANDROID) | 50 #endif // defined(OS_ANDROID) |
51 } | 51 } |
52 | 52 |
53 std::unique_ptr<VideoDecoder> GpuMojoMediaClient::CreateVideoDecoder( | 53 std::unique_ptr<VideoDecoder> GpuMojoMediaClient::CreateVideoDecoder( |
54 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { | 54 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 55 mojom::CommandBufferIdPtr command_buffer_id) { |
55 static_cast<void>(media_gpu_channel_manager_); | 56 static_cast<void>(media_gpu_channel_manager_); |
56 | 57 |
57 // TODO(sandersd): Factory for VideoDecoders. | 58 // TODO(sandersd): Factory for VideoDecoders. |
58 return nullptr; | 59 return nullptr; |
59 } | 60 } |
60 | 61 |
61 std::unique_ptr<CdmFactory> GpuMojoMediaClient::CreateCdmFactory( | 62 std::unique_ptr<CdmFactory> GpuMojoMediaClient::CreateCdmFactory( |
62 service_manager::mojom::InterfaceProvider* interface_provider) { | 63 service_manager::mojom::InterfaceProvider* interface_provider) { |
63 #if defined(OS_ANDROID) | 64 #if defined(OS_ANDROID) |
64 return base::MakeUnique<AndroidCdmFactory>( | 65 return base::MakeUnique<AndroidCdmFactory>( |
65 base::Bind(&CreateProvisionFetcher, interface_provider)); | 66 base::Bind(&CreateProvisionFetcher, interface_provider)); |
66 #else | 67 #else |
67 return nullptr; | 68 return nullptr; |
68 #endif // defined(OS_ANDROID) | 69 #endif // defined(OS_ANDROID) |
69 } | 70 } |
70 | 71 |
71 } // namespace media | 72 } // namespace media |
OLD | NEW |