From 8b608aef2aecfea2eb281e6a35b08203c427defa Mon Sep 17 00:00:00 2001 From: FurongZhang Date: Fri, 15 Dec 2023 16:21:39 +0800 Subject: [PATCH] [VP] Remove HDR parameters check in HDR kernel path. Remove HDR parameters check in HDR kernel path. This is to support 2 input support in HDR kernel path. --- .../common/vp/hal/feature_manager/policy.cpp | 7 ---- .../vp/hal/feature_manager/sw_filter.cpp | 35 +++++++++---------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp index 44c53451c43..04eacf68822 100644 --- a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp +++ b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp @@ -691,13 +691,6 @@ MOS_STATUS Policy::GetCSCExecutionCapsHdr(SwFilter *HDR, SwFilter *CSC) return MOS_STATUS_SUCCESS; } - //HDR CSC processing - if (!hdrParams || hdrParams->hdrMode == VPHAL_HDR_MODE_NONE) - { - VP_PUBLIC_ASSERTMESSAGE("HDR Mode is NONE"); - VP_PUBLIC_CHK_STATUS_RETURN(MOS_STATUS_INVALID_PARAMETER); - } - MOS_FORMAT hdrFormat = Format_Any; VPHAL_CSPACE hdrCSpace = CSpace_Any; hdrCSpace = IS_COLOR_SPACE_BT2020(cscParams->output.colorSpace) ? CSpace_BT2020_RGB : CSpace_sRGB; diff --git a/media_softlet/agnostic/common/vp/hal/feature_manager/sw_filter.cpp b/media_softlet/agnostic/common/vp/hal/feature_manager/sw_filter.cpp index dc53e15924c..30de7164f15 100644 --- a/media_softlet/agnostic/common/vp/hal/feature_manager/sw_filter.cpp +++ b/media_softlet/agnostic/common/vp/hal/feature_manager/sw_filter.cpp @@ -1300,7 +1300,6 @@ MOS_STATUS SwFilterHdr::Configure(VP_PIPELINE_PARAMS ¶ms, bool isInputSurf, VP_PUBLIC_CHK_NULL_RETURN(surfInput); VP_PUBLIC_CHK_NULL_RETURN(surfOutput); - VP_PUBLIC_CHK_NULL_RETURN(surfInput->pHDRParams); VP_PUBLIC_CHK_NULL_RETURN(m_vpInterface.GetHwInterface()); VP_PUBLIC_CHK_NULL_RETURN(m_vpInterface.GetHwInterface()->m_osInterface); @@ -1310,32 +1309,30 @@ MOS_STATUS SwFilterHdr::Configure(VP_PIPELINE_PARAMS ¶ms, bool isInputSurf, m_Params.heightInput = surfInput->dwHeight; // For H2S, it is possible that there is no HDR params for render target. - m_Params.uiMaxContentLevelLum = surfInput->pHDRParams->MaxCLL; + m_Params.uiMaxContentLevelLum = 4000; m_Params.srcColorSpace = surfInput->ColorSpace; m_Params.dstColorSpace = surfOutput->ColorSpace; - if (surfInput->pHDRParams->EOTF == VPHAL_HDR_EOTF_SMPTE_ST2084 || - (surfInput->pHDRParams->EOTF == VPHAL_HDR_EOTF_TRADITIONAL_GAMMA_SDR && IS_RGB64_FLOAT_FORMAT(surfInput->Format))) // For FP16 HDR CSC typical usage + if (surfInput->pHDRParams) { - m_Params.hdrMode = VPHAL_HDR_MODE_TONE_MAPPING; - if (surfOutput->pHDRParams) + m_Params.uiMaxContentLevelLum = surfInput->pHDRParams->MaxCLL; + if (surfInput->pHDRParams->EOTF == VPHAL_HDR_EOTF_SMPTE_ST2084 || + (surfInput->pHDRParams->EOTF == VPHAL_HDR_EOTF_TRADITIONAL_GAMMA_SDR && IS_RGB64_FLOAT_FORMAT(surfInput->Format))) // For FP16 HDR CSC typical usage { - m_Params.uiMaxDisplayLum = surfOutput->pHDRParams->max_display_mastering_luminance; - if (surfOutput->pHDRParams->EOTF == VPHAL_HDR_EOTF_SMPTE_ST2084) + m_Params.hdrMode = VPHAL_HDR_MODE_TONE_MAPPING; + if (surfOutput->pHDRParams) { - m_Params.hdrMode = VPHAL_HDR_MODE_H2H; + m_Params.uiMaxDisplayLum = surfOutput->pHDRParams->max_display_mastering_luminance; + if (surfOutput->pHDRParams->EOTF == VPHAL_HDR_EOTF_SMPTE_ST2084) + { + m_Params.hdrMode = VPHAL_HDR_MODE_H2H; + } } } - } - else if (surfInput->pHDRParams->EOTF == VPHAL_HDR_EOTF_TRADITIONAL_GAMMA_SDR && surfOutput->pHDRParams->EOTF == VPHAL_HDR_EOTF_SMPTE_ST2084) - { - m_Params.hdrMode = VPHAL_HDR_MODE_INVERSE_TONE_MAPPING; - } - - if (m_Params.hdrMode == VPHAL_HDR_MODE_NONE) - { - VP_PUBLIC_ASSERTMESSAGE("HDR Mode is NONE"); - VP_PUBLIC_CHK_STATUS_RETURN(MOS_STATUS_INVALID_PARAMETER); + else if (surfInput->pHDRParams->EOTF == VPHAL_HDR_EOTF_TRADITIONAL_GAMMA_SDR && surfOutput->pHDRParams->EOTF == VPHAL_HDR_EOTF_SMPTE_ST2084) + { + m_Params.hdrMode = VPHAL_HDR_MODE_INVERSE_TONE_MAPPING; + } } m_Params.pColorFillParams = params.pColorFillParams;