Skip to content
Snippets Groups Projects
Commit 5fc6cd95 authored by Vadim Seregin's avatar Vadim Seregin
Browse files

Merge branch 'JVET-AI0103-ADDITIONAL-CMVP-TMOFF-FIX' into 'master'

Fix issue #74 TM tools off for JVET-AI0103.

Closes #74

See merge request !723
parents 64ab5e4e 644f31fe
No related branches found
No related tags found
No related merge requests found
......@@ -9796,7 +9796,15 @@ void PU::getInterMergeCandidates( const PredictionUnit &pu, MergeCtx& mrgCtx,
}
#if JVET_AI0103_ADDITIONAL_CMVP
int blkSizeThres = 128;
const uint32_t numCmvpCands = (pu.lumaSize().width + pu.lumaSize().height < blkSizeThres) ? NUM_CMVP_CANDS : 0;
uint32_t numCmvpCands = (pu.lumaSize().width + pu.lumaSize().height < blkSizeThres) ? NUM_CMVP_CANDS : 0;
#if JVET_AE0174_NONINTER_TM_TOOLS_CONTROL
if (!(pu.cs->sps->getUseAML() && pu.cs->sps->getTMToolsEnableFlag())|| !pu.cs->sps->getUseTmvpNmvpReordering())
#else
if (!pu.cs->sps->getUseAML() || !pu.cs->sps->getUseTmvpNmvpReordering())
#endif
{
numCmvpCands = 0;
}
additionalMRGCand += numCmvpCands;
#endif
#if JVET_AI0183_MVP_EXTENSION
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment