summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia
diff options
context:
space:
mode:
authorLim Siew Hoon <siew.hoon.lim@intel.com>2021-02-24 05:07:26 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2021-02-25 01:21:17 (GMT)
commitf695e532c010528f3c1cefbb803bdf1595137836 (patch)
tree87df98c5acb703f1231ce18e74c2b11ac06b3664 /recipes-multimedia
parent65935e52d26ddac416e39af4d965711d15fca0bc (diff)
downloadmeta-intel-f695e532c010528f3c1cefbb803bdf1595137836.tar.gz
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>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r--recipes-multimedia/libva/files/0001-Encode-Fixed-VP9-444-frame-header.patch43
-rw-r--r--recipes-multimedia/libva/files/0001-media-libva-Add-export-AYUV-color-in-vaExportSurface.patch38
-rw-r--r--recipes-multimedia/libva/intel-media-driver_21.1.1.bb (renamed from recipes-multimedia/libva/intel-media-driver_20.4.5.bb)6
3 files changed, 2 insertions, 85 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
deleted file mode 100644
index 3f220f7..0000000
--- a/recipes-multimedia/libva/files/0001-Encode-Fixed-VP9-444-frame-header.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 24da63ad1e0215b103c29b1bce29e126ca94ba00 Mon Sep 17 00:00:00 2001
2From: Lim Siew Hoon <siew.hoon.lim@intel.com>
3Date: Thu, 17 Dec 2020 14:33:21 +0800
4Subject: [PATCH] [Encode] Fixed VP9 444 frame header
5
6According VP9 spec section 7.2.2 color config semantics,
7both subsampling_x and subsampling_y should be 0 for YUV444.
8Only YUV440 subsampling_x=0 and subsampling_y=1.
9
10fixes #1074
11
12Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
13
14The patch was imported from the iHD media-driver git server
15(https://github.com/intel/media-driver.git) as of commit id
16a33eaaec2f71f04c8850db9287ee4012e143e283.
17
18Upstream-Status: Backport
19
20Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
21---
22 media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp | 4 ++--
23 1 file changed, 2 insertions(+), 2 deletions(-)
24
25diff --git a/media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp b/media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp
26index df89f4fe..41357b0e 100644
27--- a/media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp
28+++ b/media_driver/linux/common/codec/ddi/media_libvpx_vp9.cpp
29@@ -97,9 +97,9 @@ void write_bitdepth_colorspace_sampling(uint32_t codecProfile,
30 (codecProfile == VP9_PROFILE_3))
31 {
32 /* sub_sampling_x/y */
33- /* Currently the sub_sampling_x = 0, sub_sampling_y = 1 */
34+ /* Currently the sub_sampling_x = 0, sub_sampling_y = 0 */
35+ vp9_wb_write_bit(wb, 0);
36 vp9_wb_write_bit(wb, 0);
37- vp9_wb_write_bit(wb, 1);
38 vp9_wb_write_bit(wb, 0); // unused
39 }
40 }
41--
422.17.1
43
diff --git a/recipes-multimedia/libva/files/0001-media-libva-Add-export-AYUV-color-in-vaExportSurface.patch b/recipes-multimedia/libva/files/0001-media-libva-Add-export-AYUV-color-in-vaExportSurface.patch
deleted file mode 100644
index 40364dc..0000000
--- a/recipes-multimedia/libva/files/0001-media-libva-Add-export-AYUV-color-in-vaExportSurface.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 16d5df20c71c97560e44b45e23bc7946cbb8668f Mon Sep 17 00:00:00 2001
2From: Lim Siew Hoon <siew.hoon.lim@intel.com>
3Date: Thu, 24 Dec 2020 18:47:56 +0800
4Subject: [PATCH] media-libva: Add export AYUV color in vaExportSurfaceHandle
5 when VA_EXPORT_SURFACE_COMPOSED_LAYERS is not set.
6
7Example:
8gst-launch-1.0 videotestsrc ! msdkvpp \
9'video/x-raw(memory:DMABuf)',format=VUYA ! glimagesink
10
11fixes #1114
12
13Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
14
15Upstream-status: backport
16https://github.com/intel/media-driver/commit/ff0cb9efc9f30712e8b967da629b2804c9a128a1
17
18Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
19---
20 media_driver/linux/common/ddi/media_libva.cpp | 2 ++
21 1 file changed, 2 insertions(+)
22
23diff --git a/media_driver/linux/common/ddi/media_libva.cpp b/media_driver/linux/common/ddi/media_libva.cpp
24index 875603ad..93add4cd 100755
25--- a/media_driver/linux/common/ddi/media_libva.cpp
26+++ b/media_driver/linux/common/ddi/media_libva.cpp
27@@ -6679,6 +6679,8 @@ static uint32_t DdiMedia_GetDrmFormatOfSeparatePlane(uint32_t fourcc, int plane)
28 return DRM_FORMAT_VYUY;
29 case VA_FOURCC_UYVY:
30 return DRM_FORMAT_UYVY;
31+ case VA_FOURCC_AYUV:
32+ return DRM_FORMAT_AYUV;
33 case VA_FOURCC_Y210:
34 return DRM_FORMAT_Y210;
35 case VA_FOURCC_Y216:
36--
372.17.1
38
diff --git a/recipes-multimedia/libva/intel-media-driver_20.4.5.bb b/recipes-multimedia/libva/intel-media-driver_21.1.1.bb
index 3bdfe53..531541a 100644
--- a/recipes-multimedia/libva/intel-media-driver_20.4.5.bb
+++ b/recipes-multimedia/libva/intel-media-driver_21.1.1.bb
@@ -18,12 +18,10 @@ REQUIRED_DISTRO_FEATURES = "opengl"
18 18
19DEPENDS += "libva gmmlib" 19DEPENDS += "libva gmmlib"
20 20
21SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;branch=intel-media-20.4 \ 21SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
22 file://0001-media-libva-Add-export-AYUV-color-in-vaExportSurface.patch \
23 file://0001-Encode-Fixed-VP9-444-frame-header.patch \
24 " 22 "
25 23
26SRCREV = "74e2f11131def34314ce52940e8d0028a4aba01c" 24SRCREV = "2c80a6973166f9f2ca6a21d37679409cfce0e8f6"
27S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
28 26
29COMPATIBLE_HOST_x86-x32 = "null" 27COMPATIBLE_HOST_x86-x32 = "null"