Index: media/base/video_types.cc |
diff --git a/media/base/video_types.cc b/media/base/video_types.cc |
index f8eeb3e1bb433e03cf390223173204664806611e..846bc0bab3481b8c8000aa3e6ba6ca31c8482676 100644 |
--- a/media/base/video_types.cc |
+++ b/media/base/video_types.cc |
@@ -16,8 +16,6 @@ std::string VideoPixelFormatToString(VideoPixelFormat format) { |
return "PIXEL_FORMAT_I420"; |
case PIXEL_FORMAT_YV12: |
return "PIXEL_FORMAT_YV12"; |
- case PIXEL_FORMAT_YV16: |
- return "PIXEL_FORMAT_YV16"; |
case PIXEL_FORMAT_YV12A: |
return "PIXEL_FORMAT_YV12A"; |
case PIXEL_FORMAT_YV24: |
@@ -54,6 +52,10 @@ std::string VideoPixelFormatToString(VideoPixelFormat format) { |
return "PIXEL_FORMAT_YUV444P9"; |
case PIXEL_FORMAT_YUV444P10: |
return "PIXEL_FORMAT_YUV444P10"; |
+ case PIXEL_FORMAT_Y8: |
+ return "PIXEL_FORMAT_Y8"; |
+ case PIXEL_FORMAT_Y16: |
+ return "PIXEL_FORMAT_Y16"; |
} |
NOTREACHED() << "Invalid VideoPixelFormat provided: " << format; |
return ""; |
@@ -85,6 +87,8 @@ bool IsYuvPlanar(VideoPixelFormat format) { |
case PIXEL_FORMAT_RGB24: |
case PIXEL_FORMAT_RGB32: |
case PIXEL_FORMAT_MJPEG: |
+ case PIXEL_FORMAT_Y8: |
+ case PIXEL_FORMAT_Y16: |
return false; |
} |
return false; |
@@ -111,6 +115,8 @@ bool IsOpaque(VideoPixelFormat format) { |
case PIXEL_FORMAT_YUV422P10: |
case PIXEL_FORMAT_YUV444P9: |
case PIXEL_FORMAT_YUV444P10: |
+ case PIXEL_FORMAT_Y8: |
+ case PIXEL_FORMAT_Y16: |
return true; |
case PIXEL_FORMAT_YV12A: |
case PIXEL_FORMAT_ARGB: |