E("PIM1", "Pinnacle DC1000 (MPEG-1 Video)"),
E("hdv1", "HDV 720p30 (MPEG-2 Video)"),
- E("hdv2", "Sony HDV (MPEG-2 Video)"),
- E("hdv3", "FCP HDV (MPEG-2 Video)"),
+ E("hdv2", "Sony HDV 1080i60 (MPEG-2 Video)"),
+ E("hdv3", "FCP HDV 1080i50 (MPEG-2 Video)"),
+ E("hdv4", "HDV 720p24 (MPEG-2 Video)"),
E("hdv5", "HDV 720p25 (MPEG-2 Video)"),
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("xdve", "XDCAM"),
E("xdvf", "XDCAM"),
- E("xd5a", "XDCAM"),
- E("xd5b", "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("cdvc", "Canopus DV Video"),
E("CDVH", "Canopus DV Video"),
E("cdvh", "Canopus DV Video"),
+ E("CDV5", "Canopus DV Video"),
/* Windows Media Video */
B(VLC_CODEC_WMV1, "Windows Media Video 7"),
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_NV12, "Planar Y, Packet UV (420)"),
A("NV12"),
+ B(VLC_CODEC_I420_9L, "Planar 4:2:0 YUV 9-bit LE"),
+ A("I09L"),
+ B(VLC_CODEC_I420_9B, "Planar 4:2:0 YUV 9-bit BE"),
+ A("I09B"),
+ B(VLC_CODEC_I422_9L, "Planar 4:2:2 YUV 9-bit LE"),
+ A("I29L"),
+ B(VLC_CODEC_I422_9B, "Planar 4:2:2 YUV 9-bit BE"),
+ A("I29B"),
+ B(VLC_CODEC_I444_9L, "Planar 4:4:4 YUV 9-bit LE"),
+ A("I49L"),
+ B(VLC_CODEC_I444_9B, "Planar 4:4:4 YUV 9-bit BE"),
+ A("I49B"),
+
+ B(VLC_CODEC_I420_10L, "Planar 4:2:0 YUV 10-bit LE"),
+ A("I0AL"),
+ B(VLC_CODEC_I420_10B, "Planar 4:2:0 YUV 10-bit BE"),
+ A("I0AB"),
+ B(VLC_CODEC_I422_10L, "Planar 4:2:2 YUV 10-bit LE"),
+ A("I2AL"),
+ B(VLC_CODEC_I422_10B, "Planar 4:2:2 YUV 10-bit BE"),
+ A("I2AB"),
+ B(VLC_CODEC_I444_10L, "Planar 4:4:4 YUV 10-bit LE"),
+ A("I4AL"),
+ B(VLC_CODEC_I444_10B, "Planar 4:4:4 YUV 10-bit BE"),
+ A("I4AB"),
+
/* Videogames Codecs */
/* Interplay MVE */
/* DTS Audio */
B(VLC_CODEC_DTS, "DTS Audio"),
A("dts "),
+ A("DTS "),
A("dtsb"),
A("ms\x20\x01"),
B(VLC_CODEC_BD_PG, "BD subtitles"),
A("bdpg"),
+ B(VLC_CODEC_EBU_STL, "EBU STL subtitles"),
+ A("STL "),
+
B(0, "")
};
#define VLC_CODEC_YUV_PLANAR_420 \
VLC_CODEC_I420, VLC_CODEC_YV12, VLC_CODEC_J420
+#define VLC_CODEC_YUV_PLANAR_420_16 \
+ VLC_CODEC_I420_10L, VLC_CODEC_I420_10B, VLC_CODEC_I420_9L, VLC_CODEC_I420_9B
+
#define VLC_CODEC_YUV_PLANAR_422 \
VLC_CODEC_I422, VLC_CODEC_J422
+#define VLC_CODEC_YUV_PLANAR_422_16 \
+ VLC_CODEC_I422_10L, VLC_CODEC_I422_10B, VLC_CODEC_I422_9L, VLC_CODEC_I422_9B
+
#define VLC_CODEC_YUV_PLANAR_440 \
VLC_CODEC_I440, VLC_CODEC_J440
#define VLC_CODEC_YUV_PLANAR_444 \
VLC_CODEC_I444, VLC_CODEC_J444
+#define VLC_CODEC_YUV_PLANAR_444_16 \
+ VLC_CODEC_I444_10L, VLC_CODEC_I444_10B, VLC_CODEC_I444_9L, VLC_CODEC_I444_9B
+
#define VLC_CODEC_YUV_PACKED \
VLC_CODEC_YUYV, VLC_CODEC_YVYU, \
VLC_CODEC_UYVY, VLC_CODEC_VYUY
VLC_CODEC_YV12, VLC_CODEC_I420, VLC_CODEC_J420, VLC_CODEC_FALLBACK_420, 0
};
+#define VLC_CODEC_FALLBACK_420_16 \
+ VLC_CODEC_I420, VLC_CODEC_YV12, VLC_CODEC_J420, VLC_CODEC_FALLBACK_420
+
+static const vlc_fourcc_t p_I420_9L_fallback[] = {
+ VLC_CODEC_I420_9L, VLC_CODEC_I420_9B, VLC_CODEC_FALLBACK_420_16, 0
+};
+static const vlc_fourcc_t p_I420_9B_fallback[] = {
+ VLC_CODEC_I420_9B, VLC_CODEC_I420_9L, VLC_CODEC_FALLBACK_420_16, 0
+};
+static const vlc_fourcc_t p_I420_10L_fallback[] = {
+ VLC_CODEC_I420_10L, VLC_CODEC_I420_10B, VLC_CODEC_FALLBACK_420_16, 0
+};
+static const vlc_fourcc_t p_I420_10B_fallback[] = {
+ VLC_CODEC_I420_10B, VLC_CODEC_I420_10L, VLC_CODEC_FALLBACK_420_16, 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_J422, VLC_CODEC_I422, VLC_CODEC_FALLBACK_422, 0
};
+#define VLC_CODEC_FALLBACK_422_16 \
+ VLC_CODEC_I422, VLC_CODEC_J422, VLC_CODEC_FALLBACK_422
+
+static const vlc_fourcc_t p_I422_9L_fallback[] = {
+ VLC_CODEC_I422_9L, VLC_CODEC_I422_9B, VLC_CODEC_FALLBACK_422_16, 0
+};
+static const vlc_fourcc_t p_I422_9B_fallback[] = {
+ VLC_CODEC_I422_9B, VLC_CODEC_I422_9L, VLC_CODEC_FALLBACK_422_16, 0
+};
+static const vlc_fourcc_t p_I422_10L_fallback[] = {
+ VLC_CODEC_I422_10L, VLC_CODEC_I422_10B, VLC_CODEC_FALLBACK_422_16, 0
+};
+static const vlc_fourcc_t p_I422_10B_fallback[] = {
+ VLC_CODEC_I422_10B, VLC_CODEC_I422_10L, VLC_CODEC_FALLBACK_422_16, 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_J444, VLC_CODEC_I444, VLC_CODEC_FALLBACK_444, 0
};
+#define VLC_CODEC_FALLBACK_444_16 \
+ VLC_CODEC_I444, VLC_CODEC_J444, VLC_CODEC_FALLBACK_444
+
+static const vlc_fourcc_t p_I444_9L_fallback[] = {
+ VLC_CODEC_I444_9L, VLC_CODEC_I444_9B, VLC_CODEC_FALLBACK_444_16, 0
+};
+static const vlc_fourcc_t p_I444_9B_fallback[] = {
+ VLC_CODEC_I444_9B, VLC_CODEC_I444_9L, VLC_CODEC_FALLBACK_444_16, 0
+};
+static const vlc_fourcc_t p_I444_10L_fallback[] = {
+ VLC_CODEC_I444_10L, VLC_CODEC_I444_10B, VLC_CODEC_FALLBACK_444_16, 0
+};
+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_I440_fallback[] = {
VLC_CODEC_I440,
VLC_CODEC_YUV_PLANAR_420,
static const vlc_fourcc_t *pp_YUV_fallback[] = {
p_YV12_fallback,
p_I420_fallback,
+ p_I420_9L_fallback,
+ p_I420_9B_fallback,
+ p_I420_10L_fallback,
+ p_I420_10B_fallback,
p_J420_fallback,
p_I422_fallback,
+ p_I422_9L_fallback,
+ p_I422_9B_fallback,
+ p_I422_10L_fallback,
+ p_I422_10B_fallback,
p_J422_fallback,
p_I444_fallback,
p_J444_fallback,
+ p_I444_9L_fallback,
+ p_I444_9B_fallback,
+ p_I444_10L_fallback,
+ p_I444_10B_fallback,
p_I440_fallback,
p_YUYV_fallback,
p_YVYU_fallback,
p_UYVY_fallback,
p_VYUY_fallback,
+
+
NULL,
};
VLC_CODEC_YUV_PLANAR_444,
VLC_CODEC_YUV_PACKED,
VLC_CODEC_I411, VLC_CODEC_YUV_PLANAR_410, VLC_CODEC_Y211,
+ VLC_CODEC_YUV_PLANAR_420_16,
+ VLC_CODEC_YUV_PLANAR_422_16,
+ VLC_CODEC_YUV_PLANAR_444_16,
0,
};
return false;
}
-#define PLANAR(n, w_den, h_den) \
+#define PLANAR(n, w_den, h_den, size) \
{ .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 }
+ .pixel_size = size }
+
+#define PLANAR_8(n, w_den, h_den) PLANAR(n, w_den, h_den, 1)
+#define PLANAR_16(n, w_den, h_den) PLANAR(n, w_den, h_den, 2)
-#define PACKED(size) \
+#define PACKED_FMT(size) \
{ .plane_count = 1, \
.p = { {.w = {1,1}, .h = {1,1}} }, \
.pixel_size = size }
static const struct
{
- vlc_fourcc_t p_fourcc[5];
+ vlc_fourcc_t p_fourcc[6];
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_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_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) },
+ { { VLC_CODEC_YUVA, 0 }, PLANAR_8(4, 1, 1) },
+
+ { { VLC_CODEC_I420_10L,
+ VLC_CODEC_I420_10B, 0 }, PLANAR_16(3, 2, 2) },
+ { { VLC_CODEC_I420_9L,
+ VLC_CODEC_I420_9B, 0 }, PLANAR_16(3, 2, 2) },
+ { { VLC_CODEC_I422_10L,
+ VLC_CODEC_I422_10B, 0 }, PLANAR_16(3, 2, 1) },
+ { { VLC_CODEC_I422_9L,
+ VLC_CODEC_I422_9B, 0 }, PLANAR_16(3, 2, 1) },
+ { { VLC_CODEC_I444_10L,
+ VLC_CODEC_I444_10B, 0 }, PLANAR_16(3, 1, 1) },
+ { { VLC_CODEC_I444_9L,
+ VLC_CODEC_I444_9B, 0 }, PLANAR_16(3, 1, 1) },
+
+ { { VLC_CODEC_YUV_PACKED, 0 }, PACKED_FMT(2) },
{ { VLC_CODEC_RGB8, VLC_CODEC_GREY,
- VLC_CODEC_YUVP, VLC_CODEC_RGBP, 0 }, PACKED(1) },
- { { VLC_CODEC_RGB16, VLC_CODEC_RGB15,
- VLC_CODEC_RGB12, VLC_CODEC_RGBA16, 0 },PACKED(2) },
- { { VLC_CODEC_RGB24, 0 }, PACKED(3) },
- { { VLC_CODEC_RGB32, VLC_CODEC_RGBA, 0 }, PACKED(4) },
+ VLC_CODEC_YUVP, VLC_CODEC_RGBP, 0 }, PACKED_FMT(1) },
+ { { VLC_CODEC_RGB16, VLC_CODEC_RGB15, VLC_CODEC_RGBT,
+ VLC_CODEC_RGB12, VLC_CODEC_RGBA16, 0 },PACKED_FMT(2) },
+ { { VLC_CODEC_RGB24, 0 }, PACKED_FMT(3) },
+ { { VLC_CODEC_RGB32, VLC_CODEC_RGBA, 0 }, PACKED_FMT(4) },
{ { VLC_CODEC_Y211, 0 }, { 1, { {{1,4}, {1,1}} }, 4 } },
{ {0}, { 0, {}, 0 } }
};
-#undef PACKED
+#undef PACKED_FMT
+#undef PLANAR_16
+#undef PLANAR_8
#undef PLANAR
const vlc_chroma_description_t *vlc_fourcc_GetChromaDescription( vlc_fourcc_t i_fourcc )