Ticket #392: bugfix_for_ticket_392_v1.patch

Lib/TLibCommon/TypeDef.h

@@ -68 +68 @@
 #define CLIPSCALEDMVP               1  ///< H0216: Clipping scaled MV to 16 bit
 
 #define UNIFIED_TRANSFORM_TREE      1   ///< H0123: unified tree structure for TU
+#define FIX_TICKET_392              1   ///< Fix Ticket #392 (encoder decoder mismatch occures when QP_adaptation enabled)
 
 #define SIGMAP_CTX_SUBBLOCK       1 ///< H0290: 4x4 sub-block based region for significant_flag context selection
 

Lib/TLibDecoder/TDecEntropy.cpp

@@ -593 +593 @@
   const UInt uiLog2TrafoSize = g_aucConvertToBit[pcCU->getSlice()->getSPS()->getMaxCUWidth()]+2 - uiDepth;
 
 #if UNIFIED_TRANSFORM_TREE
+#if FIX_TICKET_392 && UNIFIED_TRANSFORM_TREE
+  if(uiTrIdx==0)
+  {
+    m_bakAbsPartIdxCU = uiAbsPartIdx;
+  }
+#endif
   if( uiLog2TrafoSize == 2 )
   {
     UInt partNum = pcCU->getPic()->getNumPartInCU() >> ( ( uiDepth - 1 ) << 1 );
@@ -814 +820 @@
       {
         if ( bCodeDQP )
         {
+#if FIX_TICKET_392 && UNIFIED_TRANSFORM_TREE
+          decodeQP( pcCU, m_bakAbsPartIdxCU);
+#else
           decodeQP( pcCU, uiAbsPartIdx, uiDepth);
+#endif
           bCodeDQP = false;
         }
       }
@@ -881 +891 @@
 }
 #endif // UNIFIED_TRANSFORM_TREE
 
+#if FIX_TICKET_392 && UNIFIED_TRANSFORM_TREE
+Void TDecEntropy::decodeQP          ( TComDataCU* pcCU, UInt uiAbsPartIdx )
+{
+  if ( pcCU->getSlice()->getPPS()->getUseDQP() )
+  {
+    m_pcEntropyDecoderIf->parseDeltaQP( pcCU, uiAbsPartIdx, pcCU->getDepth( uiAbsPartIdx ) );
+  }
+}
+#else
 Void TDecEntropy::decodeQP          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
   if ( pcCU->getSlice()->getPPS()->getUseDQP() )
@@ -888 +907 @@
     m_pcEntropyDecoderIf->parseDeltaQP( pcCU, uiAbsPartIdx, uiDepth );
   }
 }
+#endif
 
 #if !UNIFIED_TRANSFORM_TREE
 Void TDecEntropy::xDecodeCoeff( TComDataCU* pcCU, UInt uiLumaOffset, UInt uiChromaOffset, UInt uiAbsPartIdx, UInt uiDepth, UInt uiWidth, UInt uiHeight, UInt uiTrIdx, UInt uiCurrTrIdx, Bool& bCodeDQP )

Lib/TLibDecoder/TDecEntropy.h

@@ -166 +166 @@
   TComPrediction* m_pcPrediction;
   UInt    m_uiBakAbsPartIdx;
   UInt    m_uiBakChromaOffset;
+#if FIX_TICKET_392 && UNIFIED_TRANSFORM_TREE
+  UInt    m_bakAbsPartIdxCU;
+#endif
   
 public:
   Void init (TComPrediction* p) {m_pcPrediction = p;}
@@ -231 +234 @@
 #if !UNIFIED_TRANSFORM_TREE
   Void decodeTransformIdx      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
+#if FIX_TICKET_392 && UNIFIED_TRANSFORM_TREE
+  Void decodeQP                ( TComDataCU* pcCU, UInt uiAbsPartIdx );
+#else
   Void decodeQP                ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
+#endif
   
   Void readTileMarker         ( UInt& uiTileIdx, UInt uiBitsUsed )  {  m_pcEntropyDecoderIf->readTileMarker( uiTileIdx, uiBitsUsed ); }
   Void updateContextTables    ( SliceType eSliceType, Int iQp ) { m_pcEntropyDecoderIf->updateContextTables( eSliceType, iQp ); }

Lib/TLibEncoder/TEncEntropy.cpp

@@ -947 +947 @@
   UInt cbfU = pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, uiTrIdx );
   UInt cbfV = pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, uiTrIdx );
 
+#if FIX_TICKET_392 && UNIFIED_TRANSFORM_TREE
+  if(uiTrIdx==0)
+  {
+    m_bakAbsPartIdxCU = uiAbsPartIdx;
+  }
+#endif
   if( uiLog2TrafoSize == 2 )
   {
     UInt partNum = pcCU->getPic()->getNumPartInCU() >> ( ( uiDepth - 1 ) << 1 );
@@ -1165 +1171 @@
         {
           if ( bCodeDQP )
           {
+#if FIX_TICKET_392 && UNIFIED_TRANSFORM_TREE
+            encodeQP( pcCU, m_bakAbsPartIdxCU );
+#else
             encodeQP( pcCU, uiAbsPartIdx );
+#endif
             bCodeDQP = false;
           }
         }

Lib/TLibEncoder/TEncEntropy.h

@@ -165 +165 @@
 private:
   UInt    m_uiBakAbsPartIdx;
   UInt    m_uiBakChromaOffset;
+#if FIX_TICKET_392 && UNIFIED_TRANSFORM_TREE
+  UInt    m_bakAbsPartIdxCU;
+#endif
 
 public:
   Void    setEntropyCoder           ( TEncEntropyIf* e, TComSlice* pcSlice );