| 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/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "media/mojo/clients/mojo_audio_decoder.h" | 9 #include "media/mojo/clients/mojo_audio_decoder.h" |
| 10 #include "media/mojo/clients/mojo_video_decoder.h" | 10 #include "media/mojo/clients/mojo_video_decoder.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 &audio_decoder_ptr); | 31 &audio_decoder_ptr); |
| 32 | 32 |
| 33 audio_decoders->push_back(base::MakeUnique<MojoAudioDecoder>( | 33 audio_decoders->push_back(base::MakeUnique<MojoAudioDecoder>( |
| 34 task_runner, std::move(audio_decoder_ptr))); | 34 task_runner, std::move(audio_decoder_ptr))); |
| 35 #endif | 35 #endif |
| 36 } | 36 } |
| 37 | 37 |
| 38 void MojoDecoderFactory::CreateVideoDecoders( | 38 void MojoDecoderFactory::CreateVideoDecoders( |
| 39 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 39 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 40 GpuVideoAcceleratorFactories* gpu_factories, | 40 GpuVideoAcceleratorFactories* gpu_factories, |
| 41 MediaLog* media_log, |
| 41 std::vector<std::unique_ptr<VideoDecoder>>* video_decoders) { | 42 std::vector<std::unique_ptr<VideoDecoder>>* video_decoders) { |
| 42 #if BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER) | 43 #if BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER) |
| 43 mojom::VideoDecoderPtr remote_decoder; | 44 mojom::VideoDecoderPtr remote_decoder; |
| 44 service_manager::GetInterface<mojom::VideoDecoder>(interface_provider_, | 45 service_manager::GetInterface<mojom::VideoDecoder>(interface_provider_, |
| 45 &remote_decoder); | 46 &remote_decoder); |
| 46 video_decoders->push_back(base::MakeUnique<MojoVideoDecoder>( | 47 video_decoders->push_back(base::MakeUnique<MojoVideoDecoder>( |
| 47 task_runner, gpu_factories, std::move(remote_decoder))); | 48 task_runner, gpu_factories, media_log, std::move(remote_decoder))); |
| 48 #endif | 49 #endif |
| 49 } | 50 } |
| 50 | 51 |
| 51 } // namespace media | 52 } // namespace media |
| OLD | NEW |