intel-media-driver: upgrade 20.4.5 -> 21.1.1

Drops patches already merged:
* 0001-Encode-Fixed-VP9-444-frame-header.patch
* 0001-media-libva-Add-export-AYUV-color-in-vaExportSurface.patch

Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Lim Siew Hoon 2021-02-24 13:07:26 +08:00 committed by Anuj Mittal
parent 65935e52d2
commit f695e532c0
3 changed files with 2 additions and 85 deletions

View File

@ -1,43 +0,0 @@
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

View File

@ -1,38 +0,0 @@
From 16d5df20c71c97560e44b45e23bc7946cbb8668f Mon Sep 17 00:00:00 2001
From: Lim Siew Hoon <siew.hoon.lim@intel.com>
Date: Thu, 24 Dec 2020 18:47:56 +0800
Subject: [PATCH] media-libva: Add export AYUV color in vaExportSurfaceHandle
when VA_EXPORT_SURFACE_COMPOSED_LAYERS is not set.
Example:
gst-launch-1.0 videotestsrc ! msdkvpp \
'video/x-raw(memory:DMABuf)',format=VUYA ! glimagesink
fixes #1114
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Upstream-status: backport
https://github.com/intel/media-driver/commit/ff0cb9efc9f30712e8b967da629b2804c9a128a1
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
media_driver/linux/common/ddi/media_libva.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/media_driver/linux/common/ddi/media_libva.cpp b/media_driver/linux/common/ddi/media_libva.cpp
index 875603ad..93add4cd 100755
--- a/media_driver/linux/common/ddi/media_libva.cpp
+++ b/media_driver/linux/common/ddi/media_libva.cpp
@@ -6679,6 +6679,8 @@ static uint32_t DdiMedia_GetDrmFormatOfSeparatePlane(uint32_t fourcc, int plane)
return DRM_FORMAT_VYUY;
case VA_FOURCC_UYVY:
return DRM_FORMAT_UYVY;
+ case VA_FOURCC_AYUV:
+ return DRM_FORMAT_AYUV;
case VA_FOURCC_Y210:
return DRM_FORMAT_Y210;
case VA_FOURCC_Y216:
--
2.17.1

View File

@ -18,12 +18,10 @@ REQUIRED_DISTRO_FEATURES = "opengl"
DEPENDS += "libva gmmlib"
SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;branch=intel-media-20.4 \
file://0001-media-libva-Add-export-AYUV-color-in-vaExportSurface.patch \
file://0001-Encode-Fixed-VP9-444-frame-header.patch \
SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
"
SRCREV = "74e2f11131def34314ce52940e8d0028a4aba01c"
SRCREV = "2c80a6973166f9f2ca6a21d37679409cfce0e8f6"
S = "${WORKDIR}/git"
COMPATIBLE_HOST_x86-x32 = "null"