X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Ffourcc.c;h=39c0faea6fec8ff0f6cb56e1cc9bd18e2605fe23;hb=0af153b46052c1d056d32259e75600303ed46844;hp=6a27c4318d4d1119aaefea6cfec8a247bc1527bb;hpb=9e6b25916ac210c06c6c78a57fd3f020ed718d6a;p=vlc diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index 6a27c4318d..39c0faea6f 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -374,6 +374,7 @@ static const staticentry_t p_list_video[] = { A("FMJP"), A("SJPG"), A("QIVG"), + A("qIVG"), E("AVRn", "Avid Motion JPEG"), E("AVDJ", "Avid Motion JPEG"), E("ADJV", "Avid Motion JPEG"), @@ -760,11 +761,13 @@ static const staticentry_t p_list_video[] = { 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"), @@ -796,12 +799,8 @@ static const staticentry_t p_list_video[] = { 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"), @@ -813,6 +812,8 @@ static const staticentry_t p_list_video[] = { 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"), @@ -971,6 +972,9 @@ static const staticentry_t p_list_video[] = { 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 "), @@ -1053,6 +1057,30 @@ static const staticentry_t p_list_video[] = { 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[] = { @@ -1446,6 +1474,10 @@ 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[] = { @@ -2036,57 +2068,58 @@ bool vlc_fourcc_IsYUV(vlc_fourcc_t fcc) 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_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 }, FAKE_FMT() } }; @@ -2101,7 +2134,7 @@ const vlc_chroma_description_t *vlc_fourcc_GetChromaDescription( vlc_fourcc_t i_ 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;