Ticket #188: Fix188.HM40.patch

source/Lib/TLibCommon/TypeDef.h

@@ -321 +321 @@
 
 #define CBF_FAST_MODE                      1 //JCTVC-F045
 
+#define FIX_TICKET188 1
+
 // ====================================================================================================================
 // Basic type redefinition
 // ====================================================================================================================

source/Lib/TLibEncoder/TEncSlice.cpp

@@ -715 +715 @@
     m_dPicRdCost     += pcCU->getTotalCost();
     m_uiPicDist      += pcCU->getTotalDistortion();
   }
+
+#if FINE_GRANULARITY_SLICES && FIX_TICKET188
+  if ( pcSlice->isNextSlice() )
+  {
+    TComDataCU* pcCU = rpcPic->getCU( uiCUAddr );
+    UInt uiAbsEndPartIdx = pcSlice->getSliceCurEndCUAddr() % rpcPic->getNumPartInCU();
+    UInt uiDepth = pcCU->getDepth( uiAbsEndPartIdx-1 );
+    if ( pcSlice->getSPS()->getUseDQP() && (g_uiMaxCUWidth>>uiDepth) < pcSlice->getPPS()->getMinCuDQPSize() )
+    {
+      UInt uiZorderMask = ~((1<<(8-(pcSlice->getPPS()->getMaxCuDQPDepth()<<1)))-1);
+      UInt uiAbsZorderQpMinCUIdx = uiAbsEndPartIdx & uiZorderMask;
+      Bool bHasRedisual = false;
+      for ( UInt uiIdx = uiAbsZorderQpMinCUIdx; uiIdx < uiAbsEndPartIdx; uiIdx++ )
+      {
+        if ( pcCU->getSliceStartCU(uiIdx) == pcSlice->getSliceCurStartCUAddr() && 
+             ( pcCU->getCbf( uiIdx, TEXT_LUMA ) || pcCU->getCbf( uiIdx, TEXT_CHROMA_U ) || pcCU->getCbf( uiIdx, TEXT_CHROMA_V ) ) )
+        {
+          bHasRedisual = true;
+          break;
+        }
+      }
+
+      UInt uiTargetPartIdx;
+      if ( pcCU->getSliceStartCU( uiAbsZorderQpMinCUIdx ) != pcSlice->getSliceCurStartCUAddr() )
+      {
+        uiTargetPartIdx = pcSlice->getSliceCurStartCUAddr() % rpcPic->getNumPartInCU();
+      }
+      else
+      {
+        uiTargetPartIdx = uiAbsZorderQpMinCUIdx;
+      }
+      if ( !bHasRedisual )
+      {
+        pcCU->setQPSubParts( pcCU->getRefQP( uiTargetPartIdx ), uiTargetPartIdx, uiDepth ); // set QP to default QP
+      }
+    }
+  }
+#endif
+
 #if !FINE_GRANULARITY_SLICES
   pcSlice->setSliceCurEndCUAddr( uiCUAddr );
   pcSlice->setEntropySliceCurEndCUAddr( uiCUAddr );