| Index: media/base/video_frame.cc
|
| diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
|
| index f88dff3fdadb48efb7d44af3827ee9e82205aece..9e29dd4895bb98b173dcae46fd97e3a67a0b5407 100644
|
| --- a/media/base/video_frame.cc
|
| +++ b/media/base/video_frame.cc
|
| @@ -121,7 +121,7 @@ bool VideoFrame::IsValidConfig(VideoPixelFormat format,
|
| return true;
|
|
|
| // Make sure new formats are properly accounted for in the method.
|
| - static_assert(PIXEL_FORMAT_MAX == 21,
|
| + static_assert(PIXEL_FORMAT_MAX == 24,
|
| "Added pixel format, please review IsValidConfig()");
|
|
|
| if (format == PIXEL_FORMAT_UNKNOWN) {
|
| @@ -524,6 +524,9 @@ size_t VideoFrame::NumPlanes(VideoPixelFormat format) {
|
| case PIXEL_FORMAT_YUV420P10:
|
| case PIXEL_FORMAT_YUV422P10:
|
| case PIXEL_FORMAT_YUV444P10:
|
| + case PIXEL_FORMAT_YUV420P12:
|
| + case PIXEL_FORMAT_YUV422P12:
|
| + case PIXEL_FORMAT_YUV444P12:
|
| return 3;
|
| case PIXEL_FORMAT_YV12A:
|
| return 4;
|
| @@ -1014,11 +1017,13 @@ gfx::Size VideoFrame::SampleSize(VideoPixelFormat format, size_t plane) {
|
| case PIXEL_FORMAT_YV24:
|
| case PIXEL_FORMAT_YUV444P9:
|
| case PIXEL_FORMAT_YUV444P10:
|
| + case PIXEL_FORMAT_YUV444P12:
|
| return gfx::Size(1, 1);
|
|
|
| case PIXEL_FORMAT_YV16:
|
| case PIXEL_FORMAT_YUV422P9:
|
| case PIXEL_FORMAT_YUV422P10:
|
| + case PIXEL_FORMAT_YUV422P12:
|
| return gfx::Size(2, 1);
|
|
|
| case PIXEL_FORMAT_YV12:
|
| @@ -1029,6 +1034,7 @@ gfx::Size VideoFrame::SampleSize(VideoPixelFormat format, size_t plane) {
|
| case PIXEL_FORMAT_MT21:
|
| case PIXEL_FORMAT_YUV420P9:
|
| case PIXEL_FORMAT_YUV420P10:
|
| + case PIXEL_FORMAT_YUV420P12:
|
| return gfx::Size(2, 2);
|
|
|
| case PIXEL_FORMAT_UNKNOWN:
|
| @@ -1064,6 +1070,9 @@ int VideoFrame::BytesPerElement(VideoPixelFormat format, size_t plane) {
|
| case PIXEL_FORMAT_YUV420P10:
|
| case PIXEL_FORMAT_YUV422P10:
|
| case PIXEL_FORMAT_YUV444P10:
|
| + case PIXEL_FORMAT_YUV420P12:
|
| + case PIXEL_FORMAT_YUV422P12:
|
| + case PIXEL_FORMAT_YUV444P12:
|
| return 2;
|
| case PIXEL_FORMAT_NV12:
|
| case PIXEL_FORMAT_NV21:
|
|
|