Ticket #284: HM-5.0-dev-misc-rev1755-unused-dqp-context-removal.patch

source/Lib/TLibCommon/ContextTables.h

@@ -84 +84 @@
 #define NUM_TRANS_SUBDIV_FLAG_CTX     10      ///< number of context models for transform subdivision flags
 #define NUM_QT_CBF_CTX                5       ///< number of context models for QT CBF
 #define NUM_QT_ROOT_CBF_CTX           1       ///< number of context models for QT ROOT CBF
-#define NUM_DELTA_QP_CTX              4       ///< number of context models for dQP
+#define NUM_DELTA_QP_CTX              3       ///< number of context models for dQP
 
 #if MULTI_LEVEL_SIGNIFICANCE
 #define NUM_SIG_CG_FLAG_CTX           2       ///< number of context models for MULTI_LEVEL_SIGNIFICANCE
@@ -447 +447 @@
 INIT_DQP[3][NUM_DELTA_QP_CTX] =
 {
   {
-    CNU, CNU, CNU, CNU,
+    CNU, CNU, CNU, 
     
   },
   {
-    CNU, CNU, CNU, CNU,
+    CNU, CNU, CNU, 
     
   },
   {
-    CNU, CNU, CNU, CNU,
+    CNU, CNU, CNU, 
     
   },
 };
@@ -1536 +1536 @@
 INIT_DQP[3][NUM_DELTA_QP_CTX][2] =
 {
   {
-    {    0,   64 }, {    0,   64 }, {    0,   64 }, {    0,   64 }
+    {    0,   64 }, {    0,   64 }, {    0,   64 }, 
   },
   {
-    {    0,   64 }, {    0,   64 }, {    0,   64 }, {    0,   64 }
+    {    0,   64 }, {    0,   64 }, {    0,   64 }, 
   },
   {
-    {    0,   64 }, {    0,   64 }, {    0,   64 }, {    0,   64 }
+    {    0,   64 }, {    0,   64 }, {    0,   64 }, 
   }
 };
 

source/Lib/TLibDecoder/TDecSbac.cpp

@@ -1261 +1261 @@
 
     UInt uiMaxAbsDQpMinus1 = 24 + (uiQpBdOffsetY/2) + (uiSign);
     UInt uiAbsDQpMinus1;
-    xReadUnaryMaxSymbol (uiAbsDQpMinus1,  &m_cCUDeltaQpSCModel.get( 0, 0, 2 ), 1, uiMaxAbsDQpMinus1);
+    xReadUnaryMaxSymbol (uiAbsDQpMinus1,  &m_cCUDeltaQpSCModel.get( 0, 0, 1 ), 1, uiMaxAbsDQpMinus1);
 
     iDQp = uiAbsDQpMinus1 + 1;
 
@@ -1270 +1270 @@
       iDQp = -iDQp;
     }
 #else
-    xReadUnarySymbol( uiDQp, &m_cCUDeltaQpSCModel.get( 0, 0, 2 ), 1 );
+    xReadUnarySymbol( uiDQp, &m_cCUDeltaQpSCModel.get( 0, 0, 1 ), 1 );
     iDQp = ( uiDQp + 2 ) / 2;
     
     if ( uiDQp & 1 )

source/Lib/TLibEncoder/TEncSbac.cpp

@@ -1118 +1118 @@
 
     UInt uiMaxAbsDQpMinus1 = 24 + (uiQpBdOffsetY/2) + (uiSign);
     UInt uiAbsDQpMinus1 = (UInt)((iDQp > 0)? iDQp  : (-iDQp)) - 1;
-    xWriteUnaryMaxSymbol( uiAbsDQpMinus1, &m_cCUDeltaQpSCModel.get( 0, 0, 2 ), 1, uiMaxAbsDQpMinus1);
+    xWriteUnaryMaxSymbol( uiAbsDQpMinus1, &m_cCUDeltaQpSCModel.get( 0, 0, 1 ), 1, uiMaxAbsDQpMinus1);
 #else
     UInt uiDQp = (UInt)( iDQp > 0 ? ( 2 * iDQp - 2 ) : ( -2 * iDQp - 1 ) );
-    xWriteUnarySymbol( uiDQp, &m_cCUDeltaQpSCModel.get( 0, 0, 2 ), 1 );
+    xWriteUnarySymbol( uiDQp, &m_cCUDeltaQpSCModel.get( 0, 0, 1 ), 1 );
 #endif
   }