mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
intel-media-driver: upgrade 20.4.3 -> 20.4.5
Drops patches already merged. * 0001-Encode-Fixed-VP9-444-frame-header.patch * 0001-media_libva-export-packed-YUV-when-VA_EXPORT_SURFACE.patch * 0002-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
Anuj Mittal
parent
b583097f7d
commit
bb8479a75c
|
|
@ -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
|
||||
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
From 8fc1d919fd33db698e5470602942ab6a2d6b7841 Mon Sep 17 00:00:00 2001
|
||||
From: Haihao Xiang <haihao.xiang@intel.com>
|
||||
Date: Thu, 3 Dec 2020 10:52:15 +0800
|
||||
Subject: [PATCH 1/2] media_libva: export packed YUV when
|
||||
VA_EXPORT_SURFACE_COMPOSED_LAYERS is not set
|
||||
|
||||
vaExportSurfaceHandle works for packed RGB w/wo
|
||||
VA_EXPORT_SURFACE_COMPOSED_LAYERS, it should work for packed YUV too
|
||||
w/wo VA_EXPORT_SURFACE_COMPOSED_LAYERS
|
||||
|
||||
Example:
|
||||
gst-launch-1.0 videotestsrc ! msdkvpp ! \
|
||||
'video/x-raw(memory:DMABuf)',format=YUY2 ! glimagesink
|
||||
|
||||
The patch was imported from the iHD media-driver git server
|
||||
(https://github.com/intel/media-driver.git) as of commit id
|
||||
38e5f4ab95a5c4fb3fe55d3d132795ee804d9310.
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
|
||||
---
|
||||
media_driver/linux/common/ddi/media_libva.cpp | 22 +++++++++++++++++--
|
||||
1 file changed, 20 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/media_driver/linux/common/ddi/media_libva.cpp b/media_driver/linux/common/ddi/media_libva.cpp
|
||||
index 91c3ff14..778b7011 100755
|
||||
--- a/media_driver/linux/common/ddi/media_libva.cpp
|
||||
+++ b/media_driver/linux/common/ddi/media_libva.cpp
|
||||
@@ -6672,9 +6672,27 @@ static uint32_t DdiMedia_GetDrmFormatOfSeparatePlane(uint32_t fourcc, int plane)
|
||||
return DRM_FORMAT_R16;
|
||||
|
||||
case VA_FOURCC_YUY2:
|
||||
+ return DRM_FORMAT_YUYV;
|
||||
+ case VA_FOURCC_YVYU:
|
||||
+ return DRM_FORMAT_YVYU;
|
||||
+ case VA_FOURCC_VYUY:
|
||||
+ return DRM_FORMAT_VYUY;
|
||||
case VA_FOURCC_UYVY:
|
||||
- // These are not representable as separate planes.
|
||||
- return 0;
|
||||
+ return DRM_FORMAT_UYVY;
|
||||
+ case VA_FOURCC_Y210:
|
||||
+ return DRM_FORMAT_Y210;
|
||||
+ case VA_FOURCC_Y216:
|
||||
+ return DRM_FORMAT_Y216;
|
||||
+ case VA_FOURCC_Y410:
|
||||
+ return DRM_FORMAT_Y410;
|
||||
+ case VA_FOURCC_Y416:
|
||||
+ return DRM_FORMAT_Y416;
|
||||
+#if VA_CHECK_VERSION(1, 9, 0)
|
||||
+ case VA_FOURCC_Y212:
|
||||
+ return DRM_FORMAT_Y216;
|
||||
+ case VA_FOURCC_Y412:
|
||||
+ return DRM_FORMAT_Y416;
|
||||
+#endif
|
||||
|
||||
case VA_FOURCC_ARGB:
|
||||
return DRM_FORMAT_ARGB8888;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 979e90d7bc9ff6d9064e1f0378015abf40d86af2 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 2/2] 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
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1115]
|
||||
|
||||
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 778b7011..0e9f07d3 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
|
||||
|
||||
|
|
@ -19,12 +19,9 @@ 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-Encode-Fixed-VP9-444-frame-header.patch \
|
||||
file://0001-media_libva-export-packed-YUV-when-VA_EXPORT_SURFACE.patch \
|
||||
file://0002-media-libva-Add-export-AYUV-color-in-vaExportSurface.patch \
|
||||
"
|
||||
|
||||
SRCREV = "1daed90e58cb9fb0a0dc6de9697aaad34b114507"
|
||||
SRCREV = "74e2f11131def34314ce52940e8d0028a4aba01c"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
COMPATIBLE_HOST_x86-x32 = "null"
|
||||
Loading…
Reference in New Issue
Block a user