mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 12:59:03 +02:00
945c5bbb80
backport list code fixed for sample app from upstream: - 0001-Correct-va-attrib-for-vaapiallocator.patch - 0002-Enable-YUV400-JPEG-Enc-for-vaapi.patch - 0003-Enable-YUV400-JPEG-Enc-for-linux-vaapi-only.patch - 0004-Fix-rDRM-DMA-methods.patch - 0005-Force-allocator-to-use-DRM_PRIME-for-rDRM.patch - 0006-Enable-VVC-in-sample_decode.patch - 0007-Fix-X11-rendering-for-xe.patch - 0008-Fix-code-formatting.patch Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
62 lines
2.9 KiB
Diff
62 lines
2.9 KiB
Diff
From 75551817541a3b355eddadf3d5e32da31e5f4a31 Mon Sep 17 00:00:00 2001
|
|
From: Lim Siew Hoon <siew.hoon.lim@intel.com>
|
|
Date: Thu, 1 Aug 2024 11:07:42 +0800
|
|
Subject: [PATCH 6/9] Enable VVC in sample_decode.
|
|
|
|
Upstream-Status: Backport [https://github.com/intel/libvpl-tools/commit/5f0959abd9271d07c0ad97edd684d7c04d93350c]
|
|
|
|
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
|
|
---
|
|
tools/legacy/sample_common/src/sample_utils.cpp | 4 ++++
|
|
tools/legacy/sample_decode/src/sample_decode.cpp | 5 +++--
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/legacy/sample_common/src/sample_utils.cpp b/tools/legacy/sample_common/src/sample_utils.cpp
|
|
index b2b67bf..bd11af7 100644
|
|
--- a/tools/legacy/sample_common/src/sample_utils.cpp
|
|
+++ b/tools/legacy/sample_common/src/sample_utils.cpp
|
|
@@ -2435,6 +2435,7 @@ bool IsDecodeCodecSupported(mfxU32 codecFormat) {
|
|
case MFX_CODEC_VP8:
|
|
case MFX_CODEC_VP9:
|
|
case MFX_CODEC_AV1:
|
|
+ case MFX_CODEC_VVC:
|
|
break;
|
|
default:
|
|
return false;
|
|
@@ -2509,6 +2510,9 @@ mfxStatus StrFormatToCodecFormatFourCC(char* strInput, mfxU32& codecFormat) {
|
|
else if (msdk_match(strInput, "av1")) {
|
|
codecFormat = MFX_CODEC_AV1;
|
|
}
|
|
+ else if (msdk_match(strInput, "vvc")) {
|
|
+ codecFormat = MFX_CODEC_VVC;
|
|
+ }
|
|
else if ((msdk_match(strInput, "raw"))) {
|
|
codecFormat = MFX_CODEC_DUMP;
|
|
}
|
|
diff --git a/tools/legacy/sample_decode/src/sample_decode.cpp b/tools/legacy/sample_decode/src/sample_decode.cpp
|
|
index 8ebe4c5..33ab1f5 100644
|
|
--- a/tools/legacy/sample_decode/src/sample_decode.cpp
|
|
+++ b/tools/legacy/sample_decode/src/sample_decode.cpp
|
|
@@ -29,7 +29,7 @@ void PrintHelp(char* strAppName, const char* strErrorMessage) {
|
|
printf(" or: %s <codecid> [<options>] -i InputBitstream -o OutputYUVFile\n", strAppName);
|
|
printf("\n");
|
|
printf("Supported codecs (<codecid>):\n");
|
|
- printf(" <codecid>=h264|mpeg2|vc1|mvc|jpeg|vp9|av1 - built-in Media SDK codecs\n");
|
|
+ printf(" <codecid>=h264|mpeg2|vc1|mvc|jpeg|vp9|av1|vvc - built-in Media SDK codecs\n");
|
|
printf(
|
|
" <codecid>=h265|vp9|capture - in-box Media SDK plugins (may require separate downloading and installation)\n");
|
|
printf("\n");
|
|
@@ -798,7 +798,8 @@ mfxStatus ParseInputString(char* strInput[], mfxU32 nArgNum, sInputParams* pPara
|
|
if (MFX_CODEC_MPEG2 != pParams->videoType && MFX_CODEC_AVC != pParams->videoType &&
|
|
MFX_CODEC_HEVC != pParams->videoType && MFX_CODEC_VC1 != pParams->videoType &&
|
|
MFX_CODEC_JPEG != pParams->videoType && MFX_CODEC_VP8 != pParams->videoType &&
|
|
- MFX_CODEC_VP9 != pParams->videoType && MFX_CODEC_AV1 != pParams->videoType) {
|
|
+ MFX_CODEC_VP9 != pParams->videoType && MFX_CODEC_AV1 != pParams->videoType &&
|
|
+ MFX_CODEC_VVC != pParams->videoType) {
|
|
PrintHelp(strInput[0], "Unknown codec");
|
|
return MFX_ERR_UNSUPPORTED;
|
|
}
|
|
--
|
|
2.43.2
|
|
|