Ticket #286: SliceMode2.patch

File SliceMode2.patch, 1.2 KB (added by rickard, 11 years ago)

Patch for SliceMode=2 when FAST_BIT_EST=0

  • source/Lib/TLibEncoder/TEncCu.h

     
    115115  /// CU encoding function
    116116  Void  encodeCU            ( TComDataCU*    pcCU, Bool bForceTerminate = false  );
    117117 
     118#if !FAST_BIT_EST
     119  Void setBitCounter        ( TComBitCounter* pcBitCounter ) { m_pcBitCounter = pcBitCounter; }
     120#endif
    118121protected:
    119122#if FINE_GRANULARITY_SLICES
    120123  Void  finishCU            ( TComDataCU*  pcCU, UInt uiAbsPartIdx,           UInt uiDepth        );
  • source/Lib/TLibEncoder/TEncSlice.cpp

     
    10491049      m_pcEntropyCoder->setEntropyCoder ( m_pppcRDSbacCoder[0][CI_CURR_BEST], pcSlice );
    10501050#if OL_USE_WPP
    10511051      m_pcEntropyCoder->setBitstream( &pcBitCounters[uiSubStrm] );
     1052#if !FAST_BIT_EST
     1053      m_pcCuEncoder->setBitCounter( &pcBitCounters[uiSubStrm] );
     1054      m_pcBitCounter = &pcBitCounters[uiSubStrm];
     1055#endif
    10521056#else
    10531057      m_pcEntropyCoder->setBitstream    ( m_pcBitCounter );
    10541058#endif