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" |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 // |gpu_factories_| requires that its entry points be called on its | 80 // |gpu_factories_| requires that its entry points be called on its |
81 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the | 81 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the |
82 // factories, require that their message loops are identical. | 82 // factories, require that their message loops are identical. |
83 DCHECK(!gpu_factories || | 83 DCHECK(!gpu_factories || |
84 (gpu_factories->GetTaskRunner() == media_task_runner.get())); | 84 (gpu_factories->GetTaskRunner() == media_task_runner.get())); |
85 | 85 |
86 if (gpu_factories) | 86 if (gpu_factories) |
87 video_decoders.push_back( | 87 video_decoders.push_back( |
88 new GpuVideoDecoder(gpu_factories, request_surface_cb)); | 88 new GpuVideoDecoder(gpu_factories, request_surface_cb)); |
89 | 89 |
| 90 std::unique_ptr<GpuMemoryBufferVideoFramePool> gpu_video_frame_pool; |
90 #if !defined(MEDIA_DISABLE_LIBVPX) | 91 #if !defined(MEDIA_DISABLE_LIBVPX) |
91 std::unique_ptr<GpuMemoryBufferVideoFramePool> gpu_video_frame_pool; | |
92 if (gpu_factories && | 92 if (gpu_factories && |
93 gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) { | 93 gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) { |
94 gpu_video_frame_pool.reset( | 94 gpu_video_frame_pool.reset( |
95 new GpuMemoryBufferVideoFramePool(media_task_runner, gpu_factories)); | 95 new GpuMemoryBufferVideoFramePool(media_task_runner, gpu_factories)); |
96 } | 96 } |
97 video_decoders.push_back( | 97 video_decoders.push_back( |
98 new VpxVideoDecoder(std::move(gpu_video_frame_pool))); | 98 new VpxVideoDecoder(std::move(gpu_video_frame_pool))); |
99 #endif | 99 #endif |
100 | 100 |
101 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 101 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) |
102 video_decoders.push_back(new FFmpegVideoDecoder()); | 102 if (gpu_factories && |
| 103 gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) { |
| 104 gpu_video_frame_pool.reset( |
| 105 new GpuMemoryBufferVideoFramePool(media_task_runner, gpu_factories)); |
| 106 } |
| 107 video_decoders.push_back( |
| 108 new FFmpegVideoDecoder(std::move(gpu_video_frame_pool))); |
103 #endif | 109 #endif |
104 | 110 |
105 return video_decoders; | 111 return video_decoders; |
106 } | 112 } |
107 | 113 |
108 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( | 114 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( |
109 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 115 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
110 const scoped_refptr<base::TaskRunner>& worker_task_runner, | 116 const scoped_refptr<base::TaskRunner>& worker_task_runner, |
111 AudioRendererSink* audio_renderer_sink, | 117 AudioRendererSink* audio_renderer_sink, |
112 VideoRendererSink* video_renderer_sink, | 118 VideoRendererSink* video_renderer_sink, |
(...skipping 12 matching lines...) Expand all Loading... |
125 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 131 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
126 media_task_runner, worker_task_runner, video_renderer_sink, | 132 media_task_runner, worker_task_runner, video_renderer_sink, |
127 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), | 133 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), |
128 true, gpu_factories, media_log_)); | 134 true, gpu_factories, media_log_)); |
129 | 135 |
130 return scoped_ptr<Renderer>(new RendererImpl( | 136 return scoped_ptr<Renderer>(new RendererImpl( |
131 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); | 137 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); |
132 } | 138 } |
133 | 139 |
134 } // namespace media | 140 } // namespace media |
OLD | NEW |