| 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/clients/mojo_decoder_factory.h" | 5 #include "media/mojo/clients/mojo_decoder_factory.h" |
| 6 | 6 |
| 7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
| 8 #include "media/mojo/clients/mojo_audio_decoder.h" | 8 #include "media/mojo/clients/mojo_audio_decoder.h" |
| 9 #include "media/mojo/clients/mojo_video_decoder.h" | 9 #include "media/mojo/clients/mojo_video_decoder.h" |
| 10 #include "media/mojo/interfaces/audio_decoder.mojom.h" | 10 #include "media/mojo/interfaces/audio_decoder.mojom.h" |
| 11 #include "services/service_manager/public/cpp/connect.h" | 11 #include "services/service_manager/public/cpp/connect.h" |
| 12 | 12 |
| 13 namespace media { | 13 namespace media { |
| 14 | 14 |
| 15 MojoDecoderFactory::MojoDecoderFactory( | 15 MojoDecoderFactory::MojoDecoderFactory( |
| 16 service_manager::mojom::InterfaceProvider* interface_provider) | 16 service_manager::mojom::InterfaceProvider* interface_provider) |
| 17 : interface_provider_(interface_provider) { | 17 : interface_provider_(interface_provider) { |
| 18 DCHECK(interface_provider_); | 18 DCHECK(interface_provider_); |
| 19 } | 19 } |
| 20 | 20 |
| 21 MojoDecoderFactory::~MojoDecoderFactory() {} | 21 MojoDecoderFactory::~MojoDecoderFactory() {} |
| 22 | 22 |
| 23 void MojoDecoderFactory::CreateAudioDecoders( | 23 void MojoDecoderFactory::CreateAudioDecoders( |
| 24 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 24 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 25 ScopedVector<AudioDecoder>* audio_decoders) { | 25 std::vector<std::unique_ptr<AudioDecoder>>* audio_decoders) { |
| 26 #if defined(ENABLE_MOJO_AUDIO_DECODER) | 26 #if defined(ENABLE_MOJO_AUDIO_DECODER) |
| 27 mojom::AudioDecoderPtr audio_decoder_ptr; | 27 mojom::AudioDecoderPtr audio_decoder_ptr; |
| 28 service_manager::GetInterface<mojom::AudioDecoder>(interface_provider_, | 28 service_manager::GetInterface<mojom::AudioDecoder>(interface_provider_, |
| 29 &audio_decoder_ptr); | 29 &audio_decoder_ptr); |
| 30 | 30 |
| 31 audio_decoders->push_back( | 31 audio_decoders->push_back(base::MakeUnique<MojoAudioDecoder>( |
| 32 new MojoAudioDecoder(task_runner, std::move(audio_decoder_ptr))); | 32 task_runner, std::move(audio_decoder_ptr))); |
| 33 #endif | 33 #endif |
| 34 } | 34 } |
| 35 | 35 |
| 36 void MojoDecoderFactory::CreateVideoDecoders( | 36 void MojoDecoderFactory::CreateVideoDecoders( |
| 37 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 37 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 38 GpuVideoAcceleratorFactories* gpu_factories, | 38 GpuVideoAcceleratorFactories* gpu_factories, |
| 39 ScopedVector<VideoDecoder>* video_decoders) { | 39 std::vector<std::unique_ptr<VideoDecoder>>* video_decoders) { |
| 40 #if defined(ENABLE_MOJO_VIDEO_DECODER) | 40 #if defined(ENABLE_MOJO_VIDEO_DECODER) |
| 41 mojom::VideoDecoderPtr remote_decoder; | 41 mojom::VideoDecoderPtr remote_decoder; |
| 42 service_manager::GetInterface<mojom::VideoDecoder>(interface_provider_, | 42 service_manager::GetInterface<mojom::VideoDecoder>(interface_provider_, |
| 43 &remote_decoder); | 43 &remote_decoder); |
| 44 video_decoders->push_back(new MojoVideoDecoder(task_runner, gpu_factories, | 44 video_decoders->push_back(base::MakeUnique<MojoVideoDecoder>( |
| 45 std::move(remote_decoder))); | 45 task_runner, gpu_factories, std::move(remote_decoder))); |
| 46 #endif | 46 #endif |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace media | 49 } // namespace media |
| OLD | NEW |