Commit 854de7d6 authored by Karsten Suehring's avatar Karsten Suehring

Merge branch 'remove_k0346_bugfix_macro' into 'master'

Remove bug fix macro under JVET_K0346

See merge request !96
parents f2f26701 9e6df563
Pipeline #76 passed with stage
......@@ -105,9 +105,7 @@
#define JVET_K0554 1 // when adopting, also remove the macro HM_QTBT_ONLY_QT_IMPLICIT (keep the case for value 0)
#define JVET_K0346 1 // simplifications on ATMVP
#if JVET_K0346
#define SEQ_ENCODING_BF 1 // bug-fix for the mismatch between sequential and parallel encoding of JVET-K0346
#endif
#define JVET_K0063_PDPC_SIMP 1 // Simplified PDPC
#define JVET_K0351_LESS_CONSTRAINT 1 // Only disallow binary split with same orientation in center partition of the ternary split and release the other constraints in K0351.
......
......@@ -1318,19 +1318,15 @@ void EncSlice::compressSlice( Picture* pcPic, const bool bCompressEntireSlice, c
else
{
m_pcCuEncoder->setPrevPOC(pcSlice->getPOC());
#if SEQ_ENCODING_BF
if (m_pcCfg->getGOPSize() != m_pcCfg->getIntraPeriod())
{
#endif
m_pcCuEncoder->setClearSubMergeStatic(true);
#if SEQ_ENCODING_BF
m_pcCuEncoder->setClearSubMergeStatic(true);
}
else
{
m_pcCuEncoder->clearSubMergeStatics();
m_pcCuEncoder->setClearSubMergeStatic(false);
}
#endif
}
}
#endif
......
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