diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 94360624977f3b3daf4b8717caeaee973fac122c..983f9d95ee4c0551592510c59e41bf2681cf85da 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -62,7 +62,6 @@ -#define JVET_L0553_FIX_INITQP 1 #define JVET_L0053_L0272_DM 1 // use center position of luma block to derive DM #define JVET_L0147_ALF_SUBSAMPLED_LAPLACIAN 1 // Subsampled Laplacian calculation diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp index 175149b03fae57dd14fbe4b20e977f8747528741..6291357cd3cadf3b691f1db3ff3d5032e9a9e271 100644 --- a/source/Lib/EncoderLib/EncLib.cpp +++ b/source/Lib/EncoderLib/EncLib.cpp @@ -1287,11 +1287,7 @@ void EncLib::xInitPPS(PPS &pps, const SPS &sps) { baseQp = getBaseQP()-26; } -#if JVET_L0553_FIX_INITQP const int maxDQP = 37; -#else - const int maxDQP = 25; -#endif const int minDQP = -26 + sps.getQpBDOffset(CHANNEL_TYPE_LUMA); pps.setPicInitQPMinus26( std::min( maxDQP, std::max( minDQP, baseQp ) ));