Index: media/base/video_frame.cc |
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc |
index f88dff3fdadb48efb7d44af3827ee9e82205aece..e2c6e353360edb78864a9e0ef90588c66ed18bbb 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 == 23, |
"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: |
@@ -1039,6 +1041,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; |
} |
} |
@@ -1056,6 +1060,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: |
@@ -1077,6 +1082,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; |