Merge branch 'JVET-L0553-InitQPFix' into 'master'

JVET-L0553: Fix of initial QP signaling

See merge request !24

source/Lib/CommonLib/TypeDef.h

@@ -50,6 +50,8 @@
 #include <assert.h>
 #include <cassert>
 
+#define JVET_L0553_FIX_INITQP                             1
+
 #define JVET_L0147_ALF_SUBSAMPLED_LAPLACIAN               1 // Subsampled Laplacian calculation
 
 #define JVET_L0191_LM_WO_LMS                              1 // NO LMS regression. min/max are used instead

source/Lib/EncoderLib/EncLib.cpp

@@ -1234,7 +1234,11 @@ 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 ) ));