| Index: gpu/command_buffer/common/gpu_memory_buffer_support.cc
|
| diff --git a/gpu/command_buffer/common/gpu_memory_buffer_support.cc b/gpu/command_buffer/common/gpu_memory_buffer_support.cc
|
| index 68237a08fd255e6ffc020f530493d662ffad0290..730640e0bc24d1dbbc8089a2794f6b247336a809 100644
|
| --- a/gpu/command_buffer/common/gpu_memory_buffer_support.cc
|
| +++ b/gpu/command_buffer/common/gpu_memory_buffer_support.cc
|
| @@ -41,7 +41,7 @@ gfx::BufferFormat BufferFormatForInternalFormat(unsigned internalformat) {
|
| case GL_RGB_YCBCR_420V_CHROMIUM:
|
| return gfx::BufferFormat::YUV_420_BIPLANAR;
|
| case GL_RGB_YCBCR_422_CHROMIUM:
|
| - return gfx::BufferFormat::UYVY_422;
|
| + return gfx::BufferFormat::YUYV_422;
|
| default:
|
| NOTREACHED();
|
| return gfx::BufferFormat::RGBA_8888;
|
| @@ -79,6 +79,7 @@ bool IsImageFormatCompatibleWithGpuMemoryBufferFormat(
|
| case gfx::BufferFormat::YVU_420:
|
| case gfx::BufferFormat::YUV_420_BIPLANAR:
|
| case gfx::BufferFormat::UYVY_422:
|
| + case gfx::BufferFormat::YUYV_422:
|
| return format == BufferFormatForInternalFormat(internalformat);
|
| case gfx::BufferFormat::BGR_565:
|
| case gfx::BufferFormat::RGBX_8888:
|
| @@ -110,6 +111,7 @@ bool IsGpuMemoryBufferFormatSupported(gfx::BufferFormat format,
|
| case gfx::BufferFormat::RG_88:
|
| return capabilities.texture_rg;
|
| case gfx::BufferFormat::UYVY_422:
|
| + case gfx::BufferFormat::YUYV_422:
|
| return capabilities.image_ycbcr_422;
|
| case gfx::BufferFormat::BGR_565:
|
| case gfx::BufferFormat::RGBA_4444:
|
| @@ -156,6 +158,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gfx::Size& size,
|
| // U and V planes are subsampled by a factor of 2.
|
| return size.width() % 2 == 0 && size.height() % 2 == 0;
|
| case gfx::BufferFormat::UYVY_422:
|
| + case gfx::BufferFormat::YUYV_422:
|
| return size.width() % 2 == 0;
|
| }
|
|
|
|
|