| Index: media/base/video_frame.h
|
| diff --git a/media/base/video_frame.h b/media/base/video_frame.h
|
| index 15ee62bb3535a4721aeca1cdfb3ddb859abcfc06..772685180fba8188ff85433a41c6dcb2d0591533 100644
|
| --- a/media/base/video_frame.h
|
| +++ b/media/base/video_frame.h
|
| @@ -52,18 +52,19 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
|
| // Logged to UMA, so never reuse values.
|
| enum Format {
|
| UNKNOWN = 0, // Unknown format value.
|
| - YV12 = 1, // 12bpp YVU planar 1x1 Y, 2x2 VU samples
|
| - YV16 = 2, // 16bpp YVU planar 1x1 Y, 2x1 VU samples
|
| - I420 = 3, // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
|
| - YV12A = 4, // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples.
|
| + YV12 = 1, // 12bpp YVU planar 1x1 Y, 2x2 VU samples
|
| + YV16 = 2, // 16bpp YVU planar 1x1 Y, 2x1 VU samples
|
| + I420 = 3, // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
|
| + YV12A = 4, // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples.
|
| #if defined(VIDEO_HOLE)
|
| - HOLE = 5, // Hole frame.
|
| + HOLE = 5, // Hole frame.
|
| #endif // defined(VIDEO_HOLE)
|
| NATIVE_TEXTURE = 6, // Native texture. Pixel-format agnostic.
|
| - YV12J = 7, // JPEG color range version of YV12
|
| - NV12 = 8, // 12bpp 1x1 Y plane followed by an interleaved 2x2 UV plane.
|
| - YV24 = 9, // 24bpp YUV planar, no subsampling.
|
| - FORMAT_MAX = YV24, // Must always be equal to largest entry logged.
|
| + YV12J = 7, // JPEG color range version of YV12
|
| + NV12 = 8, // 12bpp 1x1 Y plane followed by an interleaved 2x2 UV plane.
|
| + YV24 = 9, // 24bpp YUV planar, no subsampling.
|
| + YV12HD = 10, // Rec709 "HD" color space version of YV12
|
| + FORMAT_MAX = YV12HD, // Must always be equal to largest entry logged.
|
| };
|
|
|
| // Returns the name of a Format as a string.
|
|
|