diff --git a/source/Lib/CommonLib/DepQuant.cpp b/source/Lib/CommonLib/DepQuant.cpp index bb661d098bae2783ef5bc1c888888cfd8b69618b..24ab858e30e0d51d8b0c45b6160e7f7f847cf8cd 100644 --- a/source/Lib/CommonLib/DepQuant.cpp +++ b/source/Lib/CommonLib/DepQuant.cpp @@ -690,7 +690,11 @@ namespace DQIntern m_QScale = g_quantScales[needsSqrt2ScaleAdjustment?1:0][ qpRem ]; const unsigned qIdxBD = std::min<unsigned>( maxLog2TrDynamicRange + 1, 8*sizeof(Intermediate_Int) + invShift - IQUANT_SHIFT - 1 ); m_maxQIdx = ( 1 << (qIdxBD-1) ) - 4; +#if JVET_O0256_ADJUST_THD_DEPQUANT + m_thresLast = TCoeff((int64_t(4) << m_QShift)); +#else m_thresLast = TCoeff((int64_t(3) << m_QShift)); +#endif m_thresSSbb = TCoeff((int64_t(3) << m_QShift)); // distortion calculation parameters const int64_t qScale = (gValue==-1) ? m_QScale : gValue; diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 791b2d404751c780763446e00a43bf3ad369ea64..f2adb9ece85f426a9f8ea1729aa20980d9e36ec3 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -54,6 +54,8 @@ #define JVET_O0216_ALF_COEFF_EG3 1 // JVET-O0216/O0302/O0648: using EG3 for ALF coefficients coding +#define JVET_O0256_ADJUST_THD_DEPQUANT 1 // JVET-O0256: Fast encoder with adjusted threshold in dependent quantization + #define JVET_O0272_LMCS_SIMP_INVERSE_MAPPING 1 // JVET-O0272: LMCS simplified inverse mapping #define JVET_O0247_ALF_CTB_CODING_REDUNDANCY_REMOVAL 1 // JVET-O0247: not signal APS index when number APS is 2