Changeset 1177 in SHVCSoftware


Ignore:
Timestamp:
8 Jul 2015, 02:41:56 (9 years ago)
Author:
seregin
Message:

macro cleanup: OUTPUT_LAYER_SET_INDEX

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

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

    r1107 r1177  
    7070  string cfg_ReconFile [MAX_LAYERS];
    7171  Int layerNum, targetLayerId;
    72 #if OUTPUT_LAYER_SET_INDEX
    7372  Int olsIdx;
    74 #endif
    7573#if CONFORMANCE_BITSTREAM_MODE
    7674  string cfg_confPrefix;
    … …  
    104102  ("TargetLayerId,-lid", targetLayerId, -1, "Target layer id")
    105103  ("LayerNum,-ls", layerNum, MAX_NUM_LAYER_IDS, "Target layer id") // Legacy option
    106 #if OUTPUT_LAYER_SET_INDEX
    107104  ("OutpuLayerSetIdx,-olsidx", olsIdx, -1, "Index of output layer set to be decoded.")
    108 #endif
    109105#if CONFORMANCE_BITSTREAM_MODE
    110106  ("ConformanceBitstremMode,-confMode", m_confModeFlag, false, "Enable generation of conformance bitstream metadata; True: Generate metadata, False: No metadata generated")
    … …  
    171167  assert( targetLayerId < MAX_NUM_LAYER_IDS );
    172168#endif
    173 #if OUTPUT_LAYER_SET_INDEX
    174169#if CONFORMANCE_BITSTREAM_MODE
    175170  if( m_confModeFlag )
    … …  
    202197  m_commonDecoderParams.setTargetOutputLayerSetIdx( olsIdx );
    203198  m_commonDecoderParams.setTargetLayerId( targetLayerId );
    204 #endif
     199
    205200#if CONFORMANCE_BITSTREAM_MODE
    206201  for(Int layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++ )
    … …  
    264259      fprintf(stderr, "File %s could not be opened. Using all LayerIds as default.\n", cfg_TargetDecLayerIdSetFile.c_str() );
    265260    }
    266 #if OUTPUT_LAYER_SET_INDEX 
    267     this->getCommonDecoderParams()->setTargetDecLayerIdSet( &m_targetDecLayerIdSet );
     261
     262#if SVC_EXTENSION
     263    m_commonDecoderParams.setTargetDecLayerIdSet( &m_targetDecLayerIdSet );
    268264#endif
    269265  }

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h

    r1057 r1177  
    7474#endif
    7575
     76  std::vector<Int> m_targetDecLayerIdSet;             ///< set of LayerIds to be included in the sub-bitstream extraction process.
     77  Int           m_respectDefDispWindow;               ///< Only output content inside the default display window
     78#if O0043_BEST_EFFORT_DECODING
     79  UInt          m_forceDecodeBitDepth;                ///< if non-zero, force the bit depth at the decoder (best effort decoding)
     80#endif
     81  std::string   m_outputDecodedSEIMessagesFilename;   ///< filename to output decoded SEI messages to. If '-', then use stdout. If empty, do not output details.
     82
    7683#if SVC_EXTENSION
    7784#if AVC_BASE
    … …  
    8289#endif
    8390#endif
    84 #endif
    85 
    86   std::vector<Int> m_targetDecLayerIdSet;             ///< set of LayerIds to be included in the sub-bitstream extraction process.
    87   Int           m_respectDefDispWindow;               ///< Only output content inside the default display window
    88 #if O0043_BEST_EFFORT_DECODING
    89   UInt          m_forceDecodeBitDepth;                ///< if non-zero, force the bit depth at the decoder (best effort decoding)
    90 #endif
    91   std::string   m_outputDecodedSEIMessagesFilename;   ///< filename to output decoded SEI messages to. If '-', then use stdout. If empty, do not output details.
    92 #if OUTPUT_LAYER_SET_INDEX
    9391  CommonDecoderParams             m_commonDecoderParams;
    94 #endif
    9592#if CONFORMANCE_BITSTREAM_MODE
    9693  Bool          m_confModeFlag;
    … …  
    10097  std::string   m_decodedYuvLayerFileName[63];
    10198  Bool          m_decodedYuvLayerRefresh[63];
     99#endif
    102100#endif
    103101
    … …  
    134132
    135133  Bool  parseCfg        ( Int argc, Char* argv[] );   ///< initialize option class from configuration
    136 #if OUTPUT_LAYER_SET_INDEX
     134
     135#if SVC_EXTENSION
    137136  CommonDecoderParams* getCommonDecoderParams() {return &m_commonDecoderParams;}
    138 #endif
     137
    139138#if CONFORMANCE_BITSTREAM_MODE
    140139  Bool const getConfModeFlag() { return m_confModeFlag;  }
    … …  
    148147  Void setDecodedYuvLayerRefresh(Int const layerId, Bool const x) {m_decodedYuvLayerRefresh[layerId] = x; }
    149148#endif
     149#endif
     150
    150151};
    151152

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r1139 r1177  
    666666    m_acTDecTop[layer].setNumLayer( m_tgtLayerId + 1 );
    667667#endif
    668 #if OUTPUT_LAYER_SET_INDEX
    669668    m_acTDecTop[layer].setCommonDecoderParams( &m_commonDecoderParams );
    670 #endif
    671669  }
    672670#if CONFORMANCE_BITSTREAM_MODE

  • branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h

    r1106 r1177  
    306306};
    307307
    308 #if OUTPUT_LAYER_SET_INDEX
     308#if SVC_EXTENSION
    309309class CommonDecoderParams
    310310{

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

    r1176 r1177  
    124124#define VPS_DPB_SIZE_TABLE               1      ///< JCTVC-O0217: DPB operations: signaling DPB-related parameters
    125125#if VPS_DPB_SIZE_TABLE
    126 #define OUTPUT_LAYER_SET_INDEX           1      ///< JCTVC-O0217: DPB operations: Inference/input of output layer set index
    127 #if OUTPUT_LAYER_SET_INDEX
    128126#define USE_DPB_SIZE_TABLE               1      ///< JCTVC-O0217: DPB operations: Use signaled DPB-size table parameters in the decoder
    129 #endif
    130127#endif
    131128#define DPB_PARAMS_MAXTLAYERS            1      ///< JCTVC-P0156 DPB parameters up to maximum temporal sub-layers in the layer set

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

    r1175 r1177  
    699699#if SVC_EXTENSION
    700700  m_apcSlicePilot->setVPS( m_parameterSetManagerDecoder.getPrefetchedVPS(0) );
    701 #if OUTPUT_LAYER_SET_INDEX
     701
    702702  // Following check should go wherever the VPS is activated
    703   if (!m_apcSlicePilot->getVPS()->getBaseLayerAvailableFlag())
     703  if( !m_apcSlicePilot->getVPS()->getBaseLayerAvailableFlag() )
    704704  {
    705705    assert(nalu.m_layerId != 0);
    706706    assert(m_apcSlicePilot->getVPS()->getNumAddLayerSets() > 0);
    707     if (getCommonDecoderParams()->getTargetOutputLayerSetIdx() >= 0)
     707
     708    if( m_commonDecoderParams->getTargetOutputLayerSetIdx() >= 0 )
    708709    {
    709710      UInt layerIdx = m_apcSlicePilot->getVPS()->getOutputLayerSetIdx(getCommonDecoderParams()->getTargetOutputLayerSetIdx());
    … …  
    711712    }
    712713  } 
    713 #endif
     714
    714715  m_apcSlicePilot->initSlice( nalu.m_layerId );
    715716#else //SVC_EXTENSION
    … …  
    24542455}
    24552456
    2456 #if OUTPUT_LAYER_SET_INDEX
    24572457Void TDecTop::checkValueOfTargetOutputLayerSetIdx(TComVPS *vps)
    24582458{
    … …  
    24772477    // Currently, the target layer ID in the encoder assumes that all the layers are decoded   
    24782478    // Check if any of the output layer sets match this description
    2479     for(Int i = 0; i < vps->getNumOutputLayerSets(); i++)
     2479    for( Int i = 0; i < vps->getNumOutputLayerSets(); i++ )
    24802480    {
    24812481      Bool layerSetMatchFlag = false;
    24822482      Int layerSetIdx = vps->getOutputLayerSetIdx( i );
    24832483
    2484       for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++)
     2484      for( Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++ )
    24852485      {
    24862486        if( vps->getLayerSetLayerIdList( layerSetIdx, j ) == params->getTargetLayerId() )
    … …  
    24982498          if( params->getTargetDecLayerIdSet()->size() ) 
    24992499          {
    2500             for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++)
     2500            for( Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++ )
    25012501            {
    25022502              if( *(params->getTargetDecLayerIdSet()->begin() + j) != vps->getLayerIdInNuh(vps->getLayerSetLayerIdList( layerSetIdx, j )))
    … …  
    25522552
    25532553  // Check if the current layer is an output layer
    2554   for(Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++)
     2554  for( Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++ )
    25552555  {
    25562556    if( vps->getOutputLayerFlag( targetOlsIdx, i ) )
    … …  
    25602560  }
    25612561}
    2562 #endif
    25632562
    25642563#if POC_RESET_IDC_DECODER

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

    r1148 r1177  
    150150
    151151  TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture
    152 #if OUTPUT_LAYER_SET_INDEX
    153152  CommonDecoderParams*    m_commonDecoderParams;
    154 #endif
    155153#if NO_CLRAS_OUTPUT_FLAG 
    156154  Bool                    m_noClrasOutputFlag;
    … …  
    260258
    261259#if AVC_BASE
    262   Void      setBLReconFile( fstream* pFile ) { m_pBLReconFile = pFile; }
    263   fstream*  getBLReconFile() { return m_pBLReconFile; }
     260  Void      setBLReconFile( fstream* pFile )                                { m_pBLReconFile = pFile; }
     261  fstream*  getBLReconFile()                                                { return m_pBLReconFile; }
    264262#if !REPN_FORMAT_IN_VPS
    265263  Void      setBLsize( Int iWidth, Int iHeight ) { m_iBLSourceWidth = iWidth; m_iBLSourceHeight = iHeight; }
    … …  
    273271  Void      xInitILRP(TComSPS *pcSPS);
    274272#endif
    275 #if OUTPUT_LAYER_SET_INDEX
    276   CommonDecoderParams*    getCommonDecoderParams() { return m_commonDecoderParams; }
    277   Void                    setCommonDecoderParams(CommonDecoderParams* x) { m_commonDecoderParams = x; }
     273  CommonDecoderParams*    getCommonDecoderParams()                          { return m_commonDecoderParams; }
     274  Void                    setCommonDecoderParams(CommonDecoderParams* x)    { m_commonDecoderParams = x;    }
    278275  Void      checkValueOfTargetOutputLayerSetIdx(TComVPS *vps);
    279 #endif
    280276#if SCALINGLIST_INFERRING
    281   ParameterSetManagerDecoder* getParameterSetManager() { return &m_parameterSetManagerDecoder; }
     277  ParameterSetManagerDecoder* getParameterSetManager()                      { return &m_parameterSetManagerDecoder; }
    282278#endif
    283279#if CONFORMANCE_BITSTREAM_MODE
Note: See TracChangeset for help on using the changeset viewer.