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 17 matching lines...) Expand all Loading... |
28 | 28 |
29 #if !defined(MEDIA_DISABLE_LIBVPX) | 29 #if !defined(MEDIA_DISABLE_LIBVPX) |
30 #include "media/filters/vpx_video_decoder.h" | 30 #include "media/filters/vpx_video_decoder.h" |
31 #endif | 31 #endif |
32 | 32 |
33 namespace media { | 33 namespace media { |
34 | 34 |
35 DefaultRendererFactory::DefaultRendererFactory( | 35 DefaultRendererFactory::DefaultRendererFactory( |
36 const scoped_refptr<MediaLog>& media_log, | 36 const scoped_refptr<MediaLog>& media_log, |
37 DecoderFactory* decoder_factory, | 37 DecoderFactory* decoder_factory, |
38 const GetGpuFactoriesCB& get_gpu_factories_cb, | 38 const GetGpuFactoriesCB& get_gpu_factories_cb) |
39 const AudioHardwareConfig& audio_hardware_config) | |
40 : media_log_(media_log), | 39 : media_log_(media_log), |
41 decoder_factory_(decoder_factory), | 40 decoder_factory_(decoder_factory), |
42 get_gpu_factories_cb_(get_gpu_factories_cb), | 41 get_gpu_factories_cb_(get_gpu_factories_cb) {} |
43 audio_hardware_config_(audio_hardware_config) {} | |
44 | 42 |
45 DefaultRendererFactory::~DefaultRendererFactory() { | 43 DefaultRendererFactory::~DefaultRendererFactory() { |
46 } | 44 } |
47 | 45 |
48 ScopedVector<AudioDecoder> DefaultRendererFactory::CreateAudioDecoders( | 46 ScopedVector<AudioDecoder> DefaultRendererFactory::CreateAudioDecoders( |
49 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner) { | 47 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner) { |
50 // Create our audio decoders and renderer. | 48 // Create our audio decoders and renderer. |
51 ScopedVector<AudioDecoder> audio_decoders; | 49 ScopedVector<AudioDecoder> audio_decoders; |
52 | 50 |
53 #if !defined(MEDIA_DISABLE_FFMPEG) | 51 #if !defined(MEDIA_DISABLE_FFMPEG) |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 } | 99 } |
102 | 100 |
103 std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 101 std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
104 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 102 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
105 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 103 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
106 AudioRendererSink* audio_renderer_sink, | 104 AudioRendererSink* audio_renderer_sink, |
107 VideoRendererSink* video_renderer_sink, | 105 VideoRendererSink* video_renderer_sink, |
108 const RequestSurfaceCB& request_surface_cb) { | 106 const RequestSurfaceCB& request_surface_cb) { |
109 DCHECK(audio_renderer_sink); | 107 DCHECK(audio_renderer_sink); |
110 | 108 |
111 std::unique_ptr<AudioRenderer> audio_renderer( | 109 std::unique_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( |
112 new AudioRendererImpl(media_task_runner, audio_renderer_sink, | 110 media_task_runner, audio_renderer_sink, |
113 CreateAudioDecoders(media_task_runner), | 111 CreateAudioDecoders(media_task_runner), media_log_)); |
114 audio_hardware_config_, media_log_)); | |
115 | 112 |
116 GpuVideoAcceleratorFactories* gpu_factories = nullptr; | 113 GpuVideoAcceleratorFactories* gpu_factories = nullptr; |
117 if (!get_gpu_factories_cb_.is_null()) | 114 if (!get_gpu_factories_cb_.is_null()) |
118 gpu_factories = get_gpu_factories_cb_.Run(); | 115 gpu_factories = get_gpu_factories_cb_.Run(); |
119 | 116 |
120 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 117 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
121 media_task_runner, worker_task_runner, video_renderer_sink, | 118 media_task_runner, worker_task_runner, video_renderer_sink, |
122 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), | 119 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), |
123 true, gpu_factories, media_log_)); | 120 true, gpu_factories, media_log_)); |
124 | 121 |
125 return base::WrapUnique(new RendererImpl( | 122 return base::WrapUnique(new RendererImpl( |
126 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); | 123 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
127 } | 124 } |
128 | 125 |
129 } // namespace media | 126 } // namespace media |
OLD | NEW |