Commit 7f2b80ad authored by Karsten Suehring's avatar Karsten Suehring

Merge branch 'CPR_ENC_FIX' into 'master'

fix performance differences when CPR macro off and CPR on but config flag off

See merge request jvet/VVCSoftware_BMS!103
parents 41048aab 4df2d683
Pipeline #90 passed with stage
......@@ -3196,7 +3196,7 @@ bool PU::getInterMergeSubPuMvpCand( const PredictionUnit &pu, MergeCtx& mrgCtx,
)
{
#if JVET_K0076_CPR
if (count == countIBC)
if (count == countIBC && pu.cs->slice->getSPS()->getSpsNext().getIBCMode())
return false;
#endif
const Slice &slice = *pu.cs->slice;
......
......@@ -1730,9 +1730,9 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
ComprCUCtx cuECtx = m_modeCtrl->getComprCUCtx();
bestIsSkip = blkCache->isSkip(tempCS->area) && cuECtx.bestCU;
}
#else
bestIsSkip = blkCache->isSkip( tempCS->area );
else
#endif
bestIsSkip = blkCache->isSkip( tempCS->area );
}
static_vector<double, MRG_MAX_NUM_CANDS> candCostList;
......
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