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/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
11 #include "build/build_config.h" | 12 #include "build/build_config.h" |
12 #include "media/base/decoder_factory.h" | 13 #include "media/base/decoder_factory.h" |
13 #include "media/base/media_log.h" | 14 #include "media/base/media_log.h" |
14 #include "media/filters/gpu_video_decoder.h" | 15 #include "media/filters/gpu_video_decoder.h" |
15 #include "media/filters/opus_audio_decoder.h" | 16 #include "media/filters/opus_audio_decoder.h" |
16 #include "media/renderers/audio_renderer_impl.h" | 17 #include "media/renderers/audio_renderer_impl.h" |
17 #include "media/renderers/gpu_video_accelerator_factories.h" | 18 #include "media/renderers/gpu_video_accelerator_factories.h" |
18 #include "media/renderers/renderer_impl.h" | 19 #include "media/renderers/renderer_impl.h" |
19 #include "media/renderers/video_renderer_impl.h" | 20 #include "media/renderers/video_renderer_impl.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 video_decoders.push_back(new VpxVideoDecoder()); | 91 video_decoders.push_back(new VpxVideoDecoder()); |
91 #endif | 92 #endif |
92 | 93 |
93 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 94 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
94 video_decoders.push_back(new FFmpegVideoDecoder()); | 95 video_decoders.push_back(new FFmpegVideoDecoder()); |
95 #endif | 96 #endif |
96 | 97 |
97 return video_decoders; | 98 return video_decoders; |
98 } | 99 } |
99 | 100 |
100 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 101 std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
101 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 102 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
102 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 103 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
103 AudioRendererSink* audio_renderer_sink, | 104 AudioRendererSink* audio_renderer_sink, |
104 VideoRendererSink* video_renderer_sink, | 105 VideoRendererSink* video_renderer_sink, |
105 const RequestSurfaceCB& request_surface_cb) { | 106 const RequestSurfaceCB& request_surface_cb) { |
106 DCHECK(audio_renderer_sink); | 107 DCHECK(audio_renderer_sink); |
107 | 108 |
108 scoped_ptr<AudioRenderer> audio_renderer( | 109 std::unique_ptr<AudioRenderer> audio_renderer( |
109 new AudioRendererImpl(media_task_runner, audio_renderer_sink, | 110 new AudioRendererImpl(media_task_runner, audio_renderer_sink, |
110 CreateAudioDecoders(media_task_runner), | 111 CreateAudioDecoders(media_task_runner), |
111 audio_hardware_config_, media_log_)); | 112 audio_hardware_config_, media_log_)); |
112 | 113 |
113 GpuVideoAcceleratorFactories* gpu_factories = nullptr; | 114 GpuVideoAcceleratorFactories* gpu_factories = nullptr; |
114 if (!get_gpu_factories_cb_.is_null()) | 115 if (!get_gpu_factories_cb_.is_null()) |
115 gpu_factories = get_gpu_factories_cb_.Run(); | 116 gpu_factories = get_gpu_factories_cb_.Run(); |
116 | 117 |
117 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 118 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
118 media_task_runner, worker_task_runner, video_renderer_sink, | 119 media_task_runner, worker_task_runner, video_renderer_sink, |
119 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), | 120 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), |
120 true, gpu_factories, media_log_)); | 121 true, gpu_factories, media_log_)); |
121 | 122 |
122 return scoped_ptr<Renderer>(new RendererImpl( | 123 return base::WrapUnique(new RendererImpl( |
123 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); | 124 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
124 } | 125 } |
125 | 126 |
126 } // namespace media | 127 } // namespace media |
OLD | NEW |