| Index: media/base/video_frame.cc
|
| diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
|
| index b69f4f59dddaac8e983309eda2f73f93e682f2b4..a8736de7a766936b934b471d4beff6f5134788b5 100644
|
| --- a/media/base/video_frame.cc
|
| +++ b/media/base/video_frame.cc
|
| @@ -89,6 +89,7 @@ static gfx::Size SampleSize(VideoPixelFormat format, size_t plane) {
|
| case PIXEL_FORMAT_YV12A:
|
| case PIXEL_FORMAT_NV12:
|
| case PIXEL_FORMAT_NV21:
|
| + case PIXEL_FORMAT_MT21:
|
| return gfx::Size(2, 2);
|
|
|
| case PIXEL_FORMAT_UNKNOWN:
|
| @@ -133,7 +134,8 @@ static int BytesPerElement(VideoPixelFormat format, size_t plane) {
|
| case PIXEL_FORMAT_YUY2:
|
| return 2;
|
| case PIXEL_FORMAT_NV12:
|
| - case PIXEL_FORMAT_NV21: {
|
| + case PIXEL_FORMAT_NV21:
|
| + case PIXEL_FORMAT_MT21: {
|
| static const int bytes_per_element[] = {1, 2};
|
| DCHECK_LT(plane, arraysize(bytes_per_element));
|
| return bytes_per_element[plane];
|
| @@ -177,7 +179,7 @@ bool VideoFrame::IsValidConfig(VideoPixelFormat format,
|
| return true;
|
|
|
| // Make sure new formats are properly accounted for in the method.
|
| - static_assert(PIXEL_FORMAT_MAX == 14,
|
| + static_assert(PIXEL_FORMAT_MAX == 15,
|
| "Added pixel format, please review IsValidConfig()");
|
|
|
| if (format == PIXEL_FORMAT_UNKNOWN) {
|
| @@ -528,6 +530,7 @@ size_t VideoFrame::NumPlanes(VideoPixelFormat format) {
|
| return 1;
|
| case PIXEL_FORMAT_NV12:
|
| case PIXEL_FORMAT_NV21:
|
| + case PIXEL_FORMAT_MT21:
|
| return 2;
|
| case PIXEL_FORMAT_I420:
|
| case PIXEL_FORMAT_YV12:
|
|
|