Changeset 313 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComSlice.cpp


Ignore:
Timestamp:
20 Mar 2013, 21:35:14 (11 years ago)
Author:
tech
Message:

Reintegrated branch 6.0-dev0 rev. 312.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComSlice.cpp

    r296 r313  
    17611761
    17621762Void
     1763#if FCO_FIX_SPS_CHANGE
     1764TComSPS::initMultiviewSPSDepth( UInt uiViewId, Int iViewOrderIdx, UInt uiCamParPrecision, Bool bCamParSlice, Int** aaiScale, Int** aaiOffset )
     1765#else
    17631766TComSPS::initMultiviewSPSDepth( UInt uiViewId, Int iViewOrderIdx )
     1767#endif
    17641768{
    17651769  AOT( uiViewId == 0 && iViewOrderIdx != 0 );
     
    17691773  m_iViewOrderIdx         = iViewOrderIdx;
    17701774  m_bDepth                = true;
     1775#if FCO_FIX_SPS_CHANGE
     1776  m_uiCamParPrecision     = ( m_uiViewId ? uiCamParPrecision : 0 );
     1777  m_bCamParInSliceHeader  = ( m_uiViewId ? bCamParSlice  : false );
     1778#else
    17711779  m_uiCamParPrecision     = 0;
    17721780  m_bCamParInSliceHeader  = false;
     1781#endif
    17731782  ::memset( m_aaiCodedScale,  0x00, sizeof( m_aaiCodedScale  ) );
    17741783  ::memset( m_aaiCodedOffset, 0x00, sizeof( m_aaiCodedOffset ) );
     1784#if FCO_FIX_SPS_CHANGE
     1785#if !QC_MVHEVC_B0046
     1786  if( !m_bCamParInSliceHeader )
     1787  {
     1788    for( UInt uiBaseViewId = 0; uiBaseViewId < m_uiViewId; uiBaseViewId++ )
     1789    {
     1790      m_aaiCodedScale [ 0 ][ uiBaseViewId ] = aaiScale [ uiBaseViewId ][   m_uiViewId ];
     1791      m_aaiCodedScale [ 1 ][ uiBaseViewId ] = aaiScale [   m_uiViewId ][ uiBaseViewId ];
     1792      m_aaiCodedOffset[ 0 ][ uiBaseViewId ] = aaiOffset[ uiBaseViewId ][   m_uiViewId ];
     1793      m_aaiCodedOffset[ 1 ][ uiBaseViewId ] = aaiOffset[   m_uiViewId ][ uiBaseViewId ];
     1794    }
     1795  }
     1796#endif
     1797#endif
     1798
    17751799}
    17761800
Note: See TracChangeset for help on using the changeset viewer.