| Index: media/base/video_frame.cc
|
| diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
|
| index f2d11bd2e131acd7bb0b85b003f3d9703ef50ecd..e274a0b8ce6c7f3e9a271683da115441de5167a3 100644
|
| --- a/media/base/video_frame.cc
|
| +++ b/media/base/video_frame.cc
|
| @@ -107,6 +107,7 @@ bool RequiresEvenSizeAllocation(VideoPixelFormat format) {
|
| case PIXEL_FORMAT_NV21:
|
| case PIXEL_FORMAT_MT21:
|
| case PIXEL_FORMAT_I420:
|
| + case PIXEL_FORMAT_I422:
|
| case PIXEL_FORMAT_MJPEG:
|
| case PIXEL_FORMAT_YUY2:
|
| case PIXEL_FORMAT_YV12:
|
| @@ -157,7 +158,7 @@ bool VideoFrame::IsValidConfig(VideoPixelFormat format,
|
| return true;
|
|
|
| // Make sure new formats are properly accounted for in the method.
|
| - static_assert(PIXEL_FORMAT_MAX == 26,
|
| + static_assert(PIXEL_FORMAT_MAX == 27,
|
| "Added pixel format, please review IsValidConfig()");
|
|
|
| if (format == PIXEL_FORMAT_UNKNOWN) {
|
| @@ -515,6 +516,7 @@ size_t VideoFrame::NumPlanes(VideoPixelFormat format) {
|
| case PIXEL_FORMAT_MT21:
|
| return 2;
|
| case PIXEL_FORMAT_I420:
|
| + case PIXEL_FORMAT_I422:
|
| case PIXEL_FORMAT_YV12:
|
| case PIXEL_FORMAT_YV16:
|
| case PIXEL_FORMAT_YV24:
|
| @@ -1028,6 +1030,7 @@ gfx::Size VideoFrame::SampleSize(VideoPixelFormat format, size_t plane) {
|
| case PIXEL_FORMAT_Y16:
|
| return gfx::Size(1, 1);
|
|
|
| + case PIXEL_FORMAT_I422:
|
| case PIXEL_FORMAT_YV16:
|
| case PIXEL_FORMAT_YUV422P9:
|
| case PIXEL_FORMAT_YUV422P10:
|
| @@ -1093,6 +1096,7 @@ int VideoFrame::BytesPerElement(VideoPixelFormat format, size_t plane) {
|
| }
|
| case PIXEL_FORMAT_YV12:
|
| case PIXEL_FORMAT_I420:
|
| + case PIXEL_FORMAT_I422:
|
| case PIXEL_FORMAT_YV16:
|
| case PIXEL_FORMAT_YV12A:
|
| case PIXEL_FORMAT_YV24:
|
|
|