Ticket #1270: bug1270.patch

source/Lib/TLibCommon/TComDataCU.h

@@ -100 +100 @@
   Char*          m_phQP;               ///< array of QP values
 #if RExt__O0044_CU_ADAPTIVE_CHROMA_QP_OFFSET
   UChar*         m_ChromaQpAdj;        ///< array of chroma QP adjustments (indexed)
+  UInt           m_codedChromaQpAdj;
 #endif
   UChar*         m_puhTrIdx;           ///< array of transform indices
   UChar*         m_puhTransformSkip[MAX_NUM_COMPONENT];///< array of transform skipping flags
@@ -274 +275 @@
   UChar         getChromaQpAdj        (Int idx)           const { return m_ChromaQpAdj[idx];  }
   Void          setChromaQpAdj        (Int idx, UChar val)      { m_ChromaQpAdj[idx] = val;   }
   Void          setChromaQpAdjSubParts( UChar val, Int absPartIdx, Int depth );
+  Void          setCodedChromaQpAdj   ( Char qp )               { m_codedChromaQpAdj = qp;    }
+  Char          getCodedChromaQpAdj   ()                        { return m_codedChromaQpAdj;  }
 #endif
 
   Bool          isLosslessCoded       ( UInt absPartIdx );

source/Lib/TLibDecoder/TDecCu.cpp

@@ -401 +401 @@
   {
     pcCU->setQPSubParts( getdQPFlag()?pcCU->getRefQP(uiAbsPartIdx):pcCU->getCodedQP(), uiAbsPartIdx, uiDepth ); // set QP
   }
-
+#if RExt__O0044_CU_ADAPTIVE_CHROMA_QP_OFFSET
+  if (pcCU->getSlice()->getUseChromaQpAdj() && !getIsChromaQpAdjCoded()) {
+    pcCU->setChromaQpAdjSubParts( pcCU->getCodedChromaQpAdj(), uiAbsPartIdx, uiDepth ); // set QP
+  }
+#endif
   ruiIsLast = xDecodeSliceEnd( pcCU, uiAbsPartIdx, uiDepth);
 }
 

source/Lib/TLibDecoder/TDecSbac.cpp

@@ -1096 +1096 @@
     xReadUnaryMaxSymbol( symbol,  &m_ChromaQpAdjIdcSCModel.get( 0, 0, 0 ), 0, tableSize - 1 RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(ctype) );
     symbol++;
   }
   
   /* NB, symbol = 0 if outer flag is not set,
    *              1 if outer flag is set and there is no inner flag
    *              1+ otherwise */
   cu->setChromaQpAdjSubParts( symbol, absPartIdx, depth );
+  cu->setCodedChromaQpAdj(symbol);
 }
 #endif