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/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "media/base/decoder_factory.h" | 12 #include "media/base/decoder_factory.h" |
13 #include "media/base/media_log.h" | 13 #include "media/base/media_log.h" |
14 #include "media/filters/gpu_video_decoder.h" | 14 #include "media/filters/gpu_video_decoder.h" |
15 #include "media/filters/opus_audio_decoder.h" | 15 #include "media/filters/opus_audio_decoder.h" |
16 #include "media/renderers/audio_renderer_impl.h" | 16 #include "media/renderers/audio_renderer_impl.h" |
17 #include "media/renderers/gpu_video_accelerator_factories.h" | 17 #include "media/renderers/gpu_video_accelerator_factories.h" |
18 #include "media/renderers/renderer_impl.h" | 18 #include "media/renderers/renderer_impl.h" |
19 #include "media/renderers/video_renderer_impl.h" | 19 #include "media/renderers/video_renderer_impl.h" |
| 20 #include "media/video/gpu_memory_buffer_video_frame_pool.h" |
20 | 21 |
21 #if !defined(MEDIA_DISABLE_FFMPEG) | 22 #if !defined(MEDIA_DISABLE_FFMPEG) |
22 #include "media/filters/ffmpeg_audio_decoder.h" | 23 #include "media/filters/ffmpeg_audio_decoder.h" |
23 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 24 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
24 #include "media/filters/ffmpeg_video_decoder.h" | 25 #include "media/filters/ffmpeg_video_decoder.h" |
25 #endif | 26 #endif |
26 #endif | 27 #endif |
27 | 28 |
28 #if !defined(MEDIA_DISABLE_LIBVPX) | 29 #if !defined(MEDIA_DISABLE_LIBVPX) |
29 #include "media/filters/vpx_video_decoder.h" | 30 #include "media/filters/vpx_video_decoder.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 81 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
81 // factories, require that their message loops are identical. | 82 // factories, require that their message loops are identical. |
82 DCHECK(!gpu_factories || | 83 DCHECK(!gpu_factories || |
83 (gpu_factories->GetTaskRunner() == media_task_runner.get())); | 84 (gpu_factories->GetTaskRunner() == media_task_runner.get())); |
84 | 85 |
85 if (gpu_factories) | 86 if (gpu_factories) |
86 video_decoders.push_back( | 87 video_decoders.push_back( |
87 new GpuVideoDecoder(gpu_factories, request_surface_cb)); | 88 new GpuVideoDecoder(gpu_factories, request_surface_cb)); |
88 | 89 |
89 #if !defined(MEDIA_DISABLE_LIBVPX) | 90 #if !defined(MEDIA_DISABLE_LIBVPX) |
90 video_decoders.push_back(new VpxVideoDecoder()); | 91 std::unique_ptr<GpuMemoryBufferVideoFramePool> gpu_video_frame_pool; |
| 92 if (gpu_factories && |
| 93 gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) { |
| 94 gpu_video_frame_pool.reset( |
| 95 new GpuMemoryBufferVideoFramePool(media_task_runner, gpu_factories)); |
| 96 } |
| 97 video_decoders.push_back( |
| 98 new VpxVideoDecoder(std::move(gpu_video_frame_pool))); |
91 #endif | 99 #endif |
92 | 100 |
93 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 101 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
94 video_decoders.push_back(new FFmpegVideoDecoder()); | 102 video_decoders.push_back(new FFmpegVideoDecoder()); |
95 #endif | 103 #endif |
96 | 104 |
97 return video_decoders; | 105 return video_decoders; |
98 } | 106 } |
99 | 107 |
100 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 108 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
(...skipping 16 matching lines...) Expand all Loading... |
117 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 125 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
118 media_task_runner, worker_task_runner, video_renderer_sink, | 126 media_task_runner, worker_task_runner, video_renderer_sink, |
119 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), | 127 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), |
120 true, gpu_factories, media_log_)); | 128 true, gpu_factories, media_log_)); |
121 | 129 |
122 return scoped_ptr<Renderer>(new RendererImpl( | 130 return scoped_ptr<Renderer>(new RendererImpl( |
123 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); | 131 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
124 } | 132 } |
125 | 133 |
126 } // namespace media | 134 } // namespace media |
OLD | NEW |