Ignore:
Timestamp:
30 Mar 2012, 18:57:41 (12 years ago)
Author:
poznan-univ
Message:

some bug fix on high level syntax
fixed some compiler warning issues under windows and linux

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.3-poznan-univ/source/Lib/TLibEncoder/TEncTop.cpp

    r41 r48  
    576576  m_cSPS.setMaxTrSize   ( 1 << m_uiQuadtreeTULog2MaxSize );
    577577
     578#if BITSTREAM_EXTRACTION
     579  m_cSPS.setLayerId( m_uiLayerId );
     580#endif
     581
    578582  if( m_bIsDepth )
    579583  {
     584#if FLEXCO_CAMPARAM_IN_DEPTH
     585    //m_cSPS.initMultiviewSPSDepth    ( m_uiViewId, m_iViewOrderIdx );
     586    m_cSPS.initMultiviewSPS         ( m_uiViewId, m_iViewOrderIdx, m_uiCamParPrecision, m_bCamParInSliceHeader, m_aaiCodedScale, m_aaiCodedOffset, true );
     587#else
    580588    m_cSPS.initMultiviewSPSDepth    ( m_uiViewId, m_iViewOrderIdx );
     589#endif
    581590#if DEPTH_MAP_GENERATION
    582591    m_cSPS.setPredDepthMapGeneration( m_uiViewId, true );
     
    654663  m_cSPS.setUseDMM( m_bUseDMM );
    655664#endif
     665#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     666  m_cSPS.setUseDMM34( m_bUseDMM34 );
     667#endif
    656668#if HHI_MPI
    657669  m_cSPS.setUseMVI( m_bUseMVI );
     
    678690Void TEncTop::xInitPPS()
    679691{
     692#if BITSTREAM_EXTRACTION
     693  m_cPPS.setLayerId( m_uiLayerId );
     694#endif
     695
    680696  m_cPPS.setConstrainedIntraPred( m_bUseConstrainedIntraPred );
    681697  m_cPPS.setPPSId( ( m_uiViewId << 1 ) + ( m_bIsDepth ? 1 : 0 ) );
Note: See TracChangeset for help on using the changeset viewer.