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

Unified Diff: content/renderer/media/renderer_gpu_video_accelerator_factories.cc

Issue 2648633005: cros: Support YUYV format for GPU memory buffer video frames
Patch Set: Created 3 years, 11 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
Index: content/renderer/media/renderer_gpu_video_accelerator_factories.cc
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
index 1fbdb829d93a9dbf2c364afb21ed0418bedf90fc..9845e783b0ab37f641b49bb29b9df9e6bffd029f 100644
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
@@ -17,6 +17,7 @@
#include "gpu/command_buffer/client/gles2_interface.h"
#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
#include "gpu/ipc/client/gpu_channel_host.h"
+#include "gpu/ipc/common/gpu_memory_buffer_support.h"
#include "media/gpu/gpu_video_accelerator_util.h"
#include "media/gpu/ipc/client/gpu_video_decode_accelerator_host.h"
#include "media/gpu/ipc/client/gpu_video_encode_accelerator_host.h"
@@ -268,8 +269,21 @@ RendererGpuVideoAcceleratorFactories::VideoFrameOutputFormat() {
auto capabilities = context_provider_->ContextCapabilities();
if (capabilities.image_ycbcr_420v)
return media::GpuVideoAcceleratorFactories::OutputFormat::NV12_SINGLE_GMB;
- if (capabilities.image_ycbcr_422)
+ if (capabilities.image_ycbcr_422) {
+#if defined(OS_MACOSX)
+ // Mac supports UYVY IOSurface.
return media::GpuVideoAcceleratorFactories::OutputFormat::UYVY;
+#elif defined(OS_CHROMEOS)
+ // Native GPU memory buffers are required.
+ if (gpu::IsNativeGpuMemoryBufferConfigurationSupported(
+ gfx::BufferFormat::YUYV_422,
+ gfx::BufferUsage::GPU_READ_CPU_READ_WRITE)) {
+ // Mesa EGL supports not UYVY but YUYV image.
marcheu1 2017/01/21 00:25:18 pleaes don't add platform-specific code, even comm
dshwang 2017/01/23 23:13:42 Done.
+ return media::GpuVideoAcceleratorFactories::OutputFormat::YUYV;
+ }
+#endif
+ }
+
if (capabilities.texture_rg)
return media::GpuVideoAcceleratorFactories::OutputFormat::NV12_DUAL_GMB;
return media::GpuVideoAcceleratorFactories::OutputFormat::UNDEFINED;

Powered by Google App Engine
This is Rietveld 408576698