Ticket #42: CTU_bit_distortion_calculation_fix.patch

source/Lib/TLibCommon/TypeDef.h

@@ -317 +317 @@
 #define FIX_TICKET37                                      1  ///< Fix of ticket #37 (incorrect m_pppcPredYuvBest buffer copy)
 #define FIX_TICKET39                                      1  ///< Fix of ticket #39 (encoder bug of delta QP)
 #define FIX_TICKET40                                      1  ///< Fix of ticket #40 (ALF crash when image height is greater than image width)
+#define FIX_TICKET42                                      1  ///< Fix of ticket #42 (CTU bits/distortion calculation mistake for I slice when QTBT is enabled)
 
 ///////////////////////////////////////////////////////////
 // KTA tools section end

source/Lib/TLibEncoder/TEncCu.cpp

@@ -880 +880 @@
       }
 #endif
 
+#if FIX_TICKET42
+          Double dLumaCTBTotalCost = pCtu->getTotalCost();
+          Distortion dLumaCTBTotalDistortion = pCtu->getTotalDistortion();
+          UInt uiLumaCTBTotalBits = pCtu->getTotalBits();
+          UInt uiLumaCTBTotalBins = pCtu->getTotalBins();
+#endif
       xCompressCU( m_pppcBestCU[uiWidthIdx][uiHeightIdx], m_pppcTempCU[uiWidthIdx][uiHeightIdx], 0, uiCTUSize, uiCTUSize, 0 DEBUG_STRING_PASS_INTO(sDebug) );
+#if FIX_TICKET42
+          pCtu->getTotalCost() += dLumaCTBTotalCost;
+          pCtu->getTotalDistortion() += dLumaCTBTotalDistortion;
+          pCtu->getTotalBits() += uiLumaCTBTotalBits;
+          pCtu->getTotalBins() += uiLumaCTBTotalBins;
+#endif
     }
 #endif