Index: media/base/video_frame.cc |
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc |
index 2de6bd36d5cdffb60956aa515a3824671db29b7d..38a6438b5972c16c057e11ea72e017746bb28c88 100644 |
--- a/media/base/video_frame.cc |
+++ b/media/base/video_frame.cc |
@@ -125,7 +125,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 == 23, |
"Added pixel format, please review IsValidConfig()"); |
if (format == PIXEL_FORMAT_UNKNOWN) { |
@@ -535,6 +535,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: |
@@ -1041,6 +1043,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; |
} |
} |
@@ -1058,6 +1062,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: |
@@ -1079,6 +1084,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; |