| Index: mojo/services/media/common/interfaces/media_types.mojom
|
| diff --git a/mojo/services/media/common/interfaces/media_types.mojom b/mojo/services/media/common/interfaces/media_types.mojom
|
| index 76f2de0d86dbc20edb47163d5af54d8f4d8d1329..0dd33c34423b23c761bc89c8ce8bb623d49b2294 100644
|
| --- a/mojo/services/media/common/interfaces/media_types.mojom
|
| +++ b/mojo/services/media/common/interfaces/media_types.mojom
|
| @@ -74,7 +74,7 @@ enum MediaTypeScheme {
|
|
|
| // Indicates video. See VideoMediaTypeDetails and VideoMediaTypeSetDetails.
|
| // TODO(dalesat): One scheme for video won't be adequate.
|
| - VIDEO
|
| + VIDEO,
|
| };
|
|
|
| // A union of all media type details.
|
| @@ -131,7 +131,7 @@ enum LpcmSampleFormat {
|
| SIGNED_24_IN_32, // Host endian
|
|
|
| // 32-bit floating-point samples, sample size 4 bytes.
|
| - FLOAT
|
| + FLOAT,
|
| };
|
|
|
| // Media type details for the Multiplexed scheme.
|
| @@ -161,7 +161,7 @@ enum AudioEncoding {
|
| // Placeholder indicating any audio encoding.
|
| ANY,
|
|
|
| - VORBIS
|
| + VORBIS,
|
| };
|
|
|
| // Media type details for the COMPRESSED_AUDIO scheme.
|
| @@ -221,7 +221,7 @@ enum VideoEncoding {
|
| ANY,
|
|
|
| THEORA,
|
| - VP8
|
| + VP8,
|
| };
|
|
|
| // Video profiles.
|
| @@ -239,28 +239,28 @@ enum VideoProfile {
|
| H264_SCALABLE_BASELINE,
|
| H264_SCALABLE_HIGH,
|
| H264_STEREO_HIGH,
|
| - H264_MULTIVIEW_HIGH
|
| + H264_MULTIVIEW_HIGH,
|
| };
|
|
|
| // Pixel format.
|
| // TODO(dalesat): Blindly copied from Chromium, revisit.
|
| enum PixelFormat {
|
| UNKNOWN,
|
| - I420, // 12bpp YUV planar 1x1 Y, 2x2 UV samples, a.k.a. YU12.
|
| - YV12, // 12bpp YVU planar 1x1 Y, 2x2 VU samples.
|
| - YV16, // 16bpp YVU planar 1x1 Y, 2x1 VU samples.
|
| - YV12A, // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples.
|
| - YV24, // 24bpp YUV planar, no subsampling.
|
| - NV12, // 12bpp with Y plane followed by a 2x2 interleaved UV plane.
|
| - NV21, // 12bpp with Y plane followed by a 2x2 interleaved VU plane.
|
| - UYVY, // 16bpp interleaved 2x1 U, 1x1 Y, 2x1 V, 1x1 Y samples.
|
| - YUY2, // 16bpp interleaved 1x1 Y, 2x1 U, 1x1 Y, 2x1 V samples.
|
| - ARGB, // 32bpp ARGB, 1 plane.
|
| - XRGB, // 24bpp XRGB, 1 plane.
|
| - RGB24, // 24bpp BGR, 1 plane.
|
| - RGB32, // 32bpp BGRA, 1 plane.
|
| - MJPEG, // MJPEG compressed.
|
| - MT21
|
| + I420, // 12bpp YUV planar 1x1 Y, 2x2 UV samples, a.k.a. YU12.
|
| + YV12, // 12bpp YVU planar 1x1 Y, 2x2 VU samples.
|
| + YV16, // 16bpp YVU planar 1x1 Y, 2x1 VU samples.
|
| + YV12A, // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples.
|
| + YV24, // 24bpp YUV planar, no subsampling.
|
| + NV12, // 12bpp with Y plane followed by a 2x2 interleaved UV plane.
|
| + NV21, // 12bpp with Y plane followed by a 2x2 interleaved VU plane.
|
| + UYVY, // 16bpp interleaved 2x1 U, 1x1 Y, 2x1 V, 1x1 Y samples.
|
| + YUY2, // 16bpp interleaved 1x1 Y, 2x1 U, 1x1 Y, 2x1 V samples.
|
| + ARGB, // 32bpp ARGB, 1 plane.
|
| + XRGB, // 24bpp XRGB, 1 plane.
|
| + RGB24, // 24bpp BGR, 1 plane.
|
| + RGB32, // 32bpp BGRA, 1 plane.
|
| + MJPEG, // MJPEG compressed.
|
| + MT21,
|
| };
|
|
|
| // Pixel format.
|
| @@ -270,5 +270,5 @@ enum ColorSpace {
|
| NOT_APPLICABLE,
|
| JPEG,
|
| HD_REC709,
|
| - SD_REC601
|
| + SD_REC601,
|
| };
|
|
|