[vlc-commits] Reserve FOURCC's for RV12 and AV16 XVideo formats

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Feb 15 18:30:35 2011 +0200| [d7fe7e31eff180917c1d8077b47fc2e2b2c42542] | committer: Rémi Denis-Courmont

Reserve FOURCC's for RV12 and AV16 XVideo formats

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

 include/vlc_fourcc.h |    4 ++++
 src/misc/fourcc.c    |    9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index e6edd88..7e06368 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -150,6 +150,10 @@
 #define VLC_CODEC_RGBP      VLC_FOURCC('R','G','B','P')
 /* 8 bits RGB */
 #define VLC_CODEC_RGB8      VLC_FOURCC('R','G','B','8')
+/* 12 bits RGB stored on 16 bits */
+#define VLC_CODEC_RGB12     VLC_FOURCC('R','V','1','2')
+/* 16 bits VLC RGBA */
+#define VLC_CODEC_RGBA16    VLC_FOURCC('A','V','1','6')
 /* 15 bits RGB stored on 16 bits */
 #define VLC_CODEC_RGB15     VLC_FOURCC('R','V','1','5')
 /* 16 bits RGB store on a 16 bits */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index d1dac2f..c4cecce 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -662,6 +662,10 @@ static const entry_t p_list_video[] = {
 
     B(VLC_CODEC_RGB8, "8 bits RGB"),
         A("RGB2"),
+    B(VLC_CODEC_RGB15, "12 bits RGB"),
+        A("RV12"),
+    B(VLC_CODEC_RGB15, "16 bits RGBA"),
+        A("AV16"),
     B(VLC_CODEC_RGB15, "15 bits RGB"),
         A("RV15"),
     B(VLC_CODEC_RGB16, "16 bits RGB"),
@@ -672,6 +676,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"),
@@ -1622,7 +1627,8 @@ static const struct
     { { 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_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) },
 
@@ -1647,4 +1653,3 @@ const vlc_chroma_description_t *vlc_fourcc_GetChromaDescription( vlc_fourcc_t i_
     }
     return NULL;
 }
-