Ignore:
Timestamp:
13 Jan 2014, 00:44:19 (10 years ago)
Author:
tech
Message:

Further fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-9.2-dev0/source/Lib/TLibCommon/TComSlice.h

    r767 r768  
    617617  Int  getBitDepthVpsChromaMinus8(  ) { return m_bitDepthVpsChromaMinus8; }
    618618};
    619 #endif
     619
    620620
    621621class TComDpbSize
     
    664664  Int  getMaxVpsLatencyIncreasePlus1( Int i, Int j ) { return m_maxVpsLatencyIncreasePlus1[i][j]; }
    665665};
    666 
     666#endif
    667667class TComVPS
    668668{
     
    13521352  TComHRD* getHrdParameters                 ()             { return &m_hrdParameters; }
    13531353  TimingInfo* getTimingInfo() { return &m_timingInfo; }
    1354 
    1355   Void inferVideoSignalInfo( TComVPS* vps, Int layerIdCurr )
    1356   {
    1357     if ( layerIdCurr == 0 || !vps->getVpsVuiPresentFlag() )
    1358     {
    1359       return;
    1360     }
    1361 
    1362     TComVPSVUI* vpsVUI = vps->getVPSVUI();
    1363     assert( vpsVUI != NULL ); 
    1364 
    1365     TComVideoSignalInfo* videoSignalInfo = vpsVUI->getVideoSignalInfo( vpsVUI->getVpsVideoSignalInfoIdx( vps->getLayerIdInVps( layerIdCurr ) ) );
    1366     assert( videoSignalInfo != NULL );
    1367 
    1368     setVideoFormat            ( videoSignalInfo->getVideoVpsFormat            () );
    1369     setVideoFullRangeFlag     ( videoSignalInfo->getVideoFullRangeVpsFlag     () );
    1370     setColourPrimaries        ( videoSignalInfo->getColourPrimariesVps        () );
    1371     setTransferCharacteristics( videoSignalInfo->getTransferCharacteristicsVps() );
    1372     setMatrixCoefficients     ( videoSignalInfo->getMatrixCoeffsVps           () );     
    1373   }
     1354#if H_MV
     1355  Void inferVideoSignalInfo( TComVPS* vps, Int layerIdCurr );
     1356#endif
    13741357};
    13751358
Note: See TracChangeset for help on using the changeset viewer.