Ticket #315: 201202208-HM-5.1-dev-cleanup-r1867-qp-wrap.patch

source/Lib/TLibCommon/TypeDef.h

@@ -269 +269 @@
 #define SCALING_LIST                  1 //JCTVC-G880/JCTVC-G1016 quantization matrices
 #define SCALING_LIST_OUTPUT_RESULT    0 //JCTVC-G880/JCTVC-G1016 quantization matrices
 
+#define FIX_QP_WRAP                   1    //< Fix qp wrapping
+#if FIX_QP_WRAP
+#define SET_QP_BD_OFFSET_ZERO         1    //< This macro shall be set equal to 0 or removed when QpBdOffsetY and QpBdOffsetC issues are resolved.
+#endif
+
 // ====================================================================================================================
 // Basic type redefinition
 // ====================================================================================================================

source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1466 +1466 @@
   Int  iDQp;
   
   xReadSvlc( iDQp );
+
+#if FIX_QP_WRAP
+  UInt uiQpBdOffsetY = 6*(g_uiBitIncrement + g_uiBitDepth - 8);
+#if SET_QP_BD_OFFSET_ZERO
+  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

@@ -1211 +1211 @@
   {
     UInt uiSign;
     UInt uiQpBdOffsetY = 6*(g_uiBitIncrement + g_uiBitDepth - 8);
+#if SET_QP_BD_OFFSET_ZERO
+        uiQpBdOffsetY = 0;
+#endif
     m_pcTDecBinIf->decodeBinEP(uiSign);
 
     UInt uiMaxAbsDQpMinus1 = 24 + (uiQpBdOffsetY/2) + (uiSign);
@@ -1223 +1226 @@
     {
       iDQp = -iDQp;
     }
+
+#if FIX_QP_WRAP
+        uiDQp = (((Int) pcCU->getRefQP( uiAbsPartIdx ) + iDQp + 52 + 2*uiQpBdOffsetY )%(52+uiQpBdOffsetY)) - uiQpBdOffsetY;
+#else
     uiDQp = pcCU->getRefQP(uiAbsPartIdx) + iDQp;
+#endif
 
   }
   

source/Lib/TLibEncoder/TEncCavlc.cpp

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

source/Lib/TLibEncoder/TEncSbac.cpp

@@ -1058 +1058 @@
 {
   Int iDQp  = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx );
   
+#if FIX_QP_WRAP
+  {
+          UInt uiQpBdOffsetY = 6*(g_uiBitIncrement + g_uiBitDepth - 8);
+#if SET_QP_BD_OFFSET_ZERO
+          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 ) );