intel-media-driver: backport fixed VP9 444 frame header.

Fixes VP9 444 encode output not able decode with
gstreamer-vaapi master.

Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

2 files changed, 44 insertions, 0 deletions

diff --git a/recipes-multimedia/libva/files/0001-Encode-Fixed-VP9-444-frame-header.patch b/recipes-multimedia/libva/files/0001-Encode-Fixed-VP9-444-frame-header.patch
new file mode 100644
index 00000000..cd046c65
--- /dev/null
+++ b/recipes-multimedia/libva/files/0001-Encode-Fixed-VP9-444-frame-header.patch
@@ -0,0 +1,43 @@
+From 24da63ad1e0215b103c29b1bce29e126ca94ba00 Mon Sep 17 00:00:00 2001
+From: Lim Siew Hoon <siew.hoon.lim@intel.com>
+Date: Thu, 17 Dec 2020 14:33:21 +0800
+Subject: [PATCH] [Encode] Fixed VP9 444 frame header
+
+According VP9 spec section 7.2.2 color config semantics,
+both subsampling_x and subsampling_y should be 0 for YUV444.
+Only YUV440 subsampling_x=0 and subsampling_y=1.
+
+fixes #1074
+
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+
+The patch was imported from the iHD media-driver git server
+(https://github.com/intel/media-driver.git) as of commit id
+a33eaaec2f71f04c8850db9287ee4012e143e283.
+
+Upstream-status: Backport
+
+Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
+---
+ media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp b/media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp
+index df89f4fe..41357b0e 100644
+--- a/media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp
++++ b/media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp
+@@ -97,9 +97,9 @@ void write_bitdepth_colorspace_sampling(uint32_t codecProfile,
+         (codecProfile == VP9_PROFILE_3))
+     {
+         /* sub_sampling_x/y */
+-        /* Currently the sub_sampling_x = 0, sub_sampling_y = 1 */
++        /* Currently the sub_sampling_x = 0, sub_sampling_y = 0 */
++        vp9_wb_write_bit(wb, 0);
+         vp9_wb_write_bit(wb, 0);
+-        vp9_wb_write_bit(wb, 1);
+         vp9_wb_write_bit(wb, 0); // unused
+     }
+ }
+-- 
+2.17.1
+
diff --git a/recipes-multimedia/libva/intel-media-driver_20.3.0.bb b/recipes-multimedia/libva/intel-media-driver_20.3.0.bb
index 8e14238a..a53867bd 100644
--- a/recipes-multimedia/libva/intel-media-driver_20.3.0.bb
+++ b/recipes-multimedia/libva/intel-media-driver_20.3.0.bb
@@ -19,6 +19,7 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 DEPENDS += "libva gmmlib"
 
 SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;branch=intel-media-20.3 \
+           file://0001-Encode-Fixed-VP9-444-frame-header.patch \
           "
 
 SRCREV = "86ec0b6f61862806d8aed1803537728d1dfadf84"