diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp index 7efd42ed17e62d89d2d31cdd367eae1ab6579c1f..259f6c806a7197cb950c27063754cff679c3ba50 100644 --- a/source/App/EncoderApp/EncAppCfg.cpp +++ b/source/App/EncoderApp/EncAppCfg.cpp @@ -2219,6 +2219,7 @@ bool EncAppCfg::xCheckParameter() xConfirmPara( m_quadtreeTULog2MaxSize < 0, "Maximal TU size is invalid" ); +#if !JVET_L0369_SUBBLOCK_MERGE if( m_SubPuMvpMode == 3 && m_maxNumMergeCand < 7 ) { msg( WARNING, "****************************************************************************\n" ); @@ -2233,6 +2234,7 @@ bool EncAppCfg::xCheckParameter() msg( WARNING, "** an advanced sup-pu temporal merging mode is enabled. **\n" ); msg( WARNING, "****************************************************************************\n" ); } +#endif xConfirmPara( m_iQP < -6 * (m_internalBitDepth[CHANNEL_TYPE_LUMA] - 8) || m_iQP > MAX_QP, "QP exceeds supported range (-QpBDOffsety to 63)" ); #if W0038_DB_OPT xConfirmPara( m_deblockingFilterMetric!=0 && (m_bLoopFilterDisable || m_loopFilterOffsetInPPS), "If DeblockingFilterMetric is non-zero then both LoopFilterDisable and LoopFilterOffsetInPPS must be 0");