Skip to content

Commit bb4187a

Browse files
FurongZhangintel-mediadev
authored andcommitted
[VP] Use 1k1dlut for HDR10.
Use 1k1dlut for HDR10 instead of color correction 256 1dlut.
1 parent a773adb commit bb4187a

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

media_softlet/agnostic/common/vp/hal/bufferMgr/vp_resource_manager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@ MOS_STATUS VpResourceManager::AllocateVeboxResource(VP_EXECUTE_CAPS& caps, VP_SU
18111811

18121812
VP_PUBLIC_CHK_STATUS_RETURN(Allocate3DLut(caps));
18131813

1814-
if (caps.bDV)
1814+
if (caps.bDV || caps.bHDR3DLUT || caps.b3DLutCalc)
18151815
{
18161816
dwSize = Get1DLutSize();
18171817
VP_PUBLIC_CHK_STATUS_RETURN(m_allocator.ReAllocateSurface(
@@ -2156,7 +2156,7 @@ MOS_STATUS VpResourceManager::AssignVeboxResource(VP_EXECUTE_CAPS& caps, VP_SURF
21562156
surfGroup.insert(std::make_pair(SurfaceTypeHVSTable, m_veboxDnHVSTables));
21572157
}
21582158

2159-
if (Vebox1DlutNeeded(caps))
2159+
if (Vebox1DlutNeeded(caps) || VeboxHdr3DlutNeeded(caps))
21602160
{
21612161
// Insert DV 1Dlut surface
21622162
surfGroup.insert(std::make_pair(SurfaceType1k1dLut, m_vebox1DLookUpTables));

media_softlet/agnostic/common/vp/hal/packet/vp_vebox_cmd_packet.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,7 @@ MOS_STATUS VpVeboxCmdPacket::SetHdrParams(PVEBOX_HDR_PARAMS hdrParams)
10441044
VP_PUBLIC_CHK_NULL_RETURN(m_hwInterface->m_osInterface);
10451045
VP_PUBLIC_CHK_NULL_RETURN(hdrParams);
10461046
VP_RENDER_ASSERT(pRenderData);
1047+
10471048
MHW_VEBOX_GAMUT_PARAMS &mhwVeboxGamutParams = pRenderData->GetGamutParams();
10481049
pOsInterface = m_hwInterface->m_osInterface;
10491050
pRenderData->HDR3DLUT.bHdr3DLut = true;
@@ -1076,6 +1077,9 @@ MOS_STATUS VpVeboxCmdPacket::SetHdrParams(PVEBOX_HDR_PARAMS hdrParams)
10761077
mhwVeboxGamutParams.uiMaxCLL = 0;
10771078
}
10781079

1080+
MHW_VEBOX_IECP_PARAMS &mhwVeboxIecpParams = pRenderData->GetIECPParams();
1081+
mhwVeboxIecpParams.s3DLutParams.bActive = true;
1082+
10791083
//Report
10801084
if (m_hwInterface->m_reporting)
10811085
{

media_softlet/agnostic/common/vp/hal/packet/vp_vebox_cmd_packet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ class VpVeboxCmdPacket : virtual public VpVeboxCmdPacketBase
11181118
mhw::vebox::VEBOX_STATE_PAR &veboxStateCmdParams);
11191119
virtual MOS_STATUS Init3DLutTable(PVP_SURFACE surf3DLut);
11201120
void UpdateCpPrepareResources();
1121-
MOS_STATUS SetupVebox3DLutForHDR(
1121+
virtual MOS_STATUS SetupVebox3DLutForHDR(
11221122
mhw::vebox::VEBOX_STATE_PAR &veboxStateCmdParams);
11231123

11241124
private:

0 commit comments

Comments
 (0)