diff options
| author | Lim Siew Hoon <siew.hoon.lim@intel.com> | 2024-05-07 13:13:09 +0800 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2024-05-08 10:30:43 +0800 |
| commit | 52f5037453e797eca8784a410f7a2a55f40aef57 (patch) | |
| tree | 8677bed7273e1be007f3718e7f4b51a41cc72393 /recipes-multimedia/onevpl | |
| parent | 3d77cd745a0621dcbf35709acf36f2ca498c47a2 (diff) | |
| download | meta-intel-52f5037453e797eca8784a410f7a2a55f40aef57.tar.gz | |
vpl-gpu-rt: Rename and upgrade 23.4.3 -> 24.1.5
Drops patches already merged:
- 0001-ARLH-DID-open-source-6286.patch
- 0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch
- 0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.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/onevpl')
4 files changed, 0 insertions, 200 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 deleted file mode 100644 index 8d1f3380..00000000 --- a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 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-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch b/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch deleted file mode 100644 index 8e014c97..00000000 --- a/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From e118062518c95d8fb0080cc8276b123a90bd0eb9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
| 3 | Date: Wed, 21 Feb 2024 17:11:52 +0800 | ||
| 4 | Subject: [PATCH] Fix SetBuffersYV12() V & U plane offsets calculation (#6475) | ||
| 5 | |||
| 6 | Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com> | ||
| 7 | Co-authored-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com> | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/ce704ddfe11724767ba86c9425a3917dc3100d4a] | ||
| 10 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
| 11 | --- | ||
| 12 | _studio/shared/src/libmfx_core_vaapi.cpp | 4 ++-- | ||
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/_studio/shared/src/libmfx_core_vaapi.cpp b/_studio/shared/src/libmfx_core_vaapi.cpp | ||
| 16 | index 2cad86f8..fd5fc269 100644 | ||
| 17 | --- a/_studio/shared/src/libmfx_core_vaapi.cpp | ||
| 18 | +++ b/_studio/shared/src/libmfx_core_vaapi.cpp | ||
| 19 | @@ -462,8 +462,8 @@ public: | ||
| 20 | } | ||
| 21 | else | ||
| 22 | { | ||
| 23 | - eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[1] / 2); | ||
| 24 | - eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[2] / 2); | ||
| 25 | + eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[0]); | ||
| 26 | + eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[1] / 2); | ||
| 27 | } | ||
| 28 | eb.num_planes = 3; | ||
| 29 | eb.data_size = eb.offsets[2] + (eb.height * eb.pitches[2] / 2); | ||
| 30 | -- | ||
| 31 | 2.40.1 | ||
| 32 | |||
diff --git a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch b/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch deleted file mode 100644 index e3854407..00000000 --- a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch +++ /dev/null | |||
| @@ -1,96 +0,0 @@ | |||
| 1 | From 40c0bc6d3dfe172dd25908df2c16de29c34fa4d4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
| 3 | Date: Mon, 5 Feb 2024 17:14:07 +0800 | ||
| 4 | Subject: [PATCH] [JPEGe] Enable BGR4 JPEG Enc support (#6470) | ||
| 5 | |||
| 6 | Co-authored-by: vcheah <vincent.beng.keat.cheah@intel.com> | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/e73763d05f8fdc348c356b58dcb83075b5e868f8] | ||
| 9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
| 10 | --- | ||
| 11 | .../mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | 6 ++++-- | ||
| 12 | .../encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | 9 +++++---- | ||
| 13 | 2 files changed, 9 insertions(+), 6 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | ||
| 16 | index 141564b1..332f6372 100644 | ||
| 17 | --- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | ||
| 18 | +++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | ||
| 19 | @@ -212,7 +212,8 @@ mfxStatus MFXVideoENCODEMJPEG_HW::QueryImplsDescription( | ||
| 20 | ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YV12; | ||
| 21 | ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YUY2; | ||
| 22 | ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_RGB4; | ||
| 23 | - memCaps.NumColorFormats = 4; | ||
| 24 | + ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_BGR4; | ||
| 25 | + memCaps.NumColorFormats = 5; | ||
| 26 | |||
| 27 | ah.PushBack(profileCaps.MemDesc); | ||
| 28 | profileCaps.MemDesc[1] = profileCaps.MemDesc[0]; | ||
| 29 | @@ -392,7 +393,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Query(VideoCORE * core, mfxVideoParam *in, mfx | ||
| 30 | if ((fourCC == 0 && chromaFormat == 0) || | ||
| 31 | (fourCC == MFX_FOURCC_NV12 && (chromaFormat == MFX_CHROMAFORMAT_YUV420 || chromaFormat == MFX_CHROMAFORMAT_YUV400)) || | ||
| 32 | (fourCC == MFX_FOURCC_YUY2 && chromaFormat == MFX_CHROMAFORMAT_YUV422H) || | ||
| 33 | - (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444)) | ||
| 34 | + ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444)) | ||
| 35 | { | ||
| 36 | out->mfx.FrameInfo.FourCC = in->mfx.FrameInfo.FourCC; | ||
| 37 | out->mfx.FrameInfo.ChromaFormat = in->mfx.FrameInfo.ChromaFormat; | ||
| 38 | @@ -698,6 +699,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Init(mfxVideoParam *par) | ||
| 39 | doubleBytesPerPx = 4; | ||
| 40 | break; | ||
| 41 | case MFX_FOURCC_RGB4: | ||
| 42 | + case MFX_FOURCC_BGR4: | ||
| 43 | default: | ||
| 44 | doubleBytesPerPx = 8; | ||
| 45 | break; | ||
| 46 | diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | ||
| 47 | index 3fc619d1..b1ab556e 100644 | ||
| 48 | --- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | ||
| 49 | +++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | ||
| 50 | @@ -108,6 +108,7 @@ mfxStatus MfxHwMJpegEncode::CheckJpegParam(VideoCORE *core, mfxVideoParam & par, | ||
| 51 | BytesPerPx = 2; | ||
| 52 | break; | ||
| 53 | case MFX_FOURCC_RGB4: | ||
| 54 | + case MFX_FOURCC_BGR4: | ||
| 55 | default: | ||
| 56 | BytesPerPx = 4; | ||
| 57 | } | ||
| 58 | @@ -157,7 +158,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
| 59 | |||
| 60 | m_payload_base.length = 0; | ||
| 61 | m_payload_list.clear(); | ||
| 62 | - if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
| 63 | + if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
| 64 | { | ||
| 65 | m_app14_data.header = 0xEEFF;//APP14 | ||
| 66 | m_app14_data.lenH = 0; | ||
| 67 | @@ -287,7 +288,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
| 68 | m_pps.num_components = 3; | ||
| 69 | else if (fourCC == MFX_FOURCC_NV12 && chromaFormat == MFX_CHROMAFORMAT_YUV400) | ||
| 70 | m_pps.num_components = 1; | ||
| 71 | - else if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
| 72 | + else if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
| 73 | m_pps.num_components = 3; | ||
| 74 | else | ||
| 75 | MFX_RETURN(MFX_ERR_UNDEFINED_BEHAVIOR); | ||
| 76 | @@ -341,7 +342,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
| 77 | { | ||
| 78 | // No external tables - use Quality parameter | ||
| 79 | m_dqt_list.resize(0); | ||
| 80 | - if (fourCC == MFX_FOURCC_RGB4) | ||
| 81 | + if (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) | ||
| 82 | { | ||
| 83 | m_pps.quantiser_table_selector[0] = 0; | ||
| 84 | m_pps.quantiser_table_selector[1] = 0; | ||
| 85 | @@ -393,7 +394,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
| 86 | { | ||
| 87 | m_dht_list.resize(0); | ||
| 88 | } | ||
| 89 | - else if (hwCaps->MaxNumHuffTable == 1 || fourCC == MFX_FOURCC_RGB4) | ||
| 90 | + else if (hwCaps->MaxNumHuffTable == 1 || (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4)) | ||
| 91 | { | ||
| 92 | m_dht_list.resize(1); | ||
| 93 | |||
| 94 | -- | ||
| 95 | 2.40.1 | ||
| 96 | |||
diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb deleted file mode 100644 index 0b849bf1..00000000 --- a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | SUMMARY = "Intel(R) oneVPL runtime for Intel GPU accelerated media processing" | ||
| 2 | DESCRIPTION = "Intel(R) oneVPL runtime provides an runtime to access hardware-accelerated \ | ||
| 3 | video decode, encode and filtering on IntelĀ® graphics." | ||
| 4 | |||
| 5 | HOMEPAGE = "https://github.com/oneapi-src/oneVPL-intel-gpu" | ||
| 6 | BUGTRACKER = "https://github.com/oneapi-src/oneVPL-intel-gpu/issues" | ||
| 7 | |||
| 8 | LICENSE = "MIT" | ||
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb8cb45b9b57dbaa9fcc9adc4230202b" | ||
| 10 | |||
| 11 | PE = "1" | ||
| 12 | |||
| 13 | # Only for 64 bit | ||
| 14 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
| 15 | COMPATIBLE_HOST:x86-x32 = "null" | ||
| 16 | |||
| 17 | DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native" | ||
| 18 | RDEPENDS:${PN} += "intel-media-driver" | ||
| 19 | |||
| 20 | SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \ | ||
| 21 | file://0001-ARLH-DID-open-source-6286.patch \ | ||
| 22 | file://0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch \ | ||
| 23 | file://0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch \ | ||
| 24 | " | ||
| 25 | |||
| 26 | SRCREV = "852fa9f705ef44c004d014548601f3804a6de705" | ||
| 27 | S = "${WORKDIR}/git" | ||
| 28 | |||
| 29 | FILES:${PN} += " \ | ||
| 30 | ${libdir}/libmfx-gen/enctools.so \ | ||
| 31 | " | ||
| 32 | |||
| 33 | inherit cmake | ||
