Changeset 452 in SHVCSoftware


Ignore:
Timestamp:
8 Nov 2013, 07:19:47 (11 years ago)
Author:
seregin
Message:

remove SPS_SUB_LAYER_INFO macro

Location:
branches/SHM-4.0-dev/source/Lib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-4.0-dev/source/Lib/TLibCommon/TypeDef.h

    r451 r452  
    7878#define VPS_MOVE_DIR_DEPENDENCY_FLAG     1      ///< JCTVC-M0268: Move the syntax element direct_dependency_flag to follow the syntax element dimension_id
    7979#define VPS_PROFILE_OUTPUT_LAYERS        1      ///< JCTVC-M0268: Signal profile information and output layer information as in Sec. 3 of M0268v2
    80 #define SPS_SUB_LAYER_INFO               1      ///< JCTVC-M0268: Do not signal sps_max_sub_layers_minus1 and sps_temporal_id_nesting_flag for nuh_layer_id greater than 0
    8180#define M0457_PREDICTION_INDICATIONS     1
    8281#define M0040_ADAPTIVE_RESOLUTION_CHANGE 1

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

    r451 r452  
    536536}
    537537
    538 #if SPS_SUB_LAYER_INFO
     538#if SVC_EXTENSION
    539539Void TDecCavlc::parseSPS(TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager)
    540540#else
    … …  
    548548  UInt  uiCode;
    549549  READ_CODE( 4,  uiCode, "sps_video_parameter_set_id");          pcSPS->setVPSId        ( uiCode );
    550 #if SPS_SUB_LAYER_INFO
     550#if SVC_EXTENSION
    551551  if(pcSPS->getLayerId() == 0)
    552552  {
    … …  
    556556 
    557557    READ_FLAG( uiCode, "sps_temporal_id_nesting_flag" );               pcSPS->setTemporalIdNestingFlag ( uiCode > 0 ? true : false );
    558 #if SPS_SUB_LAYER_INFO
     558#if SVC_EXTENSION
    559559  }
    560560  else
    … …  
    563563    pcSPS->setTemporalIdNestingFlag( parameterSetManager->getPrefetchedVPS(pcSPS->getVPSId())->getTemporalNestingFlag() );
    564564  }
    565 #endif
    566565#if IL_SL_SIGNALLING_N0371
    567566  pcSPS->setVPS( parameterSetManager->getPrefetchedVPS(pcSPS->getVPSId()) );
    568567  pcSPS->setSPS( pcSPS->getLayerId(), pcSPS );
    569568#endif
     569#endif
    570570  if ( pcSPS->getMaxTLayers() == 1 )
    571571  {
    572572    // sps_temporal_id_nesting_flag must be 1 when sps_max_sub_layers_minus1 is 0
    573 #if SPS_SUB_LAYER_INFO
     573#if SVC_EXTENSION
    574574    assert( pcSPS->getTemporalIdNestingFlag() == true );
    575575#else

  • branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.h

    r442 r452  
    7272  Void  parseQtRootCbf      ( UInt uiAbsPartIdx, UInt& uiQtRootCbf );
    7373  Void  parseVPS            ( TComVPS* pcVPS );
     74#if SPS_EXTENSION
    7475#if VPS_EXTNS
    7576  Void  parseVPSExtension   ( TComVPS* pcVPS );
    … …  
    8283  Void  parseRepFormat      ( RepFormat *repFormat );
    8384#endif
    84 #if SPS_SUB_LAYER_INFO
    8585  Void  parseSPS            ( TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager );
    86 #else
     86  Void  parseSPSExtension    ( TComSPS* pcSPS );
     87#else //SVC_EXTENSION
    8788  Void  parseSPS            ( TComSPS* pcSPS );
    88 #endif
    89 #if SPS_EXTENSION
    90   Void parseSPSExtension    ( TComSPS* pcSPS );
    91 #endif
     89#endif //SVC_EXTENSION
    9290  Void  parsePPS            ( TComPPS* pcPPS);
    9391  Void  parseVUI            ( TComVUI* pcVUI, TComSPS* pcSPS );

  • branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecEntropy.h

    r345 r452  
    6666
    6767  virtual Void  parseVPS                  ( TComVPS* pcVPS )                       = 0;
    68 #if SPS_SUB_LAYER_INFO
     68#if SVC_EXTENSION
    6969  virtual Void  parseSPS                  ( TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager )           = 0;
    7070#else
    … …  
    134134  Void    resetEntropy                ( TComSlice* p)           { m_pcEntropyDecoderIf->resetEntropy(p);                    }
    135135  Void    decodeVPS                   ( TComVPS* pcVPS ) { m_pcEntropyDecoderIf->parseVPS(pcVPS); }
    136 #if SPS_SUB_LAYER_INFO
     136#if SVC_EXTENSION
    137137  Void    decodeSPS                   ( TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager )    { m_pcEntropyDecoderIf->parseSPS(pcSPS, parameterSetManager);                    }
    138138#else

  • branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecSbac.h

    r345 r452  
    7676  Void  setBitstream              ( TComInputBitstream* p  ) { m_pcBitstream = p; m_pcTDecBinIf->init( p ); }
    7777  Void  parseVPS                  ( TComVPS* /*pcVPS*/ ) {}
    78 #if SPS_SUB_LAYER_INFO
     78#if SVC_EXTENSION
    7979  Void  parseSPS                  ( TComSPS* /*pcSPS*/, ParameterSetManagerDecoder * /*parameterSetManager*/ ) {}
    8080#else

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

    r448 r452  
    13781378#if SVC_EXTENSION
    13791379  sps->setLayerId(m_layerId);
    1380 #endif
    1381 
    1382 #if SPS_SUB_LAYER_INFO
    13831380  m_cEntropyDecoder.decodeSPS( sps, &m_parameterSetManagerDecoder[0] );
    1384 #else
    1385   m_cEntropyDecoder.decodeSPS( sps );
    1386 #endif
    1387 #if SVC_EXTENSION
    13881381  m_parameterSetManagerDecoder[m_layerId].storePrefetchedSPS(sps);
    1389 #else
    1390   m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
    1391 #endif
    1392 #if SVC_EXTENSION
    13931382#if !REPN_FORMAT_IN_VPS   // ILRP can only be initialized at activation 
    13941383  if(m_numLayer>0)
    … …  
    13971386  }
    13981387#endif
    1399 #endif
     1388#else //SVC_EXTENSION
     1389  m_cEntropyDecoder.decodeSPS( sps );
     1390  m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
     1391#endif //SVC_EXTENSION
    14001392}
    14011393

  • branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r451 r452  
    448448#endif
    449449  WRITE_CODE( pcSPS->getVPSId (),          4,       "sps_video_parameter_set_id" );
    450 #if SPS_SUB_LAYER_INFO
     450#if SVC_EXTENSION
    451451  if(pcSPS->getLayerId() == 0)
    452452  {
    … …  
    454454    WRITE_CODE( pcSPS->getMaxTLayers() - 1,  3,       "sps_max_sub_layers_minus1" );
    455455    WRITE_FLAG( pcSPS->getTemporalIdNestingFlag() ? 1 : 0,                             "sps_temporal_id_nesting_flag" );
    456 #if SPS_SUB_LAYER_INFO
     456#if SVC_EXTENSION
    457457  }
    458458#endif
Note: See TracChangeset for help on using the changeset viewer.