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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "media/base/audio_decoder.h" | 9 #include "media/base/audio_decoder.h" |
10 #include "media/base/cdm_factory.h" | 10 #include "media/base/cdm_factory.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { | 61 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { |
62 #if defined(OS_ANDROID) | 62 #if defined(OS_ANDROID) |
63 return base::MakeUnique<MediaCodecAudioDecoder>(task_runner); | 63 return base::MakeUnique<MediaCodecAudioDecoder>(task_runner); |
64 #else | 64 #else |
65 return nullptr; | 65 return nullptr; |
66 #endif // defined(OS_ANDROID) | 66 #endif // defined(OS_ANDROID) |
67 } | 67 } |
68 | 68 |
69 std::unique_ptr<VideoDecoder> GpuMojoMediaClient::CreateVideoDecoder( | 69 std::unique_ptr<VideoDecoder> GpuMojoMediaClient::CreateVideoDecoder( |
70 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 70 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 71 MediaLog* media_log, |
71 mojom::CommandBufferIdPtr command_buffer_id, | 72 mojom::CommandBufferIdPtr command_buffer_id, |
72 OutputWithReleaseMailboxCB output_cb) { | 73 OutputWithReleaseMailboxCB output_cb) { |
73 static_cast<void>(media_gpu_channel_manager_); | 74 static_cast<void>(media_gpu_channel_manager_); |
74 | 75 |
75 // TODO(sandersd): Factory for VideoDecoders. | 76 // TODO(sandersd): Factory for VideoDecoders. |
76 return nullptr; | 77 return nullptr; |
77 } | 78 } |
78 | 79 |
79 std::unique_ptr<CdmFactory> GpuMojoMediaClient::CreateCdmFactory( | 80 std::unique_ptr<CdmFactory> GpuMojoMediaClient::CreateCdmFactory( |
80 service_manager::mojom::InterfaceProvider* interface_provider) { | 81 service_manager::mojom::InterfaceProvider* interface_provider) { |
81 #if defined(OS_ANDROID) | 82 #if defined(OS_ANDROID) |
82 return base::MakeUnique<AndroidCdmFactory>( | 83 return base::MakeUnique<AndroidCdmFactory>( |
83 base::Bind(&CreateProvisionFetcher, interface_provider), | 84 base::Bind(&CreateProvisionFetcher, interface_provider), |
84 base::Bind(&CreateMediaDrmStorage, interface_provider)); | 85 base::Bind(&CreateMediaDrmStorage, interface_provider)); |
85 #else | 86 #else |
86 return nullptr; | 87 return nullptr; |
87 #endif // defined(OS_ANDROID) | 88 #endif // defined(OS_ANDROID) |
88 } | 89 } |
89 | 90 |
90 } // namespace media | 91 } // namespace media |
OLD | NEW |