| Index: ui/gfx/buffer_format_util.cc
|
| diff --git a/ui/gfx/buffer_format_util.cc b/ui/gfx/buffer_format_util.cc
|
| index 4432b3e9a6c88568fe60ea4165f99b42816cd981..d23961607d5acd813378a09cf5c92473d9f596f2 100644
|
| --- a/ui/gfx/buffer_format_util.cc
|
| +++ b/ui/gfx/buffer_format_util.cc
|
| @@ -11,22 +11,16 @@
|
| namespace gfx {
|
| namespace {
|
|
|
| -const BufferFormat kBufferFormats[] = {BufferFormat::ATC,
|
| - BufferFormat::ATCIA,
|
| - BufferFormat::DXT1,
|
| - BufferFormat::DXT5,
|
| - BufferFormat::ETC1,
|
| - BufferFormat::R_8,
|
| - BufferFormat::RG_88,
|
| - BufferFormat::BGR_565,
|
| - BufferFormat::RGBA_4444,
|
| - BufferFormat::RGBX_8888,
|
| - BufferFormat::RGBA_8888,
|
| - BufferFormat::BGRX_8888,
|
| - BufferFormat::BGRA_8888,
|
| - BufferFormat::UYVY_422,
|
| - BufferFormat::YUV_420_BIPLANAR,
|
| - BufferFormat::YVU_420};
|
| +const BufferFormat kBufferFormats[] = {
|
| + BufferFormat::ATC, BufferFormat::ATCIA,
|
| + BufferFormat::DXT1, BufferFormat::DXT5,
|
| + BufferFormat::ETC1, BufferFormat::R_8,
|
| + BufferFormat::RG_88, BufferFormat::BGR_565,
|
| + BufferFormat::RGBA_4444, BufferFormat::RGBX_8888,
|
| + BufferFormat::RGBA_8888, BufferFormat::BGRX_8888,
|
| + BufferFormat::BGRA_8888, BufferFormat::UYVY_422,
|
| + BufferFormat::YUYV_422, BufferFormat::YUV_420_BIPLANAR,
|
| + BufferFormat::YVU_420};
|
|
|
| static_assert(arraysize(kBufferFormats) ==
|
| (static_cast<int>(BufferFormat::LAST) + 1),
|
| @@ -59,6 +53,7 @@ bool RowSizeForBufferFormatChecked(
|
| case BufferFormat::BGR_565:
|
| case BufferFormat::RGBA_4444:
|
| case BufferFormat::UYVY_422:
|
| + case BufferFormat::YUYV_422:
|
| checked_size *= 2;
|
| checked_size += 3;
|
| if (!checked_size.IsValid())
|
| @@ -110,6 +105,7 @@ size_t NumberOfPlanesForBufferFormat(BufferFormat format) {
|
| case BufferFormat::BGRX_8888:
|
| case BufferFormat::BGRA_8888:
|
| case BufferFormat::UYVY_422:
|
| + case BufferFormat::YUYV_422:
|
| return 1;
|
| case BufferFormat::YUV_420_BIPLANAR:
|
| return 2;
|
| @@ -136,6 +132,7 @@ size_t SubsamplingFactorForBufferFormat(BufferFormat format, size_t plane) {
|
| case BufferFormat::BGRX_8888:
|
| case BufferFormat::BGRA_8888:
|
| case BufferFormat::UYVY_422:
|
| + case BufferFormat::YUYV_422:
|
| return 1;
|
| case BufferFormat::YVU_420: {
|
| static size_t factor[] = {1, 2, 2};
|
| @@ -207,6 +204,7 @@ size_t BufferOffsetForBufferFormat(const Size& size,
|
| case BufferFormat::BGRX_8888:
|
| case BufferFormat::BGRA_8888:
|
| case BufferFormat::UYVY_422:
|
| + case BufferFormat::YUYV_422:
|
| return 0;
|
| case BufferFormat::YVU_420: {
|
| static size_t offset_in_2x2_sub_sampling_sizes[] = {0, 4, 5};
|
|
|