[vlc-commits] avcodec: add mappings for gbrp 9/10-bit LE,BE

[Tristan Matthews]

vlc | branch: master | Tristan Matthews <tmatth at videolan.org> | Sat Jun 20 03:57:58 2015 -0400| [22a9c02f42a0070cfcdf5c8de2a09e692d6b9fc4] | committer: Tristan Matthews

avcodec: add mappings for gbrp 9/10-bit LE,BE

Fixes #14909

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

 NEWS                           |    1 +
 modules/codec/avcodec/chroma.c |    4 ++++
 src/misc/fourcc.c              |    4 ++++
 3 files changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index 2aa359b..3907b85 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,7 @@ Decoder:
  * Basic TTML subtitles support
  * Support hardware decoding using Direct3D11, including GPU-zerocopy mode
  * DxVA2 GPU-zerocopy for hardware decoding and displaying on Windows
+ * Support 9-bit and 10-bit GBR planar formats
 
 Demuxers:
  * Support HD-DVD .evo (H.264, VC-1, MPEG-2, PCM, AC-3, E-AC3, MLP, DTS)
diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c
index 99224e2..efd3153 100644
--- a/modules/codec/avcodec/chroma.c
+++ b/modules/codec/avcodec/chroma.c
@@ -135,6 +135,10 @@ static const struct
     {VLC_CODEC_RGBP, PIX_FMT_PAL8, 0, 0, 0},
 
     {VLC_CODEC_GBR_PLANAR, AV_PIX_FMT_GBRP, 0, 0, 0 },
+    {VLC_CODEC_GBR_PLANAR_9L, AV_PIX_FMT_GBRP9LE, 0, 0, 0 },
+    {VLC_CODEC_GBR_PLANAR_9B, AV_PIX_FMT_GBRP9BE, 0, 0, 0 },
+    {VLC_CODEC_GBR_PLANAR_10L, AV_PIX_FMT_GBRP10LE, 0, 0, 0 },
+    {VLC_CODEC_GBR_PLANAR_10B, AV_PIX_FMT_GBRP10BE, 0, 0, 0 },
 
     /* XYZ */
 #if LIBAVUTIL_VERSION_CHECK(52, 10, 0, 25, 100)
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 801146d..00e3609 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -590,6 +590,10 @@ static const struct
     { { VLC_CODEC_YUV422A },                   PLANAR_8(4, 2, 1) },
 
     { { VLC_CODEC_GBR_PLANAR },                PLANAR_8(3, 1, 1) },
+    { { VLC_CODEC_GBR_PLANAR_9L,
+        VLC_CODEC_GBR_PLANAR_9B },             PLANAR_16(3, 1, 1, 9) },
+    { { VLC_CODEC_GBR_PLANAR_10L,
+        VLC_CODEC_GBR_PLANAR_10B },            PLANAR_16(3, 1, 1, 10) },
 
     { { VLC_CODEC_I420_10L,
         VLC_CODEC_I420_10B },                  PLANAR_16(3, 2, 2, 10) },