Update message callback

[vlc] / src / misc / fourcc.c

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index d1dac2fe17a3277d3d908eb3df0fb9a25ea6c6c8..79453b1f33df1cb1df22cc1c46c51889021d51e4 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -70,12 +70,14 @@ static const entry_t p_list_video[] = {
         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)"),
@@ -101,8 +103,11 @@ static const entry_t p_list_video[] = {
         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"),
@@ -364,6 +369,7 @@ static const entry_t p_list_video[] = {
         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"),
@@ -662,6 +668,10 @@ static const entry_t p_list_video[] = {
 
     B(VLC_CODEC_RGB8, "8 bits RGB"),
         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_RGB16, "16 bits RGB"),
@@ -672,6 +682,7 @@ static const entry_t p_list_video[] = {
         A("RV32"),
     B(VLC_CODEC_RGBA, "32 bits RGBA"),
         A("RGBA"),
+        A("AV32"),
 
     B(VLC_CODEC_GREY, "8 bits greyscale"),
         A("GREY"),
@@ -1601,7 +1612,7 @@ bool vlc_fourcc_IsYUV(vlc_fourcc_t fcc)
              {.w = {1,    1}, .h = {1,    1}} }, \
       .pixel_size = 1 }
 
-#define PACKED(size) \
+#define PACKED_FMT(size) \
     { .plane_count = 1, \
       .p = { {.w = {1,1}, .h = {1,1}} }, \
       .pixel_size = size }
@@ -1619,19 +1630,20 @@ static const struct
     { { 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_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, 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_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
 
 const vlc_chroma_description_t *vlc_fourcc_GetChromaDescription( vlc_fourcc_t i_fourcc )
@@ -1647,4 +1659,3 @@ const vlc_chroma_description_t *vlc_fourcc_GetChromaDescription( vlc_fourcc_t i_
     }
     return NULL;
 }
-