[vlc-commits] fourcc: quicktime yuv2 != YUV2 (refs #16720)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jan  8 21:02:13 2020 +0100| [0c78d4ea89017f3947a93d62907171cc64da1e58] | committer: Francois Cartegnie

fourcc: quicktime yuv2 != YUV2 (refs #16720)

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

 include/vlc_fourcc.h   | 2 ++
 src/misc/es_format.c   | 1 +
 src/misc/fourcc.c      | 1 +
 src/misc/fourcc_list.h | 5 +++++
 4 files changed, 9 insertions(+)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 2e0dc43c88..dc43fcc0fe 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -305,6 +305,8 @@
 #define VLC_CODEC_VYUY            VLC_FOURCC('V','Y','U','Y')
 /* Packed YUV 4:2:2, Y:U:Y:V */
 #define VLC_CODEC_YUYV            VLC_FOURCC('Y','U','Y','2')
+/* Packed YUV 4:2:2, Y:U:Y:V, signed */
+#define VLC_CODEC_YUV2            VLC_FOURCC('y','u','v','2')
 /* Packed YUV 4:2:2, Y:V:Y:U */
 #define VLC_CODEC_YVYU            VLC_FOURCC('Y','V','Y','U')
 /* Packed YUV 2:1:1, Y:U:Y:V */
diff --git a/src/misc/es_format.c b/src/misc/es_format.c
index 9abf7732f3..fa092d5755 100644
--- a/src/misc/es_format.c
+++ b/src/misc/es_format.c
@@ -104,6 +104,7 @@ void video_format_Setup( video_format_t *p_fmt, vlc_fourcc_t i_chroma,
     case VLC_CODEC_YUYV:
     case VLC_CODEC_YVYU:
     case VLC_CODEC_UYVY:
+    case VLC_CODEC_YUV2:
     case VLC_CODEC_VYUY:
     case VLC_CODEC_J422:
         p_fmt->i_bits_per_pixel = 16;
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index c7855dfb17..9b4ea14c31 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -788,6 +788,7 @@ static const struct
 
     { { VLC_CODEC_YUYV, VLC_CODEC_YVYU,
         VLC_CODEC_UYVY, VLC_CODEC_VYUY },      PACKED_FMT(2, 16) },
+    { { VLC_CODEC_YUV2 },                      PACKED_FMT(2, 16) },
     { { VLC_CODEC_RGB8, VLC_CODEC_GREY,
         VLC_CODEC_YUVP, VLC_CODEC_RGBP },      PACKED_FMT(1, 8) },
 
diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h
index 662ae5b24e..f942731925 100644
--- a/src/misc/fourcc_list.h
+++ b/src/misc/fourcc_list.h
@@ -851,6 +851,11 @@ static const staticentry_t p_list_video[] = {
         A("YUYV"),
         A("YUNV"),
         A("V422"),
+
+    B(VLC_CODEC_YUV2, "Packed YUV 4:2:2, Y:U:Y:V signed"),
+        A("yuv2"),
+        A("yuvu"),
+
     B(VLC_CODEC_YVYU, "Packed YUV 4:2:2, Y:V:Y:U"),
         A("YVYU"),