From a3b37815ce997e12ce1b83f35edc8f29ffa71fbc Mon Sep 17 00:00:00 2001 From: bai-isaac Date: Wed, 18 Sep 2024 18:51:44 +0800 Subject: [PATCH] [Encode] update Xe2 encode caps update Xe2 encode caps. --- .../ddi/capstable_data_xe2_hpm_r0_specific.h | 2 +- .../ddi/capstable_data_xe2_lpm_r0_specific.h | 12 +- .../linux/xe2_lpm_r0/encode/media_srcs.cmake | 1 - ...able_data_vp9_encode_xe2_lpm_r0_specific.h | 277 ------------------ .../encode/vp9/ddi/media_srcs.cmake | 33 --- .../xe2_lpm_r0/encode/vp9/media_srcs.cmake | 21 -- 6 files changed, 7 insertions(+), 339 deletions(-) delete mode 100644 media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/capstable_data_vp9_encode_xe2_lpm_r0_specific.h delete mode 100644 media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/media_srcs.cmake delete mode 100644 media_softlet/linux/xe2_lpm_r0/encode/vp9/media_srcs.cmake diff --git a/media_softlet/linux/xe2_hpm_r0/ddi/capstable_data_xe2_hpm_r0_specific.h b/media_softlet/linux/xe2_hpm_r0/ddi/capstable_data_xe2_hpm_r0_specific.h index 23ed29be467..b039c1bb6b8 100644 --- a/media_softlet/linux/xe2_hpm_r0/ddi/capstable_data_xe2_hpm_r0_specific.h +++ b/media_softlet/linux/xe2_hpm_r0/ddi/capstable_data_xe2_hpm_r0_specific.h @@ -358,7 +358,7 @@ static const ProfileMap profileMap_Xe2_Hpm_r0 {VAProfileJPEGBaseline, &entrypointMap_VAProfileJPEGBaseline_Xe2_Hpm_r0}, #endif -#if defined(_AV1_DECODE_SUPPORTED) +#if defined(_AV1_ENCODE_VDENC_SUPPORTED) || defined(_AV1_DECODE_SUPPORTED) {VAProfileAV1Profile0, &entrypointMap_VAProfileAV1Profile0_Xe2_Hpm_r0}, #endif diff --git a/media_softlet/linux/xe2_lpm_r0/ddi/capstable_data_xe2_lpm_r0_specific.h b/media_softlet/linux/xe2_lpm_r0/ddi/capstable_data_xe2_lpm_r0_specific.h index 4fa4529bb6e..110ad420dd3 100644 --- a/media_softlet/linux/xe2_lpm_r0/ddi/capstable_data_xe2_lpm_r0_specific.h +++ b/media_softlet/linux/xe2_lpm_r0/ddi/capstable_data_xe2_lpm_r0_specific.h @@ -40,7 +40,7 @@ #if defined(_AV1_ENCODE_VDENC_SUPPORTED) #include "capstable_data_av1_encode_xe2_lpm_r0_specific.h" #endif -#if defined(_VP9_ENCODE_VDENC_SUPPORTED) +#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED) #include "capstable_data_vp9_encode_xe2_lpm_r0_specific.h" #endif @@ -295,7 +295,7 @@ static const EntrypointMap entrypointMap_VAProfileAV1Profile0_Xe2_Lpm_r0 static const EntrypointMap entrypointMap_VAProfileVP9Profile0_Xe2_Lpm_r0 { -#if defined(_VP9_ENCODE_VDENC_SUPPORTED) +#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED) {VAEntrypointEncSlice, &entrypointMap_VAProfileVP9Profile0_Data_Xe2_Lpm_r0}, #endif @@ -306,7 +306,7 @@ static const EntrypointMap entrypointMap_VAProfileVP9Profile0_Xe2_Lpm_r0 static const EntrypointMap entrypointMap_VAProfileVP9Profile1_Xe2_Lpm_r0 { -#if defined(_VP9_ENCODE_VDENC_SUPPORTED) +#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED) {VAEntrypointEncSlice, &entrypointMap_VAProfileVP9Profile1_Data_Xe2_Lpm_r0}, #endif @@ -317,7 +317,7 @@ static const EntrypointMap entrypointMap_VAProfileVP9Profile1_Xe2_Lpm_r0 static const EntrypointMap entrypointMap_VAProfileVP9Profile2_Xe2_Lpm_r0 { -#if defined(_VP9_ENCODE_VDENC_SUPPORTED) +#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED) {VAEntrypointEncSlice, &entrypointMap_VAProfileVP9Profile2_Data_Xe2_Lpm_r0}, #endif @@ -328,7 +328,7 @@ static const EntrypointMap entrypointMap_VAProfileVP9Profile2_Xe2_Lpm_r0 static const EntrypointMap entrypointMap_VAProfileVP9Profile3_Xe2_Lpm_r0 { -#if defined(_VP9_ENCODE_VDENC_SUPPORTED) +#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED) {VAEntrypointEncSlice, &entrypointMap_VAProfileVP9Profile3_Data_Xe2_Lpm_r0}, #endif @@ -412,7 +412,7 @@ static const ProfileMap profileMap_Xe2_Lpm_r0 {VAProfileAV1Profile0, &entrypointMap_VAProfileAV1Profile0_Xe2_Lpm_r0}, #endif -#if defined(_VP9_ENCODE_VDENC_SUPPORTED) || defined(_VP9_DECODE_SUPPORTED) +#if (defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED)) || defined(_VP9_DECODE_SUPPORTED) {VAProfileVP9Profile3, &entrypointMap_VAProfileVP9Profile3_Xe2_Lpm_r0}, {VAProfileVP9Profile2, &entrypointMap_VAProfileVP9Profile2_Xe2_Lpm_r0}, {VAProfileVP9Profile1, &entrypointMap_VAProfileVP9Profile1_Xe2_Lpm_r0}, diff --git a/media_softlet/linux/xe2_lpm_r0/encode/media_srcs.cmake b/media_softlet/linux/xe2_lpm_r0/encode/media_srcs.cmake index 08c8c4ee08c..516667c3bae 100644 --- a/media_softlet/linux/xe2_lpm_r0/encode/media_srcs.cmake +++ b/media_softlet/linux/xe2_lpm_r0/encode/media_srcs.cmake @@ -22,4 +22,3 @@ media_include_subdirectory(hevc) media_include_subdirectory(avc) media_include_subdirectory(jpeg) media_include_subdirectory(av1) -media_include_subdirectory(vp9) diff --git a/media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/capstable_data_vp9_encode_xe2_lpm_r0_specific.h b/media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/capstable_data_vp9_encode_xe2_lpm_r0_specific.h deleted file mode 100644 index f5668e1ce4b..00000000000 --- a/media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/capstable_data_vp9_encode_xe2_lpm_r0_specific.h +++ /dev/null @@ -1,277 +0,0 @@ -/* -* Copyright (c) 2023, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ -//! -//! \file capstable_data_vp9_encode_xe2_lpm_r0_specific.h -//! \brief This file register all caps data -//! - -#ifndef __CAPSTABLE_DATA_VP9_ENCODE_XE2_LPM_R0_SPECIFIC_H__ -#define __CAPSTABLE_DATA_VP9_ENCODE_XE2_LPM_R0_SPECIFIC_H__ - -#include "capstable_data_xe2_lpm_r0_specific.h" -#include "codec_def_encode_vp9.h" - -//! -//! \brief Definition for bitset value -//! -static const VAConfigAttribValEncROI VP9Common_VAEntrypointEncSlice_encROI_Xe2_Lpm_r0 -{ - {0,0,1,0} -}; - -static const VAConfigAttribValEncRateControlExt VP9Common_VAEntrypointEncSlice_encRateControlExt_Xe2_Lpm_r0 -{ - {CODECHAL_ENCODE_VP9_MAX_NUM_TEMPORAL_LAYERS - 1,1,0} -}; - -#if VA_CHECK_VERSION(1, 23, 0) -static const VAConfigAttribValEncVP9 VP9Common_VAEntrypointEncSlice_encVP9_Xe2_Lpm_r0 -{ - {15,0,0} -}; -#endif - -//! \brief Definition for ConfigDataList -static ConfigDataList configDataList_VAProfileVP9Profile0_VAEntrypointEncSlice_Xe2_Lpm_r0 = -{ - {VA_RC_CQP, 0}, - {VA_RC_CBR, 0}, - {VA_RC_VBR, 0}, - {VA_RC_ICQ, 0} -}; - -static ConfigDataList configDataList_VAProfileVP9Profile1_VAEntrypointEncSlice_Xe2_Lpm_r0 = -{ - {VA_RC_CQP, 0}, - {VA_RC_CBR, 0}, - {VA_RC_VBR, 0}, - {VA_RC_ICQ, 0} -}; - -static ConfigDataList configDataList_VAProfileVP9Profile2_VAEntrypointEncSlice_Xe2_Lpm_r0 = -{ - {VA_RC_CQP, 0}, - {VA_RC_CBR, 0}, - {VA_RC_VBR, 0}, - {VA_RC_ICQ, 0} -}; - -static ConfigDataList configDataList_VAProfileVP9Profile3_VAEntrypointEncSlice_Xe2_Lpm_r0 = -{ - {VA_RC_CQP, 0}, - {VA_RC_CBR, 0}, - {VA_RC_VBR, 0}, - {VA_RC_ICQ, 0} -}; - -//! -//! \brief Definition for AttribList -//! -static const AttribList attribList_VAProfileVP9Profile0_VAEntrypointEncSlice_Xe2_Lpm_r0 -{ - {VAConfigAttribRTFormat, VA_RT_FORMAT_YUV420 | VA_RT_FORMAT_YUV420_10 | VA_RT_FORMAT_YUV444 | VA_RT_FORMAT_YUV444_10 | VA_RT_FORMAT_RGB32 | VA_RT_FORMAT_RGB32_10}, - {VAConfigAttribMaxPictureWidth, CODEC_8K_MAX_PIC_WIDTH}, - {VAConfigAttribMaxPictureHeight, CODEC_8K_MAX_PIC_HEIGHT}, - {VAConfigAttribEncPackedHeaders, VA_ENC_PACKED_HEADER_RAW_DATA}, - {VAConfigAttribEncMaxRefFrames, 2}, -#if VA_CHECK_VERSION(1, 23, 0) - {VAConfigAttribEncVP9, VP9Common_VAEntrypointEncSlice_encVP9_Xe2_Lpm_r0.value}, -#endif - {VAConfigAttribRateControl, VA_RC_CQP | VA_RC_ICQ | VA_RC_CBR | VA_RC_VBR | VA_RC_MB}, - {VAConfigAttribProcessingRate, VA_PROCESSING_RATE_ENCODE}, - {VAConfigAttribEncTileSupport, 1}, - {VAConfigAttribEncDirtyRect, 4}, - {VAConfigAttribEncDynamicScaling, 1}, - {VAConfigAttribEncQualityRange, NUM_TARGET_USAGE_MODES - 1}, - {VAConfigAttribEncInterlaced, VA_ENC_INTERLACED_NONE}, - {VAConfigAttribEncQuantization, VA_ENC_QUANTIZATION_NONE}, - {VAConfigAttribEncMaxSlices, 0}, - {VAConfigAttribEncSliceStructure, VA_ENC_SLICE_STRUCTURE_EQUAL_ROWS | VA_ENC_SLICE_STRUCTURE_MAX_SLICE_SIZE | VA_ENC_SLICE_STRUCTURE_EQUAL_MULTI_ROWS | VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS}, - {VAConfigAttribEncIntraRefresh, VA_ENC_INTRA_REFRESH_NONE}, - {VAConfigAttribEncSkipFrame, 0}, - {VAConfigAttribEncROI, VP9Common_VAEntrypointEncSlice_encROI_Xe2_Lpm_r0.value}, - {VAConfigAttribEncParallelRateControl, 0}, - {VAConfigAttribFEIMVPredictors, 0}, - {VAConfigAttribEncRateControlExt, VP9Common_VAEntrypointEncSlice_encRateControlExt_Xe2_Lpm_r0.value}, -}; - -static const AttribList attribList_VAProfileVP9Profile1_VAEntrypointEncSlice_Xe2_Lpm_r0 -{ - {VAConfigAttribRTFormat, VA_RT_FORMAT_YUV420 | VA_RT_FORMAT_YUV420_10 | VA_RT_FORMAT_YUV444 | VA_RT_FORMAT_YUV444_10 | VA_RT_FORMAT_RGB32 | VA_RT_FORMAT_RGB32_10}, - {VAConfigAttribMaxPictureWidth, CODEC_8K_MAX_PIC_WIDTH}, - {VAConfigAttribMaxPictureHeight, CODEC_8K_MAX_PIC_HEIGHT}, - {VAConfigAttribEncPackedHeaders, VA_ENC_PACKED_HEADER_RAW_DATA}, - {VAConfigAttribEncMaxRefFrames, 2}, -#if VA_CHECK_VERSION(1, 23, 0) - {VAConfigAttribEncVP9, VP9Common_VAEntrypointEncSlice_encVP9_Xe2_Lpm_r0.value}, -#endif - {VAConfigAttribRateControl, VA_RC_CQP | VA_RC_ICQ | VA_RC_CBR | VA_RC_VBR | VA_RC_MB}, - {VAConfigAttribProcessingRate, VA_PROCESSING_RATE_ENCODE}, - {VAConfigAttribEncTileSupport, 1}, - {VAConfigAttribEncDirtyRect, 4}, - {VAConfigAttribEncDynamicScaling, 1}, - {VAConfigAttribEncQualityRange, NUM_TARGET_USAGE_MODES - 1}, - {VAConfigAttribEncInterlaced, VA_ENC_INTERLACED_NONE}, - {VAConfigAttribEncQuantization, VA_ENC_QUANTIZATION_NONE}, - {VAConfigAttribEncMaxSlices, 0}, - {VAConfigAttribEncSliceStructure, VA_ENC_SLICE_STRUCTURE_EQUAL_ROWS | VA_ENC_SLICE_STRUCTURE_MAX_SLICE_SIZE | VA_ENC_SLICE_STRUCTURE_EQUAL_MULTI_ROWS | VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS}, - {VAConfigAttribEncIntraRefresh, VA_ENC_INTRA_REFRESH_NONE}, - {VAConfigAttribEncSkipFrame, 0}, - {VAConfigAttribEncROI, VP9Common_VAEntrypointEncSlice_encROI_Xe2_Lpm_r0.value}, - {VAConfigAttribEncParallelRateControl, 0}, - {VAConfigAttribFEIMVPredictors, 0}, - {VAConfigAttribEncRateControlExt, VP9Common_VAEntrypointEncSlice_encRateControlExt_Xe2_Lpm_r0.value}, -}; - -static const AttribList attribList_VAProfileVP9Profile2_VAEntrypointEncSlice_Xe2_Lpm_r0 -{ - {VAConfigAttribRTFormat, VA_RT_FORMAT_YUV420 | VA_RT_FORMAT_YUV420_10 | VA_RT_FORMAT_YUV444 | VA_RT_FORMAT_YUV444_10 | VA_RT_FORMAT_RGB32 | VA_RT_FORMAT_RGB32_10}, - {VAConfigAttribMaxPictureWidth, CODEC_8K_MAX_PIC_WIDTH}, - {VAConfigAttribMaxPictureHeight, CODEC_8K_MAX_PIC_HEIGHT}, - {VAConfigAttribEncPackedHeaders, VA_ENC_PACKED_HEADER_RAW_DATA}, - {VAConfigAttribEncMaxRefFrames, 2}, -#if VA_CHECK_VERSION(1, 23, 0) - {VAConfigAttribEncVP9, VP9Common_VAEntrypointEncSlice_encVP9_Xe2_Lpm_r0.value}, -#endif - {VAConfigAttribRateControl, VA_RC_CQP | VA_RC_ICQ | VA_RC_CBR | VA_RC_VBR | VA_RC_MB}, - {VAConfigAttribProcessingRate, VA_PROCESSING_RATE_ENCODE}, - {VAConfigAttribEncTileSupport, 1}, - {VAConfigAttribEncDirtyRect, 4}, - {VAConfigAttribEncDynamicScaling, 1}, - {VAConfigAttribEncQualityRange, NUM_TARGET_USAGE_MODES - 1}, - {VAConfigAttribEncInterlaced, VA_ENC_INTERLACED_NONE}, - {VAConfigAttribEncQuantization, VA_ENC_QUANTIZATION_NONE}, - {VAConfigAttribEncMaxSlices, 0}, - {VAConfigAttribEncSliceStructure, VA_ENC_SLICE_STRUCTURE_EQUAL_ROWS | VA_ENC_SLICE_STRUCTURE_MAX_SLICE_SIZE | VA_ENC_SLICE_STRUCTURE_EQUAL_MULTI_ROWS | VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS}, - {VAConfigAttribEncIntraRefresh, VA_ENC_INTRA_REFRESH_NONE}, - {VAConfigAttribEncSkipFrame, 0}, - {VAConfigAttribEncROI, VP9Common_VAEntrypointEncSlice_encROI_Xe2_Lpm_r0.value}, - {VAConfigAttribEncParallelRateControl, 0}, - {VAConfigAttribFEIMVPredictors, 0}, - {VAConfigAttribEncRateControlExt, VP9Common_VAEntrypointEncSlice_encRateControlExt_Xe2_Lpm_r0.value}, -}; - -static const AttribList attribList_VAProfileVP9Profile3_VAEntrypointEncSlice_Xe2_Lpm_r0 -{ - {VAConfigAttribRTFormat, VA_RT_FORMAT_YUV420 | VA_RT_FORMAT_YUV420_10 | VA_RT_FORMAT_YUV444 | VA_RT_FORMAT_YUV444_10 | VA_RT_FORMAT_RGB32 | VA_RT_FORMAT_RGB32_10}, - {VAConfigAttribMaxPictureWidth, CODEC_8K_MAX_PIC_WIDTH}, - {VAConfigAttribMaxPictureHeight, CODEC_8K_MAX_PIC_HEIGHT}, - {VAConfigAttribEncPackedHeaders, VA_ENC_PACKED_HEADER_RAW_DATA}, - {VAConfigAttribEncMaxRefFrames, 2}, -#if VA_CHECK_VERSION(1, 23, 0) - {VAConfigAttribEncVP9, VP9Common_VAEntrypointEncSlice_encVP9_Xe2_Lpm_r0.value}, -#endif - {VAConfigAttribRateControl, VA_RC_CQP | VA_RC_ICQ | VA_RC_CBR | VA_RC_VBR | VA_RC_MB}, - {VAConfigAttribProcessingRate, VA_PROCESSING_RATE_ENCODE}, - {VAConfigAttribEncTileSupport, 1}, - {VAConfigAttribEncDirtyRect, 4}, - {VAConfigAttribEncDynamicScaling, 1}, - {VAConfigAttribEncQualityRange, NUM_TARGET_USAGE_MODES - 1}, - {VAConfigAttribEncInterlaced, VA_ENC_INTERLACED_NONE}, - {VAConfigAttribEncQuantization, VA_ENC_QUANTIZATION_NONE}, - {VAConfigAttribEncMaxSlices, 0}, - {VAConfigAttribEncSliceStructure, VA_ENC_SLICE_STRUCTURE_EQUAL_ROWS | VA_ENC_SLICE_STRUCTURE_MAX_SLICE_SIZE | VA_ENC_SLICE_STRUCTURE_EQUAL_MULTI_ROWS | VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS}, - {VAConfigAttribEncIntraRefresh, VA_ENC_INTRA_REFRESH_NONE}, - {VAConfigAttribEncSkipFrame, 0}, - {VAConfigAttribEncROI, VP9Common_VAEntrypointEncSlice_encROI_Xe2_Lpm_r0.value}, - {VAConfigAttribEncParallelRateControl, 0}, - {VAConfigAttribFEIMVPredictors, 0}, - {VAConfigAttribEncRateControlExt, VP9Common_VAEntrypointEncSlice_encRateControlExt_Xe2_Lpm_r0.value}, -}; - -//! -static ProfileSurfaceAttribInfo surfaceAttribInfo_VAProfileVP9Profile0_VAEntrypointEncSlice_Xe2_Lpm_r0 = -{ - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_NV12}}}, - {VASurfaceAttribMaxWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {8192}}}, - {VASurfaceAttribMaxHeight, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {8192}}}, - {VASurfaceAttribMinWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {128}}}, - {VASurfaceAttribMinHeight, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {96}}}, - {VASurfaceAttribMemoryType, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_SURFACE_ATTRIB_MEM_TYPE_VA | VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2}}} -}; - -static ProfileSurfaceAttribInfo surfaceAttribInfo_VAProfileVP9Profile1_VAEntrypointEncSlice_Xe2_Lpm_r0 = -{ - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_AYUV}}}, -#if VA_CHECK_VERSION(1, 13, 0) - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_XYUV}}}, -#endif - {VASurfaceAttribMaxWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {8192}}}, - {VASurfaceAttribMaxHeight, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {8192}}}, - {VASurfaceAttribMinWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {128}}}, - {VASurfaceAttribMinHeight, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {96}}}, - {VASurfaceAttribMemoryType, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_SURFACE_ATTRIB_MEM_TYPE_VA | VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2}}} -}; - -static ProfileSurfaceAttribInfo surfaceAttribInfo_VAProfileVP9Profile2_VAEntrypointEncSlice_Xe2_Lpm_r0 = -{ - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_P010}}}, - {VASurfaceAttribMaxWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {8192}}}, - {VASurfaceAttribMaxHeight, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {8192}}}, - {VASurfaceAttribMinWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {128}}}, - {VASurfaceAttribMinHeight, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {96}}}, - {VASurfaceAttribMemoryType, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_SURFACE_ATTRIB_MEM_TYPE_VA | VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2}}} -}; - -static ProfileSurfaceAttribInfo surfaceAttribInfo_VAProfileVP9Profile3_VAEntrypointEncSlice_Xe2_Lpm_r0 = -{ - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_Y410}}}, - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_ARGB}}}, - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_ABGR}}}, - {VASurfaceAttribMaxWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {8192}}}, - {VASurfaceAttribMaxHeight, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {8192}}}, - {VASurfaceAttribMinWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {128}}}, - {VASurfaceAttribMinHeight, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {96}}}, - {VASurfaceAttribMemoryType, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_SURFACE_ATTRIB_MEM_TYPE_VA | VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2}}} -}; - -//! -//! \brief Definition for EmtrypointMap -//! -static const EntrypointData entrypointMap_VAProfileVP9Profile0_Data_Xe2_Lpm_r0 -{ - &attribList_VAProfileVP9Profile0_VAEntrypointEncSlice_Xe2_Lpm_r0, - &configDataList_VAProfileVP9Profile0_VAEntrypointEncSlice_Xe2_Lpm_r0, - &surfaceAttribInfo_VAProfileVP9Profile0_VAEntrypointEncSlice_Xe2_Lpm_r0 -}; - -static const EntrypointData entrypointMap_VAProfileVP9Profile1_Data_Xe2_Lpm_r0 -{ - &attribList_VAProfileVP9Profile1_VAEntrypointEncSlice_Xe2_Lpm_r0, - &configDataList_VAProfileVP9Profile1_VAEntrypointEncSlice_Xe2_Lpm_r0, - &surfaceAttribInfo_VAProfileVP9Profile1_VAEntrypointEncSlice_Xe2_Lpm_r0 -}; - -static const EntrypointData entrypointMap_VAProfileVP9Profile2_Data_Xe2_Lpm_r0 -{ - &attribList_VAProfileVP9Profile2_VAEntrypointEncSlice_Xe2_Lpm_r0, - &configDataList_VAProfileVP9Profile2_VAEntrypointEncSlice_Xe2_Lpm_r0, - &surfaceAttribInfo_VAProfileVP9Profile2_VAEntrypointEncSlice_Xe2_Lpm_r0 -}; - -static const EntrypointData entrypointMap_VAProfileVP9Profile3_Data_Xe2_Lpm_r0 -{ - &attribList_VAProfileVP9Profile3_VAEntrypointEncSlice_Xe2_Lpm_r0, - &configDataList_VAProfileVP9Profile3_VAEntrypointEncSlice_Xe2_Lpm_r0, - &surfaceAttribInfo_VAProfileVP9Profile3_VAEntrypointEncSlice_Xe2_Lpm_r0 -}; - -#endif diff --git a/media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/media_srcs.cmake b/media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/media_srcs.cmake deleted file mode 100644 index b9b8032a1d1..00000000000 --- a/media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/media_srcs.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2023, Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. - -set (TMP_HEADERS_ - ${CMAKE_CURRENT_LIST_DIR}/capstable_data_vp9_encode_xe2_lpm_r0_specific.h -) - -set (SOFTLET_DDI_HEADERS_ - ${SOFTLET_DDI_HEADERS_} - ${TMP_HEADERS_} -) - -set(SOFTLET_DDI_PUBLIC_INCLUDE_DIRS_ - ${SOFTLET_DDI_PUBLIC_INCLUDE_DIRS_} - ${CMAKE_CURRENT_LIST_DIR} -) \ No newline at end of file diff --git a/media_softlet/linux/xe2_lpm_r0/encode/vp9/media_srcs.cmake b/media_softlet/linux/xe2_lpm_r0/encode/vp9/media_srcs.cmake deleted file mode 100644 index c98836a05e8..00000000000 --- a/media_softlet/linux/xe2_lpm_r0/encode/vp9/media_srcs.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2023, Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. - -media_include_subdirectory(ddi) \ No newline at end of file