Ticket #286: SliceMode2.patch

source/Lib/TLibEncoder/TEncCu.h

@@ -115 +115 @@
   /// CU encoding function
   Void  encodeCU            ( TComDataCU*    pcCU, Bool bForceTerminate = false  );
   
+#if !FAST_BIT_EST
+  Void setBitCounter        ( TComBitCounter* pcBitCounter ) { m_pcBitCounter = pcBitCounter; }
+#endif
 protected:
 #if FINE_GRANULARITY_SLICES
   Void  finishCU            ( TComDataCU*  pcCU, UInt uiAbsPartIdx,           UInt uiDepth        );

source/Lib/TLibEncoder/TEncSlice.cpp

@@ -1049 +1049 @@
       m_pcEntropyCoder->setEntropyCoder ( m_pppcRDSbacCoder[0][CI_CURR_BEST], pcSlice );
 #if OL_USE_WPP
       m_pcEntropyCoder->setBitstream( &pcBitCounters[uiSubStrm] );
+#if !FAST_BIT_EST
+      m_pcCuEncoder->setBitCounter( &pcBitCounters[uiSubStrm] );
+      m_pcBitCounter = &pcBitCounters[uiSubStrm];
+#endif
 #else
       m_pcEntropyCoder->setBitstream    ( m_pcBitCounter );
 #endif