/* */
static const staticentry_t p_list_video[] = {
+ B(VLC_CODEC_MP1V, "MPEG-1 Video"),
+ A("mp1v"),
+ A("mpg1"),
+ A("BW10"),
+ E("XMPG", "Xing MPEG-1 Intra"),
+
B(VLC_CODEC_MPGV, "MPEG-1/2 Video"),
+ B(VLC_CODEC_MP2V, "MPEG-2 Video"),
A("mpgv"),
- A("mp1v"),
A("mpeg"),
- A("mpg1"),
A("mp2v"),
A("MPEG"),
A("mpg2"),
A("EPHV"),
A("DM4V"),
A("SM4V"),
+ A("DYM4"),
/* XVID flavours */
E("xvid", "Xvid MPEG-4 Video"),
E("XVID", "Xvid MPEG-4 Video"),
A("h265"),
A("H265"),
A("x265"),
+ A("hev1"),
/* h264 */
B(VLC_CODEC_H264, "H264 - MPEG-4 AVC (part 10)"),
E("DAVC", "Dicas MPEGable H.264/MPEG-4 AVC"),
E("davc", "Dicas MPEGable H.264/MPEG-4 AVC"),
E("x3eV", "DreX H.264"),
+ E("GAVC", "GeoVision MPEG-4 AVC"),
+ E("Q264", "QNAP H.264/MPEG-4 AVC"),
+ A("UMSV"),
+ A("SMV2"),
/* H263 and H263i */
/* H263(+) is also known as Real Video 1.0 */
B(VLC_CODEC_FLIC, "Flic Video"),
A("FLIC"),
+ A("AFLC"),
/* MJPEG */
B(VLC_CODEC_MJPG, "Motion JPEG Video"),
A("FMJP"),
A("SJPG"),
A("QIVG"),
+ A("qIVG"),
E("AVRn", "Avid Motion JPEG"),
E("AVDJ", "Avid Motion JPEG"),
E("ADJV", "Avid Motion JPEG"),
A("PDVC"),
A("IPDV"),
A("ipdv"),
+ A("pdvc"),
+ A("SL25"),
E("dvcp", "DV Video PAL"),
E("dvc ", "DV Video NTSC" ),
E("dvp ", "DV Video Pro"),
B(VLC_CODEC_WMV2, "Windows Media Video 8"),
A("WMV2"),
A("wmv2"),
+ A("GXVE"),
B(VLC_CODEC_WMV3, "Windows Media Video 9"),
A("WMV3"),
B(VLC_CODEC_VP6A, "On2's VP6 A Video"),
A("VP6A"),
+ B(VLC_CODEC_VP7, "Google/On2's VP7 Video"),
+ A("VP70"),
+ A("VP71"),
+
B(VLC_CODEC_VP8, "Google/On2's VP8 Video"),
A("VP80"),
B(VLC_CODEC_WNV1, "Winnov WNV1 Video"),
A("WNV1"),
+ A("YUV8"),
B(VLC_CODEC_AASC, "Autodesc RLE Video"),
A("AASC"),
+ E("AAS4", "Autodesc RLE Video 24bit"),
B(VLC_CODEC_INDEO2, "Indeo Video v2"),
A("IV20"),
A("I410"),
B(VLC_CODEC_I411, "Planar 4:1:1 YUV"),
A("I411"),
+ A("Y41B"),
B(VLC_CODEC_I420, "Planar 4:2:0 YUV"),
A("I420"),
A("IYUV"),
B(VLC_CODEC_I422, "Planar 4:2:2 YUV"),
A("I422"),
+ A("Y42B"),
B(VLC_CODEC_I440, "Planar 4:4:0 YUV"),
A("I440"),
B(VLC_CODEC_I444, "Planar 4:4:4 YUV"),
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"),
B(VLC_CODEC_RGBA, "32 bits ARGB"),
A("ARGB"),
A("AV32"),
+ B(VLC_CODEC_BGRA, "32 bits BGRA"),
+ A("BGRA"),
B(VLC_CODEC_GREY, "8 bits greyscale"),
A("GREY"),
B(VLC_CODEC_I444_10B, "Planar 4:4:4 YUV 10-bit BE"),
A("I4AB"),
+ B(VLC_CODEC_I444_16L, "Planar 4:4:4 YUV 16-bit LE"),
+ A("I4FL"),
+ B(VLC_CODEC_I444_16B, "Planar 4:4:4 YUV 16-bit BE"),
+ A("I4FB"),
+
+
/* XYZ color space */
B(VLC_CODEC_XYZ12, "Packed XYZ 12-bit BE"),
A("XY12"),
B(VLC_CODEC_SGI, "SGI Image"),
A("sgi "),
+ B(VLC_CODEC_SVG, "SVG Scalable Vector Graphics Image"),
+ A("svg "),
+
B(VLC_CODEC_PNM, "Portable Anymap Image"),
A("pnm "),
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(0, "")
};
static const staticentry_t p_list_audio[] = {
B(VLC_CODEC_INDEO_AUDIO, "Indeo Audio Coder"),
A("ms\x04\x02"),
+ B(VLC_CODEC_TAK, "TAK (Tom's lossless Audio Kompressor)"),
+
+ B(VLC_CODEC_SMACKAUDIO, "Smacker audio"),
+
B(0, "")
};
static const staticentry_t p_list_spu[] = {
VLC_CODEC_NV24, VLC_CODEC_NV42
#define VLC_CODEC_YUV_PLANAR_444_16 \
- VLC_CODEC_I444_10L, VLC_CODEC_I444_10B, VLC_CODEC_I444_9L, VLC_CODEC_I444_9B
+ VLC_CODEC_I444_10L, VLC_CODEC_I444_10B, VLC_CODEC_I444_9L, VLC_CODEC_I444_9B, \
+ VLC_CODEC_I444_16L, VLC_CODEC_I444_16B
#define VLC_CODEC_YUV_PACKED \
VLC_CODEC_YUYV, VLC_CODEC_YVYU, \
static const vlc_fourcc_t p_I444_10B_fallback[] = {
VLC_CODEC_I444_10B, VLC_CODEC_I444_10L, VLC_CODEC_FALLBACK_444_16, 0
};
+static const vlc_fourcc_t p_I444_16L_fallback[] = {
+ VLC_CODEC_I444_16L, VLC_CODEC_I444_16B, VLC_CODEC_FALLBACK_444_16, 0
+};
+static const vlc_fourcc_t p_I444_16B_fallback[] = {
+ VLC_CODEC_I444_16B, VLC_CODEC_I444_16L, VLC_CODEC_FALLBACK_444_16, 0
+};
+
static const vlc_fourcc_t p_I440_fallback[] = {
VLC_CODEC_I440,
p_I444_9B_fallback,
p_I444_10L_fallback,
p_I444_10B_fallback,
+ p_I444_16L_fallback,
+ p_I444_16B_fallback,
p_I440_fallback,
p_YUYV_fallback,
p_YVYU_fallback,
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_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 }, PLANAR_16(3, 1, 1, 16) },
- { { 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, 0 }, PACKED_FMT(4, 32) },
+ { { VLC_CODEC_RGBA, VLC_CODEC_ARGB,
+ 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, 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}, { 0, { 0 }, 0, 0 } }
+ { { 0 }, FAKE_FMT() }
};
#undef PACKED_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