[vlc-commits] Define YUV 4:2:2 12bits formats

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul  7 23:02:03 2016 +0200| [724818142219f66f817536f15a125ab2a70b29d4] | committer: Jean-Baptiste Kempf

Define YUV 4:2:2 12bits formats

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=724818142219f66f817536f15a125ab2a70b29d4
---

 include/vlc_fourcc.h   |    3 +++
 src/misc/fourcc.c      |   12 +++++++++++-
 src/misc/fourcc_list.h |    4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 1ba755e..71cf71f 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -215,6 +215,9 @@
 /* Planar YUV 4:2:2 Y:U:V 10-bit stored on 16 bits */
 #define VLC_CODEC_I422_10L        VLC_FOURCC('I','2','A','L')
 #define VLC_CODEC_I422_10B        VLC_FOURCC('I','2','A','B')
+/* Planar YUV 4:2:2 Y:U:V 12-bit stored on 16 bits */
+#define VLC_CODEC_I422_12L        VLC_FOURCC('I','2','C','L')
+#define VLC_CODEC_I422_12B        VLC_FOURCC('I','2','C','B')
 
 /* Planar YUV 4:4:0 Y:U:V */
 #define VLC_CODEC_I440            VLC_FOURCC('I','4','4','0')
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index f061ae0..ac26309 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -225,7 +225,7 @@ const char *vlc_fourcc_GetDescription(int cat, vlc_fourcc_t fourcc)
     VLC_CODEC_NV16, VLC_CODEC_NV61
 
 #define VLC_CODEC_YUV_PLANAR_422_16 \
-    VLC_CODEC_I422_10L, VLC_CODEC_I422_10B, VLC_CODEC_I422_9L, VLC_CODEC_I422_9B
+    VLC_CODEC_I422_12L, VLC_CODEC_I422_12B, 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
@@ -312,6 +312,12 @@ static const vlc_fourcc_t p_I422_10L_fallback[] = {
 static const vlc_fourcc_t p_I422_10B_fallback[] = {
     VLC_CODEC_I422_10B, VLC_CODEC_I422_10L, VLC_CODEC_FALLBACK_422_16, 0
 };
+static const vlc_fourcc_t p_I422_12L_fallback[] = {
+    VLC_CODEC_I422_12L, VLC_CODEC_I422_12B, VLC_CODEC_FALLBACK_422_16, 0
+};
+static const vlc_fourcc_t p_I422_12B_fallback[] = {
+    VLC_CODEC_I422_12B, VLC_CODEC_I422_12L, VLC_CODEC_FALLBACK_422_16, 0
+};
 
 #define VLC_CODEC_FALLBACK_444 \
     VLC_CODEC_YUV_PLANAR_422, VLC_CODEC_YUV_PACKED, \
@@ -412,6 +418,8 @@ static const vlc_fourcc_t *pp_YUV_fallback[] = {
     p_I422_9B_fallback,
     p_I422_10L_fallback,
     p_I422_10B_fallback,
+    p_I422_12L_fallback,
+    p_I422_12B_fallback,
     p_J422_fallback,
     p_I444_fallback,
     p_J444_fallback,
@@ -617,6 +625,8 @@ static const struct
         VLC_CODEC_I420_10B },                  PLANAR_16(3, 2, 2, 12) },
     { { VLC_CODEC_I420_9L,
         VLC_CODEC_I420_9B },                   PLANAR_16(3, 2, 2,  9) },
+    { { VLC_CODEC_I422_12L,
+        VLC_CODEC_I422_12B },                  PLANAR_16(3, 2, 1, 12) },
     { { VLC_CODEC_I422_10L,
         VLC_CODEC_I422_10B },                  PLANAR_16(3, 2, 1, 10) },
     { { VLC_CODEC_I422_9L,
diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h
index 8ff42e5..f1c4963 100644
--- a/src/misc/fourcc_list.h
+++ b/src/misc/fourcc_list.h
@@ -863,6 +863,10 @@ static const staticentry_t p_list_video[] = {
         A("I0CL"),
     B(VLC_CODEC_I420_12B, "Planar 4:2:0 YUV 12-bit BE"),
         A("I0CB"),
+    B(VLC_CODEC_I422_12L, "Planar 4:2:2 YUV 12-bit LE"),
+        A("I2CL"),
+    B(VLC_CODEC_I422_12B, "Planar 4:2:2 YUV 12-bit BE"),
+        A("I2CB"),
     B(VLC_CODEC_I444_12L, "Planar 4:4:4 YUV 12-bit LE"),
         A("I4CL"),
     B(VLC_CODEC_I444_12B, "Planar 4:4:4 YUV 12-bit BE"),