A("mp2v"),
A("MPEG"),
A("mpg2"),
+ A("MPG2"),
E("PIM1", "Pinnacle DC1000 (MPEG-1 Video)"),
A("PM4V"),
A("M4T3"),
A("GEOX"),
+ A("GEOV"),
A("DMK2"),
A("WV1F"),
A("DIGI"),
A("WMV3"),
A("wmv3"),
- B(VLC_CODEC_WMVA, "Windows Media Video Advanced"),
+ /* WMVA is the VC-1 codec before the standardization proces,
+ * it is not bitstream compatible and deprecated */
+ B(VLC_CODEC_WMVA, "Windows Media Video Advanced Profile"),
A("WMVA"),
A("wmva"),
A("WVP2"),
A("wvc1"),
A("vc-1"),
A("VC-1"),
- /* WMVA is the VC-1 codec before the standardization proces,
- * it is not bitstream compatible and deprecated */
- E("WMVA", "Windows Media Video Advanced Profile"),
/* Microsoft Video 1 */
B(VLC_CODEC_MSVIDEO1, "Microsoft Video 1"),
B(VLC_CODEC_VP6F, "On2's VP6.2 Video (Flash)"),
A("VP6F"),
+ A("FLV4"),
B(VLC_CODEC_VP6A, "On2's VP6 A Video"),
A("VP6A"),
+ B(VLC_CODEC_VP8, "Google/On2's VP8 Video"),
+ A("VP80"),
+
+
/* Xiph.org theora */
B(VLC_CODEC_THEORA, "Xiph.org's Theora Video"),
A("theo"),
A("AVs2"),
A("avs2"),
+ B(VLC_CODEC_AMV, "AMV"),
+
/* */
B(VLC_CODEC_DNXHD, "DNxHD"),
A("AVdn"),
B(VLC_CODEC_CDG, "CD-G Video"),
A("CDG "),
+ B(VLC_CODEC_FRWU, "Forward Uncompressed" ),
+ A("FRWU"),
+
+ B(VLC_CODEC_INDEO5, "Indeo Video v5"),
+ A("IV50"),
+ A("iv50"),
+
+
/* */
B(VLC_CODEC_YV12, "Planar 4:2:0 YVU"),
A("YV12"),
A("yv12"),
- B(VLC_CODEC_I420, "Planar 4:1:0 YUV"),
- A("I410"),
+ B(VLC_CODEC_YV9, "Planar 4:1:0 YVU"),
A("YVU9"),
- B(VLC_CODEC_I420, "Planar 4:1:1 YUV"),
+ B(VLC_CODEC_I410, "Planar 4:1:0 YUV"),
+ A("I410"),
+ B(VLC_CODEC_I411, "Planar 4:1:1 YUV"),
A("I411"),
B(VLC_CODEC_I420, "Planar 4:2:0 YUV"),
A("I420"),
B(VLC_CODEC_I444, "Planar 4:4:4 YUV"),
A("I444"),
- B(VLC_CODEC_I420, "Planar 4:1:0 YUV full scale"),
- A("J410"),
- B(VLC_CODEC_I420, "Planar 4:1:1 YUV full scale"),
- A("J411"),
- B(VLC_CODEC_I420, "Planar 4:2:0 YUV full scale"),
+ B(VLC_CODEC_J420, "Planar 4:2:0 YUV full scale"),
A("J420"),
- B(VLC_CODEC_I422, "Planar 4:2:2 YUV full scale"),
+ B(VLC_CODEC_J422, "Planar 4:2:2 YUV full scale"),
A("J422"),
- B(VLC_CODEC_I444, "Planar 4:4:0 YUV full scale"),
+ B(VLC_CODEC_J440, "Planar 4:4:0 YUV full scale"),
A("J440"),
- B(VLC_CODEC_I444, "Planar 4:4:4 YUV full scale"),
+ B(VLC_CODEC_J444, "Planar 4:4:4 YUV full scale"),
A("J444"),
B(VLC_CODEC_YUVP, "Palettized YUV with palette element Y:U:V:A"),
B(VLC_CODEC_UYVY, "Packed YUV 4:2:2, U:Y:V:Y"),
A("UYVY"),
A("UYNV"),
+ A("UYNY"),
A("Y422"),
+ A("HDYC"),
+ A("AVUI"),
+ A("uyv1"),
A("2vuy"),
A("2Vuy"),
- A("AVUI"),
+ A("2Vu1"),
B(VLC_CODEC_VYUY, "Packed YUV 4:2:2, V:Y:U:Y"),
A("VYUY"),
B(VLC_CODEC_YUYV, "Packed YUV 4:2:2, Y:U:Y:V"),
A("YUY2"),
A("YUYV"),
A("YUNV"),
+ A("V422"),
B(VLC_CODEC_YVYU, "Packed YUV 4:2:2, Y:V:Y:U"),
A("YVYU"),
B(VLC_CODEC_Y211, "Packed YUV 2:1:1, Y:U:Y:V "),
A("Y211"),
- B(VLC_CODEC_YMGA, "Planar Y, packed UV, from Matrox"),
- A("YMGA"),
B(VLC_CODEC_CYUV, "Creative Packed YUV 4:2:2, U:Y:V:Y, reverted"),
A("cyuv"),
A("CYUV"),
B(VLC_CODEC_V210, "10-bit 4:2:2 Component YCbCr"),
A("v210"),
+ B(VLC_CODEC_NV12, "Planar Y, Packet UV (420)"),
+ A("NV12"),
+
/* Videogames Codecs */
/* Interplay MVE */
B(VLC_CODEC_PCX, "Personal Computer Exchange Image"),
A("pcx "),
+ B(VLC_CODEC_JPEG2000, "JPEG 2000 Image"),
+ A("JP2K"),
+ A("mjp2"),
+ A("MJP2"),
+ A("MJ2C"),
+
B(0, "")
};
static const entry_t p_list_audio[] = {
A("wmal"),
/* Windows Media Audio Speech */
- B(VLC_CODEC_WMAS, "Windows Media Audio Speech"),
+ B(VLC_CODEC_WMAS, "Windows Media Audio Voice (Speech)"),
A("WMAS"),
A("wmas"),
B(VLC_CODEC_RA_288, "RealAudio 2.0"),
A("28_8"),
+ B(VLC_CODEC_SIPR, "RealAudio Sipr"),
+ A("sipr"),
+
/* MPEG Audio layer 1/2/3 */
B(VLC_CODEC_MPGA, "MPEG Audio layer 1/2/3"),
A("mpga"),
A("mp4a"),
A("aac "),
+ /* ALS audio */
+ B(VLC_CODEC_ALS, "MPEG-4 Audio Lossless (ALS)"),
+ A("als "),
+
/* 4X Technologies */
B(VLC_CODEC_ADPCM_4XM, "4X Technologies Audio"),
A("4xma"),
B(VLC_CODEC_ADPCM_IMA_WS, "Westwood IMA ADPCM audio"),
A("AIWS"),
+ /* MS ADPCM */
+ B(VLC_CODEC_ADPCM_MS, "MS ADPCM audio"),
+ A("ms\x00\x02"),
+
/* Sierra VMD */
B(VLC_CODEC_VMDAUDIO, "Sierra VMD Audio"),
A("vmda"),
B(VLC_CODEC_ADPCM_G726, "G.726 ADPCM Audio"),
A("g726"),
- /* G.726 ADPCM */
+ /* Flash ADPCM */
B(VLC_CODEC_ADPCM_SWF, "Flash ADPCM Audio"),
A("SWFa"),
+ B(VLC_CODEC_ADPCM_IMA_WAV, "IMA WAV ADPCM Audio"),
+ A("ms\x00\x11"),
+
+ B(VLC_CODEC_ADPCM_IMA_AMV, "IMA AMV ADPCM Audio"),
+ A("imav"),
/* AMR */
B(VLC_CODEC_AMR_NB, "AMR narrow band"),
B(VLC_CODEC_GSM_MS, "Microsoft GSM Audio"),
A("agsm"),
+ B(VLC_CODEC_ATRAC1, "atrac 1"),
+ A("atr1"),
+
B(VLC_CODEC_ATRAC3, "atrac 3"),
A("atrc"),
A("\x70\x02\x00\x00"),
B(VLC_CODEC_DVD_LPCM, "DVD LPCM Audio"),
A("lpcm"),
+ B(VLC_CODEC_DVDA_LPCM, "DVD-Audio LPCM Audio"),
+ A("apcm"),
+
B(VLC_CODEC_BD_LPCM, "BD LPCM Audio"),
A("bpcm"),
B(VLC_CODEC_FI32, "32 bits fixed float"),
A("fi32"),
- B(VLC_CODEC_FL32, "32 bits float"),
+ B(VLC_CODEC_F32L, "32 bits float LE"),
+ A("f32l"),
A("fl32"),
- B(VLC_CODEC_FL32, "64 bits float"),
- A("fl64"),
+ B(VLC_CODEC_F32B, "32 bits float BE"),
+ A("f32b"),
+
+ B(VLC_CODEC_F64L, "64 bits float LE"),
+ A("f64l"),
+
+ B(VLC_CODEC_F64L, "64 bits float BE"),
+ A("f64b"),
+
+ B(VLC_CODEC_TWINVQ, "TwinVQ"),
+ A("TWIN"),
B(0, "")
};
B(VLC_CODEC_XSUB, "DivX XSUB subtitles"),
A("XSUB"),
A("xsub"),
+ A("DXSB"),
B(VLC_CODEC_SSA, "SubStation Alpha subtitles"),
A("ssa "),
B(VLC_CODEC_ITU_T140, "ITU T.140 subtitles"),
A("t140"),
- B(VLC_CODEC_ITU_T140, "ITU T.140 subtitles"),
- A("t140"),
-
B(VLC_CODEC_USF, "USF subtitles"),
A("usf "),
B(VLC_CODEC_CVD, "CVD subtitles"),
A("cvd "),
+ B(VLC_CODEC_BD_PG, "BD subtitles"),
+ A("bdpg"),
+
B(0, "")
};
memcpy( e.p_class, p_class, 4 );
memcpy( e.p_fourcc, p->p_fourcc, 4 );
- e.psz_description = p->psz_description ?: psz_description;
+ e.psz_description = p->psz_description ?
+ p->psz_description : psz_description;
break;
}
}
/* */
+#define VLC_CODEC_YUV_PLANAR_410 \
+ VLC_CODEC_I410, VLC_CODEC_YV9
+
#define VLC_CODEC_YUV_PLANAR_420 \
VLC_CODEC_I420, VLC_CODEC_YV12, VLC_CODEC_J420
#define VLC_CODEC_FALLBACK_420 \
VLC_CODEC_YUV_PLANAR_422, VLC_CODEC_YUV_PACKED, \
VLC_CODEC_YUV_PLANAR_444, VLC_CODEC_YUV_PLANAR_440, \
- VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211
+ VLC_CODEC_I411, VLC_CODEC_YUV_PLANAR_410, VLC_CODEC_Y211
static const vlc_fourcc_t p_I420_fallback[] = {
VLC_CODEC_I420, VLC_CODEC_YV12, VLC_CODEC_J420, VLC_CODEC_FALLBACK_420, 0
#define VLC_CODEC_FALLBACK_422 \
VLC_CODEC_YUV_PACKED, VLC_CODEC_YUV_PLANAR_420, \
VLC_CODEC_YUV_PLANAR_444, VLC_CODEC_YUV_PLANAR_440, \
- VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211
+ VLC_CODEC_I411, VLC_CODEC_YUV_PLANAR_410, VLC_CODEC_Y211
static const vlc_fourcc_t p_I422_fallback[] = {
VLC_CODEC_I422, VLC_CODEC_J422, VLC_CODEC_FALLBACK_422, 0
#define VLC_CODEC_FALLBACK_444 \
VLC_CODEC_YUV_PLANAR_422, VLC_CODEC_YUV_PACKED, \
VLC_CODEC_YUV_PLANAR_420, VLC_CODEC_YUV_PLANAR_440, \
- VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211
+ VLC_CODEC_I411, VLC_CODEC_YUV_PLANAR_410, VLC_CODEC_Y211
static const vlc_fourcc_t p_I444_fallback[] = {
VLC_CODEC_I444, VLC_CODEC_J444, VLC_CODEC_FALLBACK_444, 0
VLC_CODEC_YUV_PLANAR_422,
VLC_CODEC_YUV_PLANAR_444,
VLC_CODEC_YUV_PACKED,
- VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211, 0
+ VLC_CODEC_I411, VLC_CODEC_YUV_PLANAR_410, VLC_CODEC_Y211, 0
};
#define VLC_CODEC_FALLBACK_PACKED \
VLC_CODEC_YUV_PLANAR_422, VLC_CODEC_YUV_PLANAR_420, \
VLC_CODEC_YUV_PLANAR_444, VLC_CODEC_YUV_PLANAR_440, \
- VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211
+ VLC_CODEC_I411, VLC_CODEC_YUV_PLANAR_410, VLC_CODEC_Y211
static const vlc_fourcc_t p_YUYV_fallback[] = {
VLC_CODEC_YUYV,
VLC_CODEC_YUV_PLANAR_440,
VLC_CODEC_YUV_PLANAR_444,
VLC_CODEC_YUV_PACKED,
- VLC_CODEC_I411, VLC_CODEC_I410, VLC_CODEC_Y211,
+ VLC_CODEC_I411, VLC_CODEC_YUV_PLANAR_410, VLC_CODEC_Y211,
0,
};
-const vlc_fourcc_t *vlc_fourcc_GetYUVFallback( vlc_fourcc_t i_fourcc )
+/* */
+static const vlc_fourcc_t p_RGB32_fallback[] = {
+ VLC_CODEC_RGB32,
+ VLC_CODEC_RGB24,
+ VLC_CODEC_RGB16,
+ VLC_CODEC_RGB15,
+ VLC_CODEC_RGB8,
+ 0,
+};
+static const vlc_fourcc_t p_RGB24_fallback[] = {
+ VLC_CODEC_RGB24,
+ VLC_CODEC_RGB32,
+ VLC_CODEC_RGB16,
+ VLC_CODEC_RGB15,
+ VLC_CODEC_RGB8,
+ 0,
+};
+static const vlc_fourcc_t p_RGB16_fallback[] = {
+ VLC_CODEC_RGB16,
+ VLC_CODEC_RGB24,
+ VLC_CODEC_RGB32,
+ VLC_CODEC_RGB15,
+ VLC_CODEC_RGB8,
+ 0,
+};
+static const vlc_fourcc_t p_RGB15_fallback[] = {
+ VLC_CODEC_RGB15,
+ VLC_CODEC_RGB16,
+ VLC_CODEC_RGB24,
+ VLC_CODEC_RGB32,
+ VLC_CODEC_RGB8,
+ 0,
+};
+static const vlc_fourcc_t p_RGB8_fallback[] = {
+ VLC_CODEC_RGB8,
+ VLC_CODEC_RGB15,
+ VLC_CODEC_RGB16,
+ VLC_CODEC_RGB24,
+ VLC_CODEC_RGB32,
+ 0,
+};
+static const vlc_fourcc_t *pp_RGB_fallback[] = {
+ p_RGB32_fallback,
+ p_RGB24_fallback,
+ p_RGB16_fallback,
+ p_RGB15_fallback,
+ p_RGB8_fallback,
+ NULL,
+};
+
+
+/* */
+static const vlc_fourcc_t *GetFallback( vlc_fourcc_t i_fourcc,
+ const vlc_fourcc_t *pp_fallback[],
+ const vlc_fourcc_t p_list[] )
{
- for( unsigned i = 0; pp_YUV_fallback[i]; i++ )
+ for( unsigned i = 0; pp_fallback[i]; i++ )
{
- if( pp_YUV_fallback[i][0] == i_fourcc )
- return pp_YUV_fallback[i];
+ if( pp_fallback[i][0] == i_fourcc )
+ return pp_fallback[i];
}
- return p_list_YUV;
+ return p_list;
+}
+
+const vlc_fourcc_t *vlc_fourcc_GetYUVFallback( vlc_fourcc_t i_fourcc )
+{
+ return GetFallback( i_fourcc, pp_YUV_fallback, p_list_YUV );
+}
+const vlc_fourcc_t *vlc_fourcc_GetRGBFallback( vlc_fourcc_t i_fourcc )
+{
+ return GetFallback( i_fourcc, pp_RGB_fallback, p_RGB32_fallback );
}
bool vlc_fourcc_AreUVPlanesSwapped( vlc_fourcc_t a, vlc_fourcc_t b )
{
- return (((a == VLC_CODEC_I420 || a == VLC_CODEC_J420) && b == VLC_CODEC_YV12) ||
- ((b == VLC_CODEC_I420 || b == VLC_CODEC_J420) && a == VLC_CODEC_YV12));
+ static const vlc_fourcc_t pp_swapped[][4] = {
+ { VLC_CODEC_YV12, VLC_CODEC_I420, VLC_CODEC_J420, 0 },
+ { VLC_CODEC_YV9, VLC_CODEC_I410, 0 },
+ { 0 }
+ };
+
+ for( int i = 0; pp_swapped[i][0]; i++ )
+ {
+ if( pp_swapped[i][0] == b )
+ {
+ vlc_fourcc_t t = a;
+ a = b;
+ b = t;
+ }
+ if( pp_swapped[i][0] != a )
+ continue;
+ for( int j = 1; pp_swapped[i][j]; j++ )
+ {
+ if( pp_swapped[i][j] == b )
+ return true;
+ }
+ }
+ return false;
}
-#if 0
-static inline bool vlc_fourcc_IsYUV(vlc_fourcc_t fcc)
+bool vlc_fourcc_IsYUV(vlc_fourcc_t fcc)
{
for( unsigned i = 0; p_list_YUV[i]; i++ )
{
}
return false;
}
-#endif
+
+#define PLANAR(n, w_den, h_den) \
+ { .plane_count = n, \
+ .p = { {.w = {1, 1}, .h = {1, 1}}, \
+ {.w = {1,w_den}, .h = {1,h_den}}, \
+ {.w = {1,w_den}, .h = {1,h_den}}, \
+ {.w = {1, 1}, .h = {1, 1}} }, \
+ .pixel_size = 1 }
+
+#define PACKED(size) \
+ { .plane_count = 1, \
+ .p = { {.w = {1,1}, .h = {1,1}} }, \
+ .pixel_size = size }
+
+static const struct
+{
+ vlc_fourcc_t p_fourcc[5];
+ vlc_chroma_description_t description;
+} p_list_chroma_description[] = {
+ { { VLC_CODEC_I411, 0 }, PLANAR(3, 4, 1) },
+ { { VLC_CODEC_YUV_PLANAR_410, 0 }, PLANAR(3, 4, 4) },
+ { { VLC_CODEC_YUV_PLANAR_420, 0 }, PLANAR(3, 2, 2) },
+ { { VLC_CODEC_YUV_PLANAR_422, 0 }, PLANAR(3, 2, 1) },
+ { { VLC_CODEC_YUV_PLANAR_440, 0 }, PLANAR(3, 1, 2) },
+ { { VLC_CODEC_YUV_PLANAR_444, 0 }, PLANAR(3, 1, 1) },
+ { { VLC_CODEC_YUVA, 0 }, PLANAR(4, 1, 1) },
+
+ { { VLC_CODEC_YUV_PACKED, 0 }, PACKED(2) },
+ { { VLC_CODEC_RGB8, VLC_CODEC_GREY,
+ VLC_CODEC_YUVP, VLC_CODEC_RGBP, 0 }, PACKED(1) },
+ { { VLC_CODEC_RGB16, VLC_CODEC_RGB15, 0 }, PACKED(2) },
+ { { VLC_CODEC_RGB24, 0 }, PACKED(3) },
+ { { VLC_CODEC_RGB32, VLC_CODEC_RGBA, 0 }, PACKED(4) },
+
+ { { VLC_CODEC_Y211, 0 }, { 1, { {{1,4}, {1,1}} }, 4 } },
+
+ { {0}, { 0, {}, 0 } }
+};
+
+#undef PACKED
+#undef PLANAR
+
+const vlc_chroma_description_t *vlc_fourcc_GetChromaDescription( vlc_fourcc_t i_fourcc )
+{
+ 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++ )
+ {
+ if( p_fourcc[j] == i_fourcc )
+ return &p_list_chroma_description[i].description;
+ }
+ }
+ return NULL;
+}
+
projects / vlc / blobdiff