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

Unified Diff: ui/gl/gl_image_ozone_native_pixmap.cc

Issue 2055483002: gl: Add YVU_420 support to GLImageOzoneNativePixmap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_ozone_native_pixmap.cc
diff --git a/ui/gl/gl_image_ozone_native_pixmap.cc b/ui/gl/gl_image_ozone_native_pixmap.cc
index d6ed8a4c306dd7803eada394ef4a64cde3b7b6d3..6b5c5b89feed51b0b9c9a49c141c529c0ca53b1e 100644
--- a/ui/gl/gl_image_ozone_native_pixmap.cc
+++ b/ui/gl/gl_image_ozone_native_pixmap.cc
@@ -15,6 +15,7 @@
#define DRM_FORMAT_ABGR8888 FOURCC('A', 'B', '2', '4')
#define DRM_FORMAT_XRGB8888 FOURCC('X', 'R', '2', '4')
#define DRM_FORMAT_XBGR8888 FOURCC('X', 'B', '2', '4')
+#define DRM_FORMAT_YV12 FOURCC('Y', 'V', '1', '2')
namespace gl {
namespace {
@@ -25,6 +26,8 @@ bool ValidInternalFormat(unsigned internalformat, gfx::BufferFormat format) {
return format == gfx::BufferFormat::BGR_565 ||
format == gfx::BufferFormat::RGBX_8888 ||
format == gfx::BufferFormat::BGRX_8888;
+ case GL_RGB_YCRCB_420_CHROMIUM:
+ return format == gfx::BufferFormat::YVU_420;
case GL_RGBA:
return format == gfx::BufferFormat::RGBA_8888;
case GL_BGRA_EXT:
@@ -44,6 +47,7 @@ bool ValidFormat(gfx::BufferFormat format) {
case gfx::BufferFormat::RGBX_8888:
case gfx::BufferFormat::BGRA_8888:
case gfx::BufferFormat::BGRX_8888:
+ case gfx::BufferFormat::YVU_420:
return true;
case gfx::BufferFormat::ATC:
case gfx::BufferFormat::ATCIA:
@@ -51,7 +55,6 @@ bool ValidFormat(gfx::BufferFormat format) {
case gfx::BufferFormat::DXT5:
case gfx::BufferFormat::ETC1:
case gfx::BufferFormat::RGBA_4444:
- case gfx::BufferFormat::YVU_420:
case gfx::BufferFormat::YUV_420_BIPLANAR:
case gfx::BufferFormat::UYVY_422:
return false;
@@ -75,13 +78,14 @@ EGLint FourCC(gfx::BufferFormat format) {
return DRM_FORMAT_ARGB8888;
case gfx::BufferFormat::BGRX_8888:
return DRM_FORMAT_XRGB8888;
+ case gfx::BufferFormat::YVU_420:
+ return DRM_FORMAT_YV12;
case gfx::BufferFormat::ATC:
case gfx::BufferFormat::ATCIA:
case gfx::BufferFormat::DXT1:
case gfx::BufferFormat::DXT5:
case gfx::BufferFormat::ETC1:
case gfx::BufferFormat::RGBA_4444:
- case gfx::BufferFormat::YVU_420:
case gfx::BufferFormat::YUV_420_BIPLANAR:
case gfx::BufferFormat::UYVY_422:
NOTREACHED();
@@ -137,7 +141,12 @@ bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,
plane < gfx::NumberOfPlanesForBufferFormat(pixmap->GetBufferFormat());
++plane) {
attrs.push_back(EGL_DMA_BUF_PLANE0_FD_EXT + plane * 3);
+#if defined(ARCH_CPU_X86_FAMILY) && defined(OS_CHROMEOS)
+ // i965 driver expects all the fds to have the same value.
reveman 2016/06/08 21:48:30 Can we change the GLImageOzone native pixmap API t
Daniele Castagna 2016/06/09 00:26:24 Done as discussed.
+ attrs.push_back(pixmap->GetDmaBufFd(0));
+#else
attrs.push_back(pixmap->GetDmaBufFd(plane));
+#endif
attrs.push_back(EGL_DMA_BUF_PLANE0_OFFSET_EXT + plane * 3);
attrs.push_back(0);
attrs.push_back(EGL_DMA_BUF_PLANE0_PITCH_EXT + plane * 3);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698