Commit 85e59903 authored by Frank Bossen's avatar Frank Bossen

Merge branch 'M0445-MCTS-fix-2' into 'master'

Fix #218: DMVR constraint for MCTS is permanently enabled

See merge request !369
parents b0411ca2 be55eee8
Pipeline #1084 passed with stage
......@@ -52,7 +52,7 @@
#define JVET_M0111_WP_GBI 1 // Block level control gbi according to WP
#define JVET_M0445_MCTS 0 // Motion constrained tile sets
#define JVET_M0445_MCTS 1 // Motion constrained tile sets
#if JVET_M0445_MCTS
#define JVET_M0445_MCTS_DEC_CHECK 1 // Check at decoder side the MCTS restrictions
#endif
......
......@@ -2520,12 +2520,15 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
PU::spanMotionInfo( pu, mergeCtx );
#if JVET_M0445_MCTS && JVET_M0147_DMVR
bool isDMVR = PU::checkDMVRCondition( pu );
if( ( isDMVR && MCTSHelper::isRefBlockAtRestrictedTileBoundary( pu ) ) || ( !isDMVR && !( MCTSHelper::checkMvBufferForMCTSConstraint( pu ) ) ) )
if( m_pcEncCfg->getMCTSEncConstraint() )
{
// Do not use this mode
tempCS->initStructData( encTestMode.qp, encTestMode.lossless );
continue;
bool isDMVR = PU::checkDMVRCondition( pu );
if( ( isDMVR && MCTSHelper::isRefBlockAtRestrictedTileBoundary( pu ) ) || ( !isDMVR && !( MCTSHelper::checkMvBufferForMCTSConstraint( pu ) ) ) )
{
// Do not use this mode
tempCS->initStructData( encTestMode.qp, encTestMode.lossless );
continue;
}
}
#endif
if( mrgTempBufSet )
......
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