[Encode] Correct caps and disable ULT

Refine linux caps
intel · Sep 5, 2023 · c57bdcc · c57bdcc
1 parent 82a4eb9
commit c57bdcc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26 deletions.
diff --git a/...t/linux/xe_lpm_plus_r0/encode/av1/ddi/capstable_data_av1_encode_xe_lpm_plus_r0_specific.h b/...t/linux/xe_lpm_plus_r0/encode/av1/ddi/capstable_data_av1_encode_xe_lpm_plus_r0_specific.h
@@ -76,21 +76,16 @@ static const AttribList attribList_VAProfileAV1Profile0_VAEntrypointEncSliceLP_X
    {VAConfigAttribRateControl, VA_RC_CQP | VA_RC_CBR | VA_RC_VBR},
    {VAConfigAttribEncTileSupport, 1},
    {VAConfigAttribEncMaxRefFrames, CODEC_AV1_NUM_REFL0P_FRAMES | CODEC_AV1_NUM_REFL1B_FRAMES<<16},
-   {VAConfigAttribEncJPEG, (JPEG_MAX_QUANT_TABLE << 14)| (JPEG_MAX_NUM_HUFF_TABLE_INDEX << 11)|(1 << 7)|(jpegNumComponent << 4)},
    {VAConfigAttribEncQualityRange, NUM_TARGET_USAGE_MODES - 1},
-   {VAConfigAttribEncPackedHeaders, VA_ENC_PACKED_HEADER_PICTURE | VA_ENC_PACKED_HEADER_SEQUENCE | VA_ENC_PACKED_HEADER_SLICE | VA_ENC_PACKED_HEADER_RAW_DATA | VA_ENC_PACKED_HEADER_MISC},
+   {VAConfigAttribEncPackedHeaders, VA_ENC_PACKED_HEADER_PICTURE | VA_ENC_PACKED_HEADER_SEQUENCE | VA_ENC_PACKED_HEADER_RAW_DATA | VA_ENC_PACKED_HEADER_MISC},
    {VAConfigAttribEncInterlaced, VA_ENC_INTERLACED_NONE},
-   //just to match with legacy correct value 0
-   {VAConfigAttribEncMaxSlices, 3},
-   {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},
    {VAConfigAttribEncQuantization, 0},
    {VAConfigAttribEncIntraRefresh, 0},
    {VAConfigAttribEncSkipFrame, 0},
    {VAConfigAttribEncROI, VAProfileAV1Profile0_VAEntrypointEncSliceLP_encROI.value},
    {VAConfigAttribProcessingRate, VA_PROCESSING_RATE_ENCODE},
    {VAConfigAttribEncParallelRateControl, 0},
    {VAConfigAttribFEIMVPredictors, 0},
-   {VAConfigAttribCustomRoundingControl, 1},
 };
 
 //!

diff --git a/...t/linux/xe_lpm_plus_r0/encode/vp9/ddi/capstable_data_vp9_encode_xe_lpm_plus_r0_specific.h b/...t/linux/xe_lpm_plus_r0/encode/vp9/ddi/capstable_data_vp9_encode_xe_lpm_plus_r0_specific.h
@@ -92,19 +92,14 @@ static const AttribList attribList_VAProfileVP9Profile0_VAEntrypointEncSliceLP_X
    {VAConfigAttribEncTileSupport, 1},
    {VAConfigAttribEncDirtyRect, 4},
    {VAConfigAttribEncDynamicScaling, 1},
-   {VAConfigAttribEncJPEG, (JPEG_MAX_QUANT_TABLE << 14)|(JPEG_MAX_NUM_HUFF_TABLE_INDEX << 11)|(1 << 7)|(jpegNumComponent << 4)},
    {VAConfigAttribEncQualityRange, NUM_TARGET_USAGE_MODES - 1},
    {VAConfigAttribEncInterlaced, VA_ENC_INTERLACED_NONE},
    {VAConfigAttribEncQuantization, VA_ENC_QUANTIZATION_NONE},
-   //just to match with legacy correct value 0
-   {VAConfigAttribEncMaxSlices, 3},
-   {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_VAEntrypointEncSliceLP_encROI.value},
    {VAConfigAttribEncParallelRateControl, 0},
    {VAConfigAttribFEIMVPredictors, 0},
-   {VAConfigAttribCustomRoundingControl, 1},
    {VAConfigAttribEncRateControlExt, VP9Common_VAEntrypointEncSliceLP_encRateControlExt.value},
 };
 
@@ -122,19 +117,14 @@ static const AttribList attribList_VAProfileVP9Profile1_VAEntrypointEncSliceLP_X
    {VAConfigAttribEncTileSupport, 1},
    {VAConfigAttribEncDirtyRect, 4},
    {VAConfigAttribEncDynamicScaling, 1},
-   {VAConfigAttribEncJPEG, (JPEG_MAX_QUANT_TABLE << 14)|(JPEG_MAX_NUM_HUFF_TABLE_INDEX << 11)|(1 << 7)|(jpegNumComponent << 4)},
    {VAConfigAttribEncQualityRange, NUM_TARGET_USAGE_MODES - 1},
    {VAConfigAttribEncInterlaced, VA_ENC_INTERLACED_NONE},
    {VAConfigAttribEncQuantization, VA_ENC_QUANTIZATION_NONE},
-   //just to match with legacy correct value 0
-   {VAConfigAttribEncMaxSlices, 3},
-   {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_VAEntrypointEncSliceLP_encROI.value},
    {VAConfigAttribEncParallelRateControl, 0},
    {VAConfigAttribFEIMVPredictors, 0},
-   {VAConfigAttribCustomRoundingControl, 1},
    {VAConfigAttribEncRateControlExt, VP9Common_VAEntrypointEncSliceLP_encRateControlExt.value},
 };
 
@@ -152,19 +142,14 @@ static const AttribList attribList_VAProfileVP9Profile2_VAEntrypointEncSliceLP_X
    {VAConfigAttribEncTileSupport, 1},
    {VAConfigAttribEncDirtyRect, 4},
    {VAConfigAttribEncDynamicScaling, 1},
-   {VAConfigAttribEncJPEG, (JPEG_MAX_QUANT_TABLE << 14)|(JPEG_MAX_NUM_HUFF_TABLE_INDEX << 11)|(1 << 7)|(jpegNumComponent << 4)},
    {VAConfigAttribEncQualityRange, NUM_TARGET_USAGE_MODES - 1},
    {VAConfigAttribEncInterlaced, VA_ENC_INTERLACED_NONE},
    {VAConfigAttribEncQuantization, VA_ENC_QUANTIZATION_NONE},
-   //just to match with legacy correct value 0
-   {VAConfigAttribEncMaxSlices, 3},
-   {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_VAEntrypointEncSliceLP_encROI.value},
    {VAConfigAttribEncParallelRateControl, 0},
    {VAConfigAttribFEIMVPredictors, 0},
-   {VAConfigAttribCustomRoundingControl, 1},
    {VAConfigAttribEncRateControlExt, VP9Common_VAEntrypointEncSliceLP_encRateControlExt.value},
 };
 
@@ -182,19 +167,14 @@ static const AttribList attribList_VAProfileVP9Profile3_VAEntrypointEncSliceLP_X
    {VAConfigAttribEncTileSupport, 1},
    {VAConfigAttribEncDirtyRect, 4},
    {VAConfigAttribEncDynamicScaling, 1},
-   {VAConfigAttribEncJPEG, (JPEG_MAX_QUANT_TABLE << 14)|(JPEG_MAX_NUM_HUFF_TABLE_INDEX << 11)|(1 << 7)|(jpegNumComponent << 4)},
    {VAConfigAttribEncQualityRange, NUM_TARGET_USAGE_MODES - 1},
    {VAConfigAttribEncInterlaced, VA_ENC_INTERLACED_NONE},
    {VAConfigAttribEncQuantization, VA_ENC_QUANTIZATION_NONE},
-   //just to match with legacy correct value 0
-   {VAConfigAttribEncMaxSlices, 3},
-   {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_VAEntrypointEncSliceLP_encROI.value},
    {VAConfigAttribEncParallelRateControl, 0},
    {VAConfigAttribFEIMVPredictors, 0},
-   {VAConfigAttribCustomRoundingControl, 1},
    {VAConfigAttribEncRateControlExt, VP9Common_VAEntrypointEncSliceLP_encRateControlExt.value},
 };