| Index: media/base/video_frame.cc
|
| diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
|
| index 9e29dd4895bb98b173dcae46fd97e3a67a0b5407..62b347dca3f953bff4e5184d3b21de374f0ec6c2 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 == 24,
|
| + static_assert(PIXEL_FORMAT_MAX == 26,
|
| "Added pixel format, please review IsValidConfig()");
|
|
|
| if (format == PIXEL_FORMAT_UNKNOWN) {
|
| @@ -509,6 +509,8 @@ size_t VideoFrame::NumPlanes(VideoPixelFormat format) {
|
| case PIXEL_FORMAT_RGB24:
|
| case PIXEL_FORMAT_RGB32:
|
| case PIXEL_FORMAT_MJPEG:
|
| + case PIXEL_FORMAT_Y8:
|
| + case PIXEL_FORMAT_Y16:
|
| return 1;
|
| case PIXEL_FORMAT_NV12:
|
| case PIXEL_FORMAT_NV21:
|
| @@ -1045,6 +1047,8 @@ gfx::Size VideoFrame::SampleSize(VideoPixelFormat format, size_t plane) {
|
| case PIXEL_FORMAT_RGB24:
|
| case PIXEL_FORMAT_RGB32:
|
| case PIXEL_FORMAT_MJPEG:
|
| + case PIXEL_FORMAT_Y8:
|
| + case PIXEL_FORMAT_Y16:
|
| break;
|
| }
|
| }
|
| @@ -1062,6 +1066,7 @@ int VideoFrame::BytesPerElement(VideoPixelFormat format, size_t plane) {
|
| return 4;
|
| case PIXEL_FORMAT_RGB24:
|
| return 3;
|
| + case PIXEL_FORMAT_Y16:
|
| case PIXEL_FORMAT_UYVY:
|
| case PIXEL_FORMAT_YUY2:
|
| case PIXEL_FORMAT_YUV420P9:
|
| @@ -1086,6 +1091,7 @@ int VideoFrame::BytesPerElement(VideoPixelFormat format, size_t plane) {
|
| case PIXEL_FORMAT_YV16:
|
| case PIXEL_FORMAT_YV12A:
|
| case PIXEL_FORMAT_YV24:
|
| + case PIXEL_FORMAT_Y8:
|
| return 1;
|
| case PIXEL_FORMAT_MJPEG:
|
| return 0;
|
|
|