Changeset 101 in 3DVCSoftware for trunk/source/Lib/TLibEncoder


Ignore:
Timestamp:
10 Aug 2012, 17:56:17 (12 years ago)
Author:
tech
Message:
  • Added POZNAN_CABAC_INIT_FLAG_FIX bug
  • Fixed CTC cfg-file bug
  • Changed define name
Location:
trunk/source/Lib/TLibEncoder
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibEncoder/TEncGOP.cpp

    r100 r101  
    448448#endif
    449449
    450 #if HHI_VSO_SPEEDUP_A033
     450#if HHI_VSO_SPEEDUP_A0033
    451451#else
    452452    if ( iVSOMode == 4 )
  • trunk/source/Lib/TLibEncoder/TEncGOP.h

    r100 r101  
    137137 
    138138  Void  preLoopFilterPicAll  ( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits );
    139 #if HHI_VSO_SPEEDUP_A033
     139#if HHI_VSO_SPEEDUP_A0033
    140140  TEncTop* getEncTop() { return m_pcEncTop; }
    141141#endif
  • trunk/source/Lib/TLibEncoder/TEncSbac.cpp

    r100 r101  
    278278    m_pcSlice->getPPS()->setEncCABACTableIdx( I_SLICE );
    279279  } 
     280
     281  #if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
     282    m_pcSlice->getPPS()->setEncPrevPOC( m_pcSlice->getPOC() );
     283  #endif
    280284}
    281285#endif
  • trunk/source/Lib/TLibEncoder/TEncSlice.cpp

    r100 r101  
    3838#include "TEncTop.h"
    3939#include "TEncSlice.h"
    40 #if HHI_VSO_SPEEDUP_A033
     40#if HHI_VSO_SPEEDUP_A0033
    4141#include "../../App/TAppEncoder/TAppEncTop.h"
    4242#endif
     
    642642  m_uiPicDist       = 0;
    643643 
     644#if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
     645  Bool bReset =(pcSlice->getPOC() == 0) ||
     646    (pcSlice->getPOC() % m_pcCfg->getIntraPeriod() == 0) ||
     647    (pcSlice->getPPS()->getEncPrevPOC() % m_pcCfg->getIntraPeriod() == 0) ||
     648    (pcSlice->getPOC()/m_pcCfg->getIntraPeriod() > pcSlice->getPPS()->getEncPrevPOC()/m_pcCfg->getIntraPeriod()) ||
     649    (m_pcGOPEncoder->getGOPSize() == 0);
     650
     651  if ( bReset && pcSlice->getPPS()->getCabacInitPresentFlag())
     652  {
     653    pcSlice->getPPS()->setEncCABACTableIdx(pcSlice->getSliceType()); // reset cabac initialization table index
     654  };
     655#endif
     656
    644657  // set entropy coder
    645658  if( m_pcCfg->getUseSBACRD() )
     
    787800  UInt uiTileLCUX     = 0;
    788801
    789 #if HHI_VSO_SPEEDUP_A033
     802#if HHI_VSO_SPEEDUP_A0033
    790803  Int iLastPosY = -1;
    791804#endif
     
    802815    pcCU->initCU( rpcPic, uiCUAddr );
    803816
    804 #if HHI_VSO_SPEEDUP_A033
     817#if HHI_VSO_SPEEDUP_A0033
    805818    if ( m_pcRdCost->getUseRenModel() )
    806819    {
Note: See TracChangeset for help on using the changeset viewer.