/*****************************************************************************
* fourcc.c: fourcc helpers functions
*****************************************************************************
- * Copyright (C) 2009 Laurent Aimar
- * $Id$
+ * Copyright © 2009-2011 Laurent Aimar
*
* Authors: Laurent Aimar <fenrir@videolan.org>
+ * Jean-Baptiste Kempf <jb@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
E("hdv6", "HDV 1080p24 (MPEG-2 Video)"),
E("hdv7", "HDV 1080p25 (MPEG-2 Video)"),
E("hdv8", "HDV 1080p30 (MPEG-2 Video)"),
- E("hdv9", "JVC HDV (MPEG-2 Video)"),
-
- E("mx5n", "MPEG2 IMX NTSC 525/60 50mb/s (FCP)"),
- E("mx5p", "MPEG2 IMX PAL 625/60 50mb/s (FCP)"),
- E("mx4n", "MPEG2 IMX NTSC 525/60 40mb/s (FCP)"),
- E("mx4p", "MPEG2 IMX PAL 625/50 40mb/s (FCP)"),
- E("mx3n", "MPEG2 IMX NTSC 525/60 30mb/s (FCP)"),
- E("mx3p", "MPEG2 IMX NTSC 625/50 30mb/s (FCP)"),
-
- E("xdv1", "XDCAM HD"),
- E("xdv2", "XDCAM HD 1080i60 35mb/s"),
- E("xdv3", "XDCAM HD 1080i50 35mb/s"),
- E("xdv4", "XDCAM HD"),
- E("xdv5", "XDCAM HD"),
- E("xdv6", "XDCAM HD 1080p24 35mb/s"),
- E("xdv7", "XDCAM HD 1080p25 35mb/s"),
- E("xdv8", "XDCAM HD 1080p30 35mb/s"),
- E("xdv9", "XDCAM HD"),
-
- E("xdva", "XDCAM"),
- E("xdvb", "XDCAM"),
- E("xdvc", "XDCAM"),
- E("xdvd", "XDCAM"),
- E("xdve", "XDCAM"),
- E("xdvf", "XDCAM"),
-
- E("xd54", "XDCAM HD422 720p24 CBR"),
- E("xd55", "XDCAM HD422 720p25 CBR"),
- E("xd59", "XDCAM HD422 720p60 CBR"),
- E("xd5a", "XDCAM HD422 720p50 CBR"),
- E("xd5b", "XDCAM HD422 1080i60 CBR"),
- E("xd5c", "XDCAM"),
- E("xd5d", "XDCAM"),
- E("xd5e", "XDCAM"),
- E("xd5f", "XDCAM"),
- E("xd59", "XDCAM"),
+ E("hdv9", "HDV 720p60 JVC (MPEG-2 Video)"),
+ E("hdva", "HDV 720p50 (MPEG-2 Video)"),
+
+ E("mx5n", "MPEG2 IMX NTSC 525/60 50Mb/s (FCP)"),
+ E("mx5p", "MPEG2 IMX PAL 625/60 50Mb/s (FCP)"),
+ E("mx4n", "MPEG2 IMX NTSC 525/60 40Mb/s (FCP)"),
+ E("mx4p", "MPEG2 IMX PAL 625/50 40Mb/s (FCP)"),
+ E("mx3n", "MPEG2 IMX NTSC 525/60 30Mb/s (FCP)"),
+ E("mx3p", "MPEG2 IMX NTSC 625/50 30Mb/s (FCP)"),
+
+ E("xdv1", "XDCAM HD 720p30 35Mb/s"),
+ E("xdv2", "XDCAM HD 1080i60 35Mb/s"),
+ E("xdv3", "XDCAM HD 1080i50 35Mb/s"),
+ E("xdv4", "XDCAM HD 720p24 35Mb/s"),
+ E("xdv5", "XDCAM HD 720p25 35Mb/s"),
+ E("xdv6", "XDCAM HD 1080p24 35Mb/s"),
+ E("xdv7", "XDCAM HD 1080p25 35Mb/s"),
+ E("xdv8", "XDCAM HD 1080p30 35Mb/s"),
+ E("xdv9", "XDCAM HD 720p60 35Mb/s"),
+ E("xdva", "XDCAM HD 720p50 35Mb/s"),
+
+ E("xdvb", "XDCAM EX 1080i60 50Mb/s CBR"),
+ E("xdvc", "XDCAM EX 1080i50 50Mb/s CBR"),
+ E("xdvd", "XDCAM EX 1080p24 50Mb/s CBR"),
+ E("xdve", "XDCAM EX 1080p25 50Mb/s CBR"),
+ E("xdvf", "XDCAM EX 1080p30 50Mb/s CBR"),
+
+ E("xd54", "XDCAM HD422 720p24 50Mb/s CBR"),
+ E("xd55", "XDCAM HD422 720p25 50Mb/s CBR"),
+ E("xd59", "XDCAM HD422 720p60 50Mb/s CBR"),
+ E("xd5a", "XDCAM HD422 720p50 50Mb/s CBR"),
+ E("xd5b", "XDCAM HD422 1080i60 50Mb/s CBR"),
+ E("xd5c", "XDCAM HD422 1080i50 50Mb/s CBR"),
+ E("xd5d", "XDCAM HD422 1080p24 50Mb/s CBR"),
+ E("xd5e", "XDCAM HD422 1080p25 50Mb/s CBR"),
+ E("xd5f", "XDCAM HD422 1080p30 50Mb/s CBR"),
+
+ E("xdhd", "XDCAM HD 540p"),
+ E("xdh2", "XDCAM HD422 540p"),
E("AVmp", "AVID IMX PAL"),
E("MMES", "Matrox MPEG-2"),
E("dx50", "DivX MPEG-4 Video"),
E("BLZ0", "Blizzard MPEG-4 Video"),
E("DXGM", "Electronic Arts Game MPEG-4 Video"),
+ E("DreX", "DreX Mpeg-4"),
/* 3ivx delta 4 */
E("3IV2", "3ivx MPEG-4 Video"),
E("3iv2", "3ivx MPEG-4 Video"),
/* avc1: special case h264 */
A("avc1"),
A("AVC1"),
+ E("ai5p", "AVC-Intra 50M 720p24/30/60"),
+ E("ai5q", "AVC-Intra 50M 720p25/50"),
+ E("ai52", "AVC-Intra 50M 1080p25/50"),
+ E("ai53", "AVC-Intra 50M 1080p24/30/60"),
+ E("ai55", "AVC-Intra 50M 1080i50"),
+ E("ai56", "AVC-Intra 50M 1080i60"),
+ E("ai1p", "AVC-Intra 100M 720p24/30/60"),
+ E("ai1q", "AVC-Intra 100M 720p25/50"),
+ E("ai12", "AVC-Intra 100M 1080p25/50"),
+ E("ai13", "AVC-Intra 100M 1080p24/30/60"),
+ E("ai15", "AVC-Intra 100M 1080i50"),
+ E("ai16", "AVC-Intra 100M 1080i60"),
E("VSSH", "Vanguard VSS H264"),
E("VSSW", "Vanguard VSS H264"),
E("vssh", "Vanguard VSS H264"),
E("DAVC", "Dicas MPEGable H.264/MPEG-4 AVC"),
E("davc", "Dicas MPEGable H.264/MPEG-4 AVC"),
+ E("x3eV", "DreX H.264"),
/* H263 and H263i */
/* H263(+) is also known as Real Video 1.0 */
B(VLC_CODEC_WMVA, "Windows Media Video Advanced Profile"),
A("WMVA"),
A("wmva"),
- A("WVP2"),
- A("wvp2"),
B(VLC_CODEC_VC1, "Windows Media Video VC1"),
A("WVC1"),
A("WMVP"),
A("wmvp"),
+ B(VLC_CODEC_WMVP2, "Windows Media Video Presentation, v2"),
+ A("WVP2"),
+ A("wvp2"),
+
/* Microsoft Video 1 */
B(VLC_CODEC_MSVIDEO1, "Microsoft Video 1"),
A("MSVC"),
A("IV50"),
A("iv50"),
+ B(VLC_CODEC_PRORES, "Apple ProRes 422"),
+ E("apch", "Apple ProRes 422 HQ"),
+ E("apcs", "Apple ProRes 422 LT"),
+ E("apco", "Apple ProRes 422 Proxy"),
+ E("ap4c", "Apple ProRes 4444"),
/* */
B(VLC_CODEC_YV12, "Planar 4:2:0 YVU"),
B(VLC_CODEC_V210, "10-bit 4:2:2 Component YCbCr"),
A("v210"),
- B(VLC_CODEC_NV12, "Planar Y, Packet UV (420)"),
+ B(VLC_CODEC_NV12, "Biplanar 4:2:0 Y/UV"),
A("NV12"),
+ B(VLC_CODEC_NV21, "Biplanar 4:2:0 Y/VU"),
+ A("NV21"),
+ B(VLC_CODEC_NV16, "Biplanar 4:2:2 Y/UV"),
+ A("NV16"),
+ B(VLC_CODEC_NV61, "Biplanar 4:2:2 Y/VU"),
+ A("NV61"),
B(VLC_CODEC_I420_9L, "Planar 4:2:0 YUV 9-bit LE"),
A("I09L"),
B(VLC_CODEC_NELLYMOSER, "NellyMoser ASAO"),
A("NELL"),
+ A("nmos"),
B(VLC_CODEC_APE, "Monkey's Audio"),
A("APE "),
{ { VLC_CODEC_I411, 0 }, PLANAR_8(3, 4, 1) },
{ { VLC_CODEC_YUV_PLANAR_410, 0 }, PLANAR_8(3, 4, 4) },
{ { VLC_CODEC_YUV_PLANAR_420, 0 }, PLANAR_8(3, 2, 2) },
+ { { VLC_CODEC_NV12, VLC_CODEC_NV21, 0 }, PLANAR_8(2, 1, 2) },
{ { VLC_CODEC_YUV_PLANAR_422, 0 }, PLANAR_8(3, 2, 1) },
{ { VLC_CODEC_YUV_PLANAR_440, 0 }, PLANAR_8(3, 1, 2) },
{ { VLC_CODEC_YUV_PLANAR_444, 0 }, PLANAR_8(3, 1, 1) },