[vlc-commits] contrib: ffmpeg: backport VP9 profile 10-bit support

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Mar 25 11:07:28 2020 +0100| [5b3cb03f1ed462d47528b4bd7c8ff8344a0ed0c3] | committer: Steve Lhomme

contrib: ffmpeg: backport VP9 profile 10-bit support

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

 ...-add-profile-2-10-bit-DXVA2-D3D11-decodin.patch | 34 ++++++++++++++++++++++
 contrib/src/ffmpeg/rules.mak                       |  1 +
 2 files changed, 35 insertions(+)

diff --git a/contrib/src/ffmpeg/0001-avcodec-vp9-add-profile-2-10-bit-DXVA2-D3D11-decodin.patch b/contrib/src/ffmpeg/0001-avcodec-vp9-add-profile-2-10-bit-DXVA2-D3D11-decodin.patch
new file mode 100644
index 0000000000..d2593d0f88
--- /dev/null
+++ b/contrib/src/ffmpeg/0001-avcodec-vp9-add-profile-2-10-bit-DXVA2-D3D11-decodin.patch
@@ -0,0 +1,34 @@
+From 7e20c8f5ebe96de94694be10e24b791e1ed4ea2d Mon Sep 17 00:00:00 2001
+From: Hendrik Leppkes <h.leppkes at gmail.com>
+Date: Mon, 29 May 2017 12:09:47 +0200
+Subject: [PATCH] avcodec/vp9: add profile 2 10-bit DXVA2/D3D11 decoding
+ support
+
+Fixes trac ticket #7099.
+---
+ libavcodec/vp9.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
+index 0fac638ec9..b1178c9c0c 100644
+--- a/libavcodec/vp9.c
++++ b/libavcodec/vp9.c
+@@ -188,6 +188,7 @@ static int update_size(AVCodecContext *avctx, int w, int h)
+ 
+         switch (s->pix_fmt) {
+         case AV_PIX_FMT_YUV420P:
++        case AV_PIX_FMT_YUV420P10:
+ #if CONFIG_VP9_DXVA2_HWACCEL
+             *fmtp++ = AV_PIX_FMT_DXVA2_VLD;
+ #endif
+@@ -202,7 +203,6 @@ static int update_size(AVCodecContext *avctx, int w, int h)
+             *fmtp++ = AV_PIX_FMT_VAAPI;
+ #endif
+             break;
+-        case AV_PIX_FMT_YUV420P10:
+         case AV_PIX_FMT_YUV420P12:
+ #if CONFIG_VP9_NVDEC_HWACCEL
+             *fmtp++ = AV_PIX_FMT_CUDA;
+-- 
+2.26.0.windows.1
+
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index f641b5b712..82fcc9955f 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -244,6 +244,7 @@ ifdef USE_FFMPEG
 	$(APPLY) $(SRC)/ffmpeg/ffmpeg-mkv-overshoot.patch
 	$(APPLY) $(SRC)/ffmpeg/0001-avcodec-hevcdec-set-the-SEI-parameters-early-on-the-.patch
 	$(APPLY) $(SRC)/ffmpeg/0001-avcodec-h264_slice-set-the-SEI-parameters-early-on-t.patch
+	$(APPLY) $(SRC)/ffmpeg/0001-avcodec-vp9-add-profile-2-10-bit-DXVA2-D3D11-decodin.patch
 endif
 ifdef USE_LIBAV
 	$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch