Ticket #91: DQP_fix.patch

source/Lib/CommonLib/ContextModelling.h

@@ -536 +536 @@
 {
 public:
   CUCtx()              : isDQPCoded(false), isChromaQpAdjCoded(false),
+#if FIX_ISSUE_91_DQP
+                         isQPPredicted(false),
+#endif
                          numNonZeroCoeffNonTs(0) {}
   CUCtx(int _qp)       : isDQPCoded(false), isChromaQpAdjCoded(false),
+#if FIX_ISSUE_91_DQP
+                         isQPPredicted(false),
+#endif
                          numNonZeroCoeffNonTs(0), qp(_qp) {}
   ~CUCtx() {}
 public:
   bool      isDQPCoded;
   bool      isChromaQpAdjCoded;
-  uint32_t      numNonZeroCoeffNonTs;
-  int8_t     qp;                   // used as a previous(last) QP and for QP prediction
+#if FIX_ISSUE_91_DQP
+  bool      isQPPredicted;
+#endif
+  uint32_t  numNonZeroCoeffNonTs;
+  int8_t    qp;                   // used as a previous(last) QP and for QP prediction
 };
 
 class MergeCtx

source/Lib/CommonLib/TypeDef.h

@@ -54 +54 @@
 #define BMS_TOOLS                                         1 // Inclusion of BMS only tools (which include JEM tools) into compiled executable
 #endif
 
+#define FIX_ISSUE_91_DQP                                     1
+
 #if BMS_TOOLS
 #define JEM_TOOLS                                         1
 #define JVET_K0076_CPR                                    1 // current picture referencing or intra block copy mode

source/Lib/CommonLib/UnitTools.cpp

@@ -388 +388 @@
   return ( a + b + 1 ) >> 1;
 }
 
+#if !FIX_ISSUE_91_DQP
 bool CU::isQGStart( const CodingUnit& cu )
 {
   const SPS &sps = *cu.cs->sps;
@@ -397 +398 @@
          ( cu.blocks[cu.chType].y % ( ( 1 << ( g_aucLog2[sps.getMaxCUHeight()] - pps.getMaxCuDQPDepth() ) ) >> getChannelTypeScaleY( cu.chType, cu.chromaFormat ) ) ) == 0;
 }
 
+#endif
 uint32_t CU::getNumPUs( const CodingUnit& cu )
 {
   uint32_t cnt = 0;

source/Lib/CommonLib/UnitTools.h

@@ -87 +87 @@
   uint32_t getCtuAddr                     (const CodingUnit &cu);
 
   int  predictQP                      (const CodingUnit& cu, const int prevQP );
+#if !FIX_ISSUE_91_DQP
   bool isQGStart                      (const CodingUnit& cu); // check if start of a Quantization Group
+#endif
 
   uint32_t getNumPUs                      (const CodingUnit& cu);
   void addPUs                         (      CodingUnit& cu);

source/Lib/DecoderLib/CABACReader.cpp

@@ -964 +964 @@
   if( pps.getUseDQP() && partitioner.currDepth <= pps.getMaxCuDQPDepth() )
   {
     cuCtx.isDQPCoded          = false;
+#if FIX_ISSUE_91_DQP
+    cuCtx.isQPPredicted       = false;
+#endif
   }
   if( cs.slice->getUseChromaQpAdj() && partitioner.currDepth <= pps.getPpsRangeExtension().getDiffCuChromaQpOffsetDepth() )
   {
@@ -1143 +1146 @@
 #endif
 
   // Predict QP on start of quantization group
+#if FIX_ISSUE_91_DQP
+  if( pps.getUseDQP() && !cuCtx.isDQPCoded && !cuCtx.isQPPredicted )
+  {
+    cuCtx.qp = CU::predictQP( cu, cuCtx.qp );
+    cuCtx.isQPPredicted = true;
+  }
+#else
   if( pps.getUseDQP() && !cuCtx.isDQPCoded && CU::isQGStart( cu ) )
   {
     cuCtx.qp = CU::predictQP( cu, cuCtx.qp );
   }
+#endif
 
   cu.qp          = cuCtx.qp;        //NOTE: CU QP can be changed by deltaQP signaling at TU level
   cu.chromaQpAdj = cs.chromaQpAdj;  //NOTE: CU chroma QP adjustment can be changed by adjustment signaling at TU level

source/Lib/EncoderLib/CABACWriter.cpp

@@ -1013 +1013 @@
   if( pps.getUseDQP() && partitioner.currDepth <= pps.getMaxCuDQPDepth() )
   {
     cuCtx.isDQPCoded          = false;
+#if FIX_ISSUE_91_DQP
+    cuCtx.isQPPredicted       = false;
+#endif
   }
   if( cs.slice->getUseChromaQpAdj() && partitioner.currDepth <= pps.getPpsRangeExtension().getDiffCuChromaQpOffsetDepth() )
   {
@@ -1159 +1162 @@
   }
 
   // Predict QP on start of quantization group
+#if FIX_ISSUE_91_DQP
+  if( pps.getUseDQP() && !cuCtx.isDQPCoded && !cuCtx.isQPPredicted )
+  {
+    cuCtx.qp = CU::predictQP( cu, cuCtx.qp );
+    cuCtx.isQPPredicted = true;
+  }
+#else
   if( pps.getUseDQP() && !cuCtx.isDQPCoded && CU::isQGStart( cu ) )
   {
     cuCtx.qp = CU::predictQP( cu, cuCtx.qp );
   }
+#endif
 
 #if JVET_K0346
   if (!cs.slice->isIntra() && m_EncCu)

source/Lib/EncoderLib/EncCu.cpp

@@ -2049 +2049 @@
   m_pcInterSearch->subBlockOBMC      ( cu );
 #endif
 
+#if FIX_ISSUE_91_DQP
+  auto *oldTempCS = tempCS;
+#endif
+
   xEncodeInterResidual(tempCS, bestCS, partitioner, encTestMode, 0
 #if JEM_TOOLS || JVET_K0357_AMVR
     , NULL
@@ -2060 +2064 @@
 
   if( ! (encTestMode.lossless || hasNoResidual) )
   {
+#if FIX_ISSUE_91_DQP
+    if( tempCS != oldTempCS )
+    {
+#endif
     tempCS->initStructData( encTestMode.qp, encTestMode.lossless );
     tempCS->copyStructure( *bestCS, partitioner.chType );
     tempCS->getPredBuf().copyFrom( bestCS->getPredBuf() );
+#if FIX_ISSUE_91_DQP
+    }
+    else
+    {
+      tempCS->clearTUs();
+    }
+#endif
 
     xEncodeInterResidual(tempCS, bestCS, partitioner, encTestMode, 1
 #if JEM_TOOLS || JVET_K0357_AMVR

source/Lib/EncoderLib/EncModeCtrl.cpp

@@ -767 +767 @@
   BestEncodingInfo& encInfo = *m_bestEncInfo[idx1][idx2][idx3][idx4];
 
   if( cs.picture->poc != encInfo.poc || CS::getArea( cs, cs.area, partitioner.chType ) != encInfo.cu || !isTheSameNbHood( encInfo.cu, partitioner ) 
+#if FIX_ISSUE_91_DQP
+    || partitioner.currDepth <= cs.pps->getMaxCuDQPDepth() || cs.currQP[partitioner.chType] != encInfo.cu.qp
+#endif
 #if JVET_K0076_CPR
     || encInfo.cu.ibc
 #endif
@@ -787 +790 @@
 
   BestEncodingInfo& encInfo = *m_bestEncInfo[idx1][idx2][idx3][idx4];
 
-  if( cs.picture->poc != encInfo.poc || CS::getArea( cs, cs.area, partitioner.chType ) != encInfo.cu || !isTheSameNbHood( encInfo.cu, partitioner ) )
+  if( cs.picture->poc != encInfo.poc || CS::getArea( cs, cs.area, partitioner.chType ) != encInfo.cu || !isTheSameNbHood( encInfo.cu, partitioner )
+#if FIX_ISSUE_91_DQP
+    || partitioner.currDepth <= cs.pps->getMaxCuDQPDepth() || encInfo.cu.qp != cs.currQP[partitioner.chType]
+#endif
+    )
   {
     return false;
   }

source/Lib/EncoderLib/EncModeCtrl.h

@@ -280 +280 @@
   int                   m_lumaQPOffset;
 #endif
   bool                  m_fastDeltaQP;
-  static_vector<ComprCUCtx, ( MAX_CU_DEPTH << 2 )> m_ComprCUCtxList;
+  std::vector<ComprCUCtx> m_ComprCUCtxList;
 #if ENABLE_SPLIT_PARALLELISM
   int                   m_runNextInParallel;
 #endif