Ticket #315: 20120207-HM-5.1-dev-cleanup-dqp-wrap.patch

source/Lib/TLibCommon/TypeDef.h

@@ -155 +155 @@
 
 #define G678_LAMBDA_ADJUSTMENT              1      ///< G678: lambda adjustment for rate-constrained test tool
 
+#define FIX_CU_DQP_WRAP                     1      ///< Fix wrapping of cu_qp_delta
+#if FIX_CU_DQP_WRAP
+#define RESET_QP_OFFSET                     1      ///< This macro shall be set equal to 0 or removed when JCTVC-H0400 is integrated.
+#endif
+
 ////////////////////////////
 // JCT-VC G end
 ////////////////////////////

source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2157 +2157 @@
   Int  iDQp;
   
   xReadSvlc( iDQp );
+
+#if FIX_CU_DQP_WRAP
+  UInt uiQpBdOffsetY = 6*(g_uiBitIncrement + g_uiBitDepth - 8);
+#if RESET_QP_OFFSET
+  uiQpBdOffsetY = 0;
+#endif
+  uiQp = (((Int) pcCU->getRefQP( uiAbsPartIdx ) + iDQp + 52 + 2*uiQpBdOffsetY )%(52+uiQpBdOffsetY)) - uiQpBdOffsetY;
+#else
   uiQp = pcCU->getRefQP( uiAbsPartIdx ) + iDQp;
+#endif
 
   UInt uiAbsQpCUPartIdx = (uiAbsPartIdx>>(8-(pcCU->getSlice()->getPPS()->getMaxCuDQPDepth()<<1)))<<(8-(pcCU->getSlice()->getPPS()->getMaxCuDQPDepth()<<1)) ;
   UInt uiQpCUDepth =   min(uiDepth,pcCU->getSlice()->getPPS()->getMaxCuDQPDepth()) ;

source/Lib/TLibDecoder/TDecSbac.cpp

@@ -1281 +1281 @@
       iDQp = -iDQp;
     }
 #endif
+
+#if FIX_CU_DQP_WRAP
+#if !F745_DQP_BINARIZATION
+        UInt uiQpBdOffsetY = 6*(g_uiBitIncrement + g_uiBitDepth - 8);
+#endif
+#if RESET_QP_OFFSET
+        uiQpBdOffsetY = 0;
+#endif
+        uiDQp = (((Int) pcCU->getRefQP( uiAbsPartIdx ) + iDQp + 52 + 2*uiQpBdOffsetY )%(52+uiQpBdOffsetY)) - uiQpBdOffsetY;
+#else
     uiDQp = pcCU->getRefQP(uiAbsPartIdx) + iDQp;
+#endif
 
   }
   

source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1776 +1776 @@
 {
   Int iDQp  = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx );
 
+#if FIX_CU_DQP_WRAP
+  UInt uiQpBdOffsetY = 6*(g_uiBitIncrement + g_uiBitDepth - 8);
+#if RESET_QP_OFFSET
+  uiQpBdOffsetY = 0;
+#endif
+  iDQp = (iDQp + 78 + uiQpBdOffsetY + (uiQpBdOffsetY/2)) % (52 + uiQpBdOffsetY) - 26 - (uiQpBdOffsetY/2);
+#endif
+
   xWriteSvlc( iDQp );
   
   return;

source/Lib/TLibEncoder/TEncSbac.cpp

@@ -1111 +1111 @@
 Void TEncSbac::codeDeltaQP( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
   Int iDQp  = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx );
-  
+
+#if FIX_CU_DQP_WRAP
+  {
+          UInt uiQpBdOffsetY = 6*(g_uiBitIncrement + g_uiBitDepth - 8);
+#if RESET_QP_OFFSET
+          uiQpBdOffsetY = 0;
+#endif
+          iDQp = (iDQp + 78 + uiQpBdOffsetY + (uiQpBdOffsetY/2)) % (52 + uiQpBdOffsetY) - 26 - (uiQpBdOffsetY/2);
+  }
+#endif
+
   if ( iDQp == 0 )
   {
     m_pcBinIf->encodeBin( 0, m_cCUDeltaQpSCModel.get( 0, 0, 0 ) );