diff options
Diffstat (limited to 'recipes-multimedia/onevpl')
-rw-r--r-- | recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch | 39 | ||||
-rw-r--r-- | recipes-multimedia/onevpl/files/0001-Encode-Bugfix-for-HEVC-VDENC-422-RPL-caps-issue.-588.patch | 70 | ||||
-rw-r--r-- | recipes-multimedia/onevpl/files/0001-RT-Common-Fix-MediaAdapterType-issue-5898.patch | 36 | ||||
-rw-r--r-- | recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb (renamed from recipes-multimedia/onevpl/onevpl-intel-gpu_23.3.4.bb) | 5 |
4 files changed, 41 insertions, 109 deletions
diff --git a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch b/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch new file mode 100644 index 00000000..8d1f3380 --- /dev/null +++ b/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From a425927469b36e7bc597bff4fdc24d42a1168d1a Mon Sep 17 00:00:00 2001 | ||
2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
3 | Date: Mon, 18 Dec 2023 09:58:35 +0800 | ||
4 | Subject: [PATCH] ARLH DID open source (#6286) | ||
5 | |||
6 | Co-authored-by: huangli <li.h.huang@intel.com> | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/66f1b4d60a367eb1b0774e0b4369f906e0e632ae] | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | |||
11 | --- | ||
12 | _studio/shared/include/mfxstructures-int.h | 7 ++++++- | ||
13 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/_studio/shared/include/mfxstructures-int.h b/_studio/shared/include/mfxstructures-int.h | ||
16 | index 363d9a63..8f16b0a8 100644 | ||
17 | --- a/_studio/shared/include/mfxstructures-int.h | ||
18 | +++ b/_studio/shared/include/mfxstructures-int.h | ||
19 | @@ -1,4 +1,4 @@ | ||
20 | -// Copyright (c) 2007-2021 Intel Corporation | ||
21 | +// Copyright (c) 2007-2023 Intel Corporation | ||
22 | // | ||
23 | // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
24 | // of this software and associated documentation files (the "Software"), to deal | ||
25 | @@ -569,6 +569,11 @@ typedef struct { | ||
26 | /* ARL S */ | ||
27 | { 0x7D67, MFX_HW_ARL, MFX_GT2 }, | ||
28 | |||
29 | + /* ARL H*/ | ||
30 | + { 0x7D51, MFX_HW_ARL, MFX_GT2 }, | ||
31 | + { 0x7DD1, MFX_HW_ARL, MFX_GT2 }, | ||
32 | + { 0x7D41, MFX_HW_ARL, MFX_GT2 }, | ||
33 | + | ||
34 | }; | ||
35 | |||
36 | /* | ||
37 | -- | ||
38 | 2.40.1 | ||
39 | |||
diff --git a/recipes-multimedia/onevpl/files/0001-Encode-Bugfix-for-HEVC-VDENC-422-RPL-caps-issue.-588.patch b/recipes-multimedia/onevpl/files/0001-Encode-Bugfix-for-HEVC-VDENC-422-RPL-caps-issue.-588.patch deleted file mode 100644 index 6209f960..00000000 --- a/recipes-multimedia/onevpl/files/0001-Encode-Bugfix-for-HEVC-VDENC-422-RPL-caps-issue.-588.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | From 3830e393b6e2807f842d3cacda575fa715827e62 Mon Sep 17 00:00:00 2001 | ||
2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
3 | Date: Thu, 19 Oct 2023 13:03:53 +0800 | ||
4 | Subject: [PATCH] [Encode] Bugfix for HEVC VDENC 422 RPL caps issue. (#5886) | ||
5 | |||
6 | Fixed HEVC VDENC 422 RPL caps issue. | ||
7 | |||
8 | Co-authored-by: Wenjuan Zhang <wenjuan.zhang@intel.com> | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/3830e393b6e2807f842d3cacda575fa715827e62] | ||
11 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
12 | --- | ||
13 | .../hevc/agnostic/base/hevcehw_base_recon422.h | 4 +++- | ||
14 | .../hevc/agnostic/base/hevcehw_base_recon422_ext.h | 11 +++++++++++ | ||
15 | .../hevc/linux/base/hevcehw_base_va_packer_lin.cpp | 2 +- | ||
16 | 3 files changed, 15 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_recon422.h b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_recon422.h | ||
19 | index 24bf5cf2..d150ca1c 100644 | ||
20 | --- a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_recon422.h | ||
21 | +++ b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_recon422.h | ||
22 | @@ -36,7 +36,9 @@ class Recon422 | ||
23 | public: | ||
24 | #define DECL_BLOCK_LIST\ | ||
25 | DECL_BLOCK(SetCallChain)\ | ||
26 | - DECL_BLOCK(SetRecon422Caps) | ||
27 | + DECL_BLOCK(SetRecon422Caps)\ | ||
28 | + DECL_BLOCK(HardcodeCaps)\ | ||
29 | + DECL_BLOCK(HardcodeCapsExt) | ||
30 | #define DECL_FEATURE_NAME "Base_RECON422" | ||
31 | #include "hevcehw_decl_blocks.h" | ||
32 | |||
33 | diff --git a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_recon422_ext.h b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_recon422_ext.h | ||
34 | index 165c96b1..63b3c301 100644 | ||
35 | --- a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_recon422_ext.h | ||
36 | +++ b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_recon422_ext.h | ||
37 | @@ -40,6 +40,17 @@ public: | ||
38 | {} | ||
39 | |||
40 | protected: | ||
41 | + virtual void Query1WithCaps(const FeatureBlocks& /*blocks*/, TPushQ1 Push) override | ||
42 | + { | ||
43 | + Push(BLK_HardcodeCaps | ||
44 | + , [this](const mfxVideoParam&, mfxVideoParam&, StorageRW& strg) -> mfxStatus | ||
45 | + { | ||
46 | + auto& caps = HEVCEHW::Base::Glob::EncodeCaps::Get(strg); | ||
47 | + caps.YUV422ReconSupport = !caps.Color420Only; | ||
48 | + return MFX_ERR_NONE; | ||
49 | + }); | ||
50 | + } | ||
51 | + | ||
52 | virtual void Query1NoCaps(const FeatureBlocks& blocks, TPushQ1 Push) override | ||
53 | { | ||
54 | using Base::Glob; | ||
55 | diff --git a/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_va_packer_lin.cpp b/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_va_packer_lin.cpp | ||
56 | index 1ffc9388..46a1f69c 100644 | ||
57 | --- a/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_va_packer_lin.cpp | ||
58 | +++ b/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_va_packer_lin.cpp | ||
59 | @@ -60,7 +60,7 @@ void VAPacker::Query1WithCaps(const FeatureBlocks& /*blocks*/, TPushQ1 Push) | ||
60 | |||
61 | caps.MaxEncodedBitDepth |= (!caps.BitDepth8Only); | ||
62 | caps.YUV444ReconSupport |= (!caps.Color420Only && IsOn(par.mfx.LowPower)); | ||
63 | - caps.YUV422ReconSupport &= (!caps.Color420Only); | ||
64 | + caps.YUV422ReconSupport &= (!caps.Color420Only && !IsOn(par.mfx.LowPower)); | ||
65 | |||
66 | return MFX_ERR_NONE; | ||
67 | }); | ||
68 | -- | ||
69 | 2.40.1 | ||
70 | |||
diff --git a/recipes-multimedia/onevpl/files/0001-RT-Common-Fix-MediaAdapterType-issue-5898.patch b/recipes-multimedia/onevpl/files/0001-RT-Common-Fix-MediaAdapterType-issue-5898.patch deleted file mode 100644 index 597cc14d..00000000 --- a/recipes-multimedia/onevpl/files/0001-RT-Common-Fix-MediaAdapterType-issue-5898.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From a694f724e9969575a9c993ff1769850de5673fee Mon Sep 17 00:00:00 2001 | ||
2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
3 | Date: Mon, 23 Oct 2023 16:57:50 +0800 | ||
4 | Subject: [PATCH] [RT Common] Fix MediaAdapterType issue (#5898) | ||
5 | |||
6 | Co-authored-by: Liu, Rachel <rachel.liu@intel.com> | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/a694f724e9969575a9c993ff1769850de5673fee] | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | _studio/mfx_lib/shared/src/libmfxsw.cpp | 9 +++++++++ | ||
12 | 1 file changed, 9 insertions(+) | ||
13 | |||
14 | diff --git a/_studio/mfx_lib/shared/src/libmfxsw.cpp b/_studio/mfx_lib/shared/src/libmfxsw.cpp | ||
15 | index 94982359..f85f2d75 100644 | ||
16 | --- a/_studio/mfx_lib/shared/src/libmfxsw.cpp | ||
17 | +++ b/_studio/mfx_lib/shared/src/libmfxsw.cpp | ||
18 | @@ -831,6 +831,15 @@ mfxHDL* MFX_CDECL MFXQueryImplsDescription(mfxImplCapsDeliveryFormat format, mfx | ||
19 | ah.PushBack(impl.PoolPolicies.Policy) = MFX_ALLOCATION_UNLIMITED; | ||
20 | ah.PushBack(impl.PoolPolicies.Policy) = MFX_ALLOCATION_LIMITED; | ||
21 | |||
22 | + impl.Dev.Version.Version = MFX_STRUCT_VERSION(1, 1); | ||
23 | + impl.Dev.MediaAdapterType = MFX_MEDIA_UNKNOWN; | ||
24 | + | ||
25 | + if (auto pCore1_19 = QueryCoreInterface<IVideoCore_API_1_19>(&core, MFXICORE_API_1_19_GUID)) | ||
26 | + { | ||
27 | + mfxPlatform platform = {}; | ||
28 | + if (MFX_ERR_NONE == pCore1_19->QueryPlatform(&platform)) | ||
29 | + impl.Dev.MediaAdapterType = platform.MediaAdapterType; | ||
30 | + } | ||
31 | |||
32 | snprintf(impl.Dev.DeviceID, sizeof(impl.Dev.DeviceID), "%x/%d", deviceId, adapterNum); | ||
33 | snprintf(impl.ImplName, sizeof(impl.ImplName), "mfx-gen"); | ||
34 | -- | ||
35 | 2.40.1 | ||
36 | |||
diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.3.4.bb b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb index 5ba4ff58..8db5ef52 100644 --- a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.3.4.bb +++ b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb | |||
@@ -18,11 +18,10 @@ DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native" | |||
18 | RDEPENDS:${PN} += "intel-media-driver" | 18 | RDEPENDS:${PN} += "intel-media-driver" |
19 | 19 | ||
20 | SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \ | 20 | SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \ |
21 | file://0001-Encode-Bugfix-for-HEVC-VDENC-422-RPL-caps-issue.-588.patch \ | 21 | file://0001-ARLH-DID-open-source-6286.patch \ |
22 | file://0001-RT-Common-Fix-MediaAdapterType-issue-5898.patch \ | ||
23 | " | 22 | " |
24 | 23 | ||
25 | SRCREV = "30963ed30d428ccaf3c80360c8657d9c831cb38c" | 24 | SRCREV = "852fa9f705ef44c004d014548601f3804a6de705" |
26 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
27 | 26 | ||
28 | FILES:${PN} += " \ | 27 | FILES:${PN} += " \ |