Ticket #225: slicemode2-fix.patch

File slicemode2-fix.patch, 1.2 KB (added by rickard, 10 years ago)

Patch for SliceMode=2

  • source/Lib/TLibEncoder/TEncCu.h

     
    115115  /// CU encoding function
    116116  Void  encodeCU            ( TComDataCU*    pcCU, Bool bForceTerminate = false  );
    117117 
     118  Void setBitCounter        ( TComBitCounter* pcBitCounter ) { m_pcBitCounter = pcBitCounter; }
    118119protected:
    119120#if FINE_GRANULARITY_SLICES
    120121  Void  finishCU            ( TComDataCU*  pcCU, UInt uiAbsPartIdx,           UInt uiDepth        );
  • source/Lib/TLibEncoder/TEncSlice.cpp

     
    859859      m_pcEntropyCoder->setEntropyCoder ( m_pppcRDSbacCoder[0][CI_CURR_BEST], pcSlice );
    860860#if OL_USE_WPP
    861861      m_pcEntropyCoder->setBitstream( &pcBitCounters[uiSubStrm] );
     862      m_pcCuEncoder->setBitCounter( &pcBitCounters[uiSubStrm] );
     863      m_pcBitCounter = &pcBitCounters[uiSubStrm];
    862864#else
    863865      m_pcEntropyCoder->setBitstream    ( m_pcBitCounter );
    864866#endif