Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Unified Diff: media/renderers/default_renderer_factory.cc

Issue 1871383003: media: Implement zero-copy video playback for ffmpeg. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/media.gyp ('k') | media/video/gpu_memory_buffer_video_frame_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/default_renderer_factory.cc
diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc
index d50bd1171481a1a986052012f3301ba2c7ef9646..db909137602085a022f9689bdf6b12bf969a3cbc 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -87,8 +87,8 @@ ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders(
video_decoders.push_back(
new GpuVideoDecoder(gpu_factories, request_surface_cb));
-#if !defined(MEDIA_DISABLE_LIBVPX)
std::unique_ptr<GpuMemoryBufferVideoFramePool> gpu_video_frame_pool;
+#if !defined(MEDIA_DISABLE_LIBVPX)
if (gpu_factories &&
gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) {
gpu_video_frame_pool.reset(
@@ -99,7 +99,13 @@ ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders(
#endif
#if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
- video_decoders.push_back(new FFmpegVideoDecoder());
+ if (gpu_factories &&
+ gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) {
+ gpu_video_frame_pool.reset(
+ new GpuMemoryBufferVideoFramePool(media_task_runner, gpu_factories));
+ }
+ video_decoders.push_back(
+ new FFmpegVideoDecoder(std::move(gpu_video_frame_pool)));
#endif
return video_decoders;
« no previous file with comments | « media/media.gyp ('k') | media/video/gpu_memory_buffer_video_frame_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698