Changeset 324 in SHVCSoftware for branches/SHM-3.0-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
3 Aug 2013, 12:30:39 (11 years ago)
Author:
seregin
Message:

remove alternative collocated picture signalling (JCTVC-N0107)

Location:
branches/SHM-3.0-dev/source/Lib/TLibDecoder
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-3.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r321 r324  
    15731573    if ( rpcSlice->getEnableTMVPFlag() )
    15741574    {
    1575 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
     1575#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    15761576      rpcSlice->setMFMEnabledFlag( false );
    15771577      rpcSlice->setColRefLayerIdx( 0 );
    … …  
    16121612        rpcSlice->setColRefIdx(0);
    16131613      }
    1614 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
     1614#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    16151615      }
    16161616#endif

  • branches/SHM-3.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r323 r324  
    918918      {
    919919        pcSlice->setRefPOCListILP(m_ppcTDecTop[m_layerId]->m_cIlpPic, pcSlice->getBaseColPic());
    920 #if M0457_COL_PICTURE_SIGNALING
     920#if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    921921        pcSlice->setMotionPredIlp(getMotionPredIlp(pcSlice));
    922922#endif
    … …  
    13721372#endif
    13731373
    1374 #if M0457_COL_PICTURE_SIGNALING
     1374#if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    13751375TComPic* TDecTop::getMotionPredIlp(TComSlice* pcSlice)
    13761376{

  • branches/SHM-3.0-dev/source/Lib/TLibDecoder/TDecTop.h

    r313 r324  
    230230  Void      xDecodePPS();
    231231  Void      xDecodeSEI( TComInputBitstream* bs, const NalUnitType nalUnitType );
    232 #if M0457_COL_PICTURE_SIGNALING
     232#if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    233233  TComPic*  getMotionPredIlp(TComSlice* pcSlice);
    234234#endif
Note: See TracChangeset for help on using the changeset viewer.