| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/renderers/default_renderer_factory.h" | 5 #include "media/renderers/default_renderer_factory.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #endif | 25 #endif |
| 26 #endif | 26 #endif |
| 27 | 27 |
| 28 #if !defined(MEDIA_DISABLE_LIBVPX) | 28 #if !defined(MEDIA_DISABLE_LIBVPX) |
| 29 #include "media/filters/vpx_video_decoder.h" | 29 #include "media/filters/vpx_video_decoder.h" |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 namespace media { | 32 namespace media { |
| 33 | 33 |
| 34 DefaultRendererFactory::DefaultRendererFactory( | 34 DefaultRendererFactory::DefaultRendererFactory( |
| 35 const scoped_refptr<MediaLog>& media_log, | 35 MediaLog* media_log, |
| 36 DecoderFactory* decoder_factory, | 36 DecoderFactory* decoder_factory, |
| 37 const GetGpuFactoriesCB& get_gpu_factories_cb) | 37 const GetGpuFactoriesCB& get_gpu_factories_cb) |
| 38 : media_log_(media_log), | 38 : media_log_(media_log), |
| 39 decoder_factory_(decoder_factory), | 39 decoder_factory_(decoder_factory), |
| 40 get_gpu_factories_cb_(get_gpu_factories_cb) {} | 40 get_gpu_factories_cb_(get_gpu_factories_cb) {} |
| 41 | 41 |
| 42 DefaultRendererFactory::~DefaultRendererFactory() { | 42 DefaultRendererFactory::~DefaultRendererFactory() { |
| 43 } | 43 } |
| 44 | 44 |
| 45 ScopedVector<AudioDecoder> DefaultRendererFactory::CreateAudioDecoders( | 45 ScopedVector<AudioDecoder> DefaultRendererFactory::CreateAudioDecoders( |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 base::Bind(&DefaultRendererFactory::CreateVideoDecoders, | 129 base::Bind(&DefaultRendererFactory::CreateVideoDecoders, |
| 130 base::Unretained(this), media_task_runner, request_surface_cb, | 130 base::Unretained(this), media_task_runner, request_surface_cb, |
| 131 gpu_factories), | 131 gpu_factories), |
| 132 true, gpu_factories, media_log_)); | 132 true, gpu_factories, media_log_)); |
| 133 | 133 |
| 134 return base::MakeUnique<RendererImpl>( | 134 return base::MakeUnique<RendererImpl>( |
| 135 media_task_runner, std::move(audio_renderer), std::move(video_renderer)); | 135 media_task_runner, std::move(audio_renderer), std::move(video_renderer)); |
| 136 } | 136 } |
| 137 | 137 |
| 138 } // namespace media | 138 } // namespace media |
| OLD | NEW |