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> |
| 8 |
7 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/single_thread_task_runner.h" |
8 #include "build/build_config.h" | 11 #include "build/build_config.h" |
9 #include "base/single_thread_task_runner.h" | |
10 #include "media/base/media_log.h" | 12 #include "media/base/media_log.h" |
11 #include "media/filters/gpu_video_decoder.h" | 13 #include "media/filters/gpu_video_decoder.h" |
12 #include "media/filters/opus_audio_decoder.h" | 14 #include "media/filters/opus_audio_decoder.h" |
13 #include "media/renderers/audio_renderer_impl.h" | 15 #include "media/renderers/audio_renderer_impl.h" |
14 #include "media/renderers/gpu_video_accelerator_factories.h" | 16 #include "media/renderers/gpu_video_accelerator_factories.h" |
15 #include "media/renderers/renderer_impl.h" | 17 #include "media/renderers/renderer_impl.h" |
16 #include "media/renderers/video_renderer_impl.h" | 18 #include "media/renderers/video_renderer_impl.h" |
17 | 19 |
18 #if !defined(MEDIA_DISABLE_FFMPEG) | 20 #if !defined(MEDIA_DISABLE_FFMPEG) |
19 #include "media/filters/ffmpeg_audio_decoder.h" | 21 #include "media/filters/ffmpeg_audio_decoder.h" |
(...skipping 30 matching lines...) Expand all Loading... |
50 ScopedVector<AudioDecoder> audio_decoders; | 52 ScopedVector<AudioDecoder> audio_decoders; |
51 | 53 |
52 #if !defined(MEDIA_DISABLE_FFMPEG) | 54 #if !defined(MEDIA_DISABLE_FFMPEG) |
53 audio_decoders.push_back( | 55 audio_decoders.push_back( |
54 new FFmpegAudioDecoder(media_task_runner, media_log_)); | 56 new FFmpegAudioDecoder(media_task_runner, media_log_)); |
55 #endif | 57 #endif |
56 | 58 |
57 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); | 59 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); |
58 | 60 |
59 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( | 61 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( |
60 media_task_runner, audio_renderer_sink, audio_decoders.Pass(), | 62 media_task_runner, audio_renderer_sink, std::move(audio_decoders), |
61 audio_hardware_config_, media_log_)); | 63 audio_hardware_config_, media_log_)); |
62 | 64 |
63 // Create our video decoders and renderer. | 65 // Create our video decoders and renderer. |
64 ScopedVector<VideoDecoder> video_decoders; | 66 ScopedVector<VideoDecoder> video_decoders; |
65 | 67 |
66 // |gpu_factories_| requires that its entry points be called on its | 68 // |gpu_factories_| requires that its entry points be called on its |
67 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 69 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
68 // factories, require that their message loops are identical. | 70 // factories, require that their message loops are identical. |
69 DCHECK(!gpu_factories_ || | 71 DCHECK(!gpu_factories_ || |
70 (gpu_factories_->GetTaskRunner() == media_task_runner.get())); | 72 (gpu_factories_->GetTaskRunner() == media_task_runner.get())); |
71 | 73 |
72 if (gpu_factories_) | 74 if (gpu_factories_) |
73 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); | 75 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); |
74 | 76 |
75 #if !defined(MEDIA_DISABLE_LIBVPX) | 77 #if !defined(MEDIA_DISABLE_LIBVPX) |
76 video_decoders.push_back(new VpxVideoDecoder()); | 78 video_decoders.push_back(new VpxVideoDecoder()); |
77 #endif | 79 #endif |
78 | 80 |
79 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 81 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
80 video_decoders.push_back(new FFmpegVideoDecoder()); | 82 video_decoders.push_back(new FFmpegVideoDecoder()); |
81 #endif | 83 #endif |
82 | 84 |
83 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 85 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
84 media_task_runner, worker_task_runner, video_renderer_sink, | 86 media_task_runner, worker_task_runner, video_renderer_sink, |
85 video_decoders.Pass(), true, gpu_factories_, media_log_)); | 87 std::move(video_decoders), true, gpu_factories_, media_log_)); |
86 | 88 |
87 // Create renderer. | 89 // Create renderer. |
88 return scoped_ptr<Renderer>(new RendererImpl( | 90 return scoped_ptr<Renderer>(new RendererImpl( |
89 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); | 91 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
90 } | 92 } |
91 | 93 |
92 } // namespace media | 94 } // namespace media |
OLD | NEW |