E("DP02", "DynaPel MPEG-4 codec"),
E("PLV1", "Pelco DVR MPEG-4"),
E("QMP4", "QNAP Systems MPEG-4"),
+ E("qMP4", "QNAP Systems MPEG-4"),
/* 3ivx delta 3.5 Unsupported
* putting it here gives extreme distorted images */
//E("3IV1", "3ivx delta 3.5 MPEG-4 Video"),
/* avc1: special case h264 */
A("avc1"),
A("AVC1"),
+ A("avc3"),
E("ai5p", "AVC-Intra 50M 720p24/30/60"),
E("ai5q", "AVC-Intra 50M 720p25/50"),
E("ai52", "AVC-Intra 50M 1080p25/50"),
A("I40A"),
B(VLC_CODEC_YUV422A, "Planar YUV 4:2:2 Y:U:V:A"),
A("I42A"),
+ B(VLC_CODEC_YUVA_444_10L, "Planar YUV 4:4:4 Y:U:V:A 10bits"),
+ A("YUVA"),
B(VLC_CODEC_RGBP, "Palettized RGB with palette element R:G:B"),
A("RGBP"),
A("RGB2"),
B(VLC_CODEC_RGB12, "12 bits RGB"),
A("RV12"),
- B(VLC_CODEC_RGBA16, "16 bits RGBA"),
- A("AV16"),
B(VLC_CODEC_RGB15, "15 bits RGB"),
A("RV15"),
- B(VLC_CODEC_RGBT, "16 bits RGBT"),
- A("RGBT"),
B(VLC_CODEC_RGB16, "16 bits RGB"),
A("RV16"),
B(VLC_CODEC_RGB24, "24 bits RGB"),
A("ULRG"),
A("ULY0"),
A("ULY2"),
+ A("ULH0"),
+ A("ULH2"),
B(VLC_CODEC_VBLE, "VBLE Lossless"),
A("VBLE"),
B(VLC_CODEC_AURA, "Auravision Aura"),
A("AURA"),
+ B(VLC_CODEC_TMV, "8088flex TMV"),
+
+ B(VLC_CODEC_XAN_WC3, "Wing Commander III video"),
+
+ B(VLC_CODEC_WS_VQA, "Westwood Studios VQA"),
+
+ B(VLC_CODEC_MMVIDEO, "American Laser Games MM Video"),
+
+ B(VLC_CODEC_AVS, "Creature Shock AVS"),
+
+ B(VLC_CODEC_DSICINVIDEO, "Delphine CIN video"),
+
+ B(VLC_CODEC_TIERTEXSEQVIDEO, "Tiertex Limited SEQ video"),
+
+ B(VLC_CODEC_DXA, "Feeble Files/ScummVM DXA"),
+
+ B(VLC_CODEC_C93, "Interplay C93"),
+
+ B(VLC_CODEC_BETHSOFTVID, "Bethesda VID"),
+
+ B(VLC_CODEC_VB, "Beam Software VB"),
+
+ B(VLC_CODEC_RL2, "RL2 video"),
+
+ B(VLC_CODEC_BFI, "Brute Force & Ignorance (BFI) video"),
+
+ B(VLC_CODEC_CMV, "Electronic Arts CMV"),
+
+ B(VLC_CODEC_MOTIONPIXELS, "Sirius Publishing Motion Pixels"),
+
+ B(VLC_CODEC_TGV, "Electronic Arts TGV"),
+
+ B(VLC_CODEC_TGQ, "Electronic Arts TGQ"),
+
+ B(VLC_CODEC_TQI, "Electronic Arts TQI"),
+
+ B(VLC_CODEC_MAD, "Electronic Arts MAD"),
+
+ B(VLC_CODEC_ANM, "DeluxePaint animation"),
+
+ B(VLC_CODEC_YOP, "Psygnosis YOP"),
+
+ B(VLC_CODEC_JV, "Bitmap Brothers JV"),
+
+ B(VLC_CODEC_DFA, "Chronomaster DFA"),
+
+ B(VLC_CODEC_HNM4_VIDEO, "Cryo Interactive Entertainment HNM4"),
+
B(0, "")
};
static const staticentry_t p_list_audio[] = {
B(VLC_CODEC_S16L, "PCM S16 LE"),
A("s16l"),
+ B(VLC_CODEC_S16L_PLANAR, "PCM S16 LE planar"),
+
B(VLC_CODEC_S16B, "PCM S16 BE"),
A("s16b"),
B(VLC_CODEC_SMACKAUDIO, "Smacker audio"),
+ B(VLC_CODEC_ADPCM_IMA_EA_SEAD, "ADPCM IMA Electronic Arts SEAD"),
+
+ B(VLC_CODEC_ADPCM_EA_R1, "ADPCM Electronic Arts R1"),
+
+ B(VLC_CODEC_ADPCM_IMA_APC, "ADPCM APC"),
+
B(0, "")
};
static const staticentry_t p_list_spu[] = {
B(VLC_CODEC_CVD, "CVD subtitles"),
A("cvd "),
+ B(VLC_CODEC_ARIB_A, "ARIB subtitles (A-profile)"),
+ A("arba"),
+
+ B(VLC_CODEC_ARIB_C, "ARIB subtitles (C-profile)"),
+ A("arbc"),
+
B(VLC_CODEC_BD_PG, "BD subtitles"),
A("bdpg"),
B(VLC_CODEC_SCTE_27, "SCTE-27 subtitles"),
A("SC27"),
+ B(VLC_CODEC_EIA608_1, "EIA-608 subtitles"),
+ A("cc1 "),
+ A("cc2 "),
+ A("cc3 "),
+ A("cc4 "),
+
B(0, "")
};
static const struct
{
- vlc_fourcc_t p_fourcc[6];
+ vlc_fourcc_t p_fourcc[4];
vlc_chroma_description_t description;
} p_list_chroma_description[] = {
- { { 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_NV16, VLC_CODEC_NV61, 0 }, PLANAR_8(2, 1, 1) },
- { { VLC_CODEC_YUV_PLANAR_440, 0 }, PLANAR_8(3, 1, 2) },
- { { VLC_CODEC_YUV_PLANAR_444, 0 }, PLANAR_8(3, 1, 1) },
- { { VLC_CODEC_YUVA, 0 }, PLANAR_8(4, 1, 1) },
- { { VLC_CODEC_YUV420A, 0 }, PLANAR_8(4, 2, 2) },
- { { VLC_CODEC_YUV422A, 0 }, PLANAR_8(4, 2, 1) },
-
- { { VLC_CODEC_GBR_PLANAR, 0 }, PLANAR_8(3, 1, 1) },
+ { { VLC_CODEC_I411 }, PLANAR_8(3, 4, 1) },
+ { { VLC_CODEC_YUV_PLANAR_410 }, PLANAR_8(3, 4, 4) },
+ { { VLC_CODEC_YUV_PLANAR_420 }, PLANAR_8(3, 2, 2) },
+ { { VLC_CODEC_NV12, VLC_CODEC_NV21 }, PLANAR_8(2, 1, 2) },
+ { { VLC_CODEC_YUV_PLANAR_422 }, PLANAR_8(3, 2, 1) },
+ { { VLC_CODEC_NV16, VLC_CODEC_NV61 }, PLANAR_8(2, 1, 1) },
+ { { VLC_CODEC_YUV_PLANAR_440 }, PLANAR_8(3, 1, 2) },
+ { { VLC_CODEC_YUV_PLANAR_444 }, PLANAR_8(3, 1, 1) },
+ { { VLC_CODEC_YUVA }, PLANAR_8(4, 1, 1) },
+ { { VLC_CODEC_YUV420A }, PLANAR_8(4, 2, 2) },
+ { { VLC_CODEC_YUV422A }, PLANAR_8(4, 2, 1) },
+
+ { { VLC_CODEC_GBR_PLANAR }, PLANAR_8(3, 1, 1) },
{ { VLC_CODEC_I420_10L,
- VLC_CODEC_I420_10B, 0 }, PLANAR_16(3, 2, 2, 10) },
+ VLC_CODEC_I420_10B }, PLANAR_16(3, 2, 2, 10) },
{ { VLC_CODEC_I420_9L,
- VLC_CODEC_I420_9B, 0 }, PLANAR_16(3, 2, 2, 9) },
+ VLC_CODEC_I420_9B }, PLANAR_16(3, 2, 2, 9) },
{ { VLC_CODEC_I422_10L,
- VLC_CODEC_I422_10B, 0 }, PLANAR_16(3, 2, 1, 10) },
+ VLC_CODEC_I422_10B }, PLANAR_16(3, 2, 1, 10) },
{ { VLC_CODEC_I422_9L,
- VLC_CODEC_I422_9B, 0 }, PLANAR_16(3, 2, 1, 9) },
+ VLC_CODEC_I422_9B }, PLANAR_16(3, 2, 1, 9) },
{ { VLC_CODEC_I444_10L,
- VLC_CODEC_I444_10B, 0 }, PLANAR_16(3, 1, 1, 10) },
+ VLC_CODEC_I444_10B }, PLANAR_16(3, 1, 1, 10) },
{ { VLC_CODEC_I444_9L,
- VLC_CODEC_I444_9B, 0 }, PLANAR_16(3, 1, 1, 9) },
+ VLC_CODEC_I444_9B }, PLANAR_16(3, 1, 1, 9) },
{ { VLC_CODEC_I444_16L,
- VLC_CODEC_I444_16B, 0 }, PLANAR_16(3, 1, 1, 16) },
+ VLC_CODEC_I444_16B }, PLANAR_16(3, 1, 1, 16) },
+ { { VLC_CODEC_YUVA_444_10L,
+ VLC_CODEC_YUVA_444_10B }, PLANAR_16(4, 1, 1, 10) },
- { { VLC_CODEC_YUV_PACKED, 0 }, PACKED_FMT(2, 16) },
+ { { VLC_CODEC_YUV_PACKED }, PACKED_FMT(2, 16) },
{ { VLC_CODEC_RGB8, VLC_CODEC_GREY,
- VLC_CODEC_YUVP, VLC_CODEC_RGBP, 0 }, PACKED_FMT(1, 8) },
+ VLC_CODEC_YUVP, VLC_CODEC_RGBP }, PACKED_FMT(1, 8) },
{ { VLC_CODEC_RGB15, 0 }, PACKED_FMT(2, 15) },
{ { VLC_CODEC_RGB12, 0 }, PACKED_FMT(2, 12) },
- { { VLC_CODEC_RGB16, VLC_CODEC_RGBT,
- VLC_CODEC_RGBA16, 0 }, PACKED_FMT(2, 16) },
+ { { VLC_CODEC_RGB16, 0 }, PACKED_FMT(2, 16) },
{ { VLC_CODEC_RGB24, 0 }, PACKED_FMT(3, 24) },
{ { VLC_CODEC_RGB32, 0 }, PACKED_FMT(4, 24) },
{ { VLC_CODEC_RGBA, VLC_CODEC_ARGB,
- VLC_CODEC_BGRA, 0 }, PACKED_FMT(4, 32) },
+ VLC_CODEC_BGRA, }, PACKED_FMT(4, 32) },
{ { VLC_CODEC_Y211, 0 }, { 1, { {{1,4}, {1,1}} }, 4, 32 } },
{ { VLC_CODEC_XYZ12, 0 }, PACKED_FMT(6, 48) },
{ { VLC_CODEC_VDPAU_VIDEO_420, VLC_CODEC_VDPAU_VIDEO_422,
- VLC_CODEC_VDPAU_VIDEO_444,
- VLC_CODEC_VDPAU_OUTPUT,
- VLC_CODEC_ANDROID_OPAQUE,
- VLC_CODEC_MMAL_OPAQUE, 0 }, FAKE_FMT() },
+ VLC_CODEC_VDPAU_VIDEO_444, VLC_CODEC_VDPAU_OUTPUT },
+ FAKE_FMT() },
+ { { VLC_CODEC_ANDROID_OPAQUE, VLC_CODEC_MMAL_OPAQUE, },
+ FAKE_FMT() },
{ { 0 }, FAKE_FMT() }
};
for( unsigned i = 0; p_list_chroma_description[i].p_fourcc[0]; i++ )
{
const vlc_fourcc_t *p_fourcc = p_list_chroma_description[i].p_fourcc;
- for( unsigned j = 0; p_fourcc[j]; j++ )
+ for( unsigned j = 0; j < 4 && p_fourcc[j] != 0; j++ )
{
if( p_fourcc[j] == i_fourcc )
return &p_list_chroma_description[i].description;
projects / vlc / blobdiff