Commit e15dc112 authored by Philippe de Lagrange's avatar Philippe de Lagrange

Removed ENABLE_QPA_SUB_CTU changes from xGetMinMaxQP (not needed and breaks QP-RDO)

parent 6e1e6fe8
......@@ -779,8 +779,6 @@ void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Par
#if REUSE_CU_RESULTS
else if( currTestMode.type == ETM_RECO_CACHED )
{
#pragma message "TODO: fix missing currQP init for RECO_CACHED ?"
// tempCS->currQP[partitioner.chType] = currTestMode.qp;
xReuseCachedResult( tempCS, bestCS, partitioner );
}
#endif
......
......@@ -157,12 +157,7 @@ void EncModeCtrl::xGetMinMaxQP( int& minQP, int& maxQP, const CodingStructure& c
minQP = Clip3( -sps.getQpBDOffset( CHANNEL_TYPE_LUMA ), MAX_QP, baseQP - deltaQP );
maxQP = Clip3( -sps.getQpBDOffset( CHANNEL_TYPE_LUMA ), MAX_QP, baseQP + deltaQP );
}
#if ENABLE_QPA_SUB_CTU
else if( qgEnableChildren || (pps.getUseDQP() && pps.getCuQpDeltaSubdiv() > 0 && (!CS::isDualITree (cs) || isLuma (partitioner.chType)))) // more splits and not the deepest QG level
#pragma message "TODO: repair compatibility with QP-RDO"
#else
else if( qgEnableChildren ) // more splits and not the deepest QG level
#endif
{
minQP = baseQP;
maxQP = baseQP;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment