Index: /branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp =================================================================== --- /branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp (revision 1176) +++ /branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp (revision 1177) @@ -70,7 +70,5 @@ string cfg_ReconFile [MAX_LAYERS]; Int layerNum, targetLayerId; -#if OUTPUT_LAYER_SET_INDEX Int olsIdx; -#endif #if CONFORMANCE_BITSTREAM_MODE string cfg_confPrefix; @@ -104,7 +102,5 @@ ("TargetLayerId,-lid", targetLayerId, -1, "Target layer id") ("LayerNum,-ls", layerNum, MAX_NUM_LAYER_IDS, "Target layer id") // Legacy option -#if OUTPUT_LAYER_SET_INDEX ("OutpuLayerSetIdx,-olsidx", olsIdx, -1, "Index of output layer set to be decoded.") -#endif #if CONFORMANCE_BITSTREAM_MODE ("ConformanceBitstremMode,-confMode", m_confModeFlag, false, "Enable generation of conformance bitstream metadata; True: Generate metadata, False: No metadata generated") @@ -171,5 +167,4 @@ assert( targetLayerId < MAX_NUM_LAYER_IDS ); #endif -#if OUTPUT_LAYER_SET_INDEX #if CONFORMANCE_BITSTREAM_MODE if( m_confModeFlag ) @@ -202,5 +197,5 @@ m_commonDecoderParams.setTargetOutputLayerSetIdx( olsIdx ); m_commonDecoderParams.setTargetLayerId( targetLayerId ); -#endif + #if CONFORMANCE_BITSTREAM_MODE for(Int layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++ ) @@ -264,6 +259,7 @@ fprintf(stderr, "File %s could not be opened. Using all LayerIds as default.\n", cfg_TargetDecLayerIdSetFile.c_str() ); } -#if OUTPUT_LAYER_SET_INDEX - this->getCommonDecoderParams()->setTargetDecLayerIdSet( &m_targetDecLayerIdSet ); + +#if SVC_EXTENSION + m_commonDecoderParams.setTargetDecLayerIdSet( &m_targetDecLayerIdSet ); #endif } Index: /branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h =================================================================== --- /branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h (revision 1176) +++ /branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h (revision 1177) @@ -74,4 +74,11 @@ #endif + std::vector m_targetDecLayerIdSet; ///< set of LayerIds to be included in the sub-bitstream extraction process. + Int m_respectDefDispWindow; ///< Only output content inside the default display window +#if O0043_BEST_EFFORT_DECODING + UInt m_forceDecodeBitDepth; ///< if non-zero, force the bit depth at the decoder (best effort decoding) +#endif + std::string m_outputDecodedSEIMessagesFilename; ///< filename to output decoded SEI messages to. If '-', then use stdout. If empty, do not output details. + #if SVC_EXTENSION #if AVC_BASE @@ -82,15 +89,5 @@ #endif #endif -#endif - - std::vector m_targetDecLayerIdSet; ///< set of LayerIds to be included in the sub-bitstream extraction process. - Int m_respectDefDispWindow; ///< Only output content inside the default display window -#if O0043_BEST_EFFORT_DECODING - UInt m_forceDecodeBitDepth; ///< if non-zero, force the bit depth at the decoder (best effort decoding) -#endif - std::string m_outputDecodedSEIMessagesFilename; ///< filename to output decoded SEI messages to. If '-', then use stdout. If empty, do not output details. -#if OUTPUT_LAYER_SET_INDEX CommonDecoderParams m_commonDecoderParams; -#endif #if CONFORMANCE_BITSTREAM_MODE Bool m_confModeFlag; @@ -100,4 +97,5 @@ std::string m_decodedYuvLayerFileName[63]; Bool m_decodedYuvLayerRefresh[63]; +#endif #endif @@ -134,7 +132,8 @@ Bool parseCfg ( Int argc, Char* argv[] ); ///< initialize option class from configuration -#if OUTPUT_LAYER_SET_INDEX + +#if SVC_EXTENSION CommonDecoderParams* getCommonDecoderParams() {return &m_commonDecoderParams;} -#endif + #if CONFORMANCE_BITSTREAM_MODE Bool const getConfModeFlag() { return m_confModeFlag; } @@ -148,4 +147,6 @@ Void setDecodedYuvLayerRefresh(Int const layerId, Bool const x) {m_decodedYuvLayerRefresh[layerId] = x; } #endif +#endif + }; Index: /branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp =================================================================== --- /branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp (revision 1176) +++ /branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp (revision 1177) @@ -666,7 +666,5 @@ m_acTDecTop[layer].setNumLayer( m_tgtLayerId + 1 ); #endif -#if OUTPUT_LAYER_SET_INDEX m_acTDecTop[layer].setCommonDecoderParams( &m_commonDecoderParams ); -#endif } #if CONFORMANCE_BITSTREAM_MODE Index: /branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h (revision 1176) +++ /branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h (revision 1177) @@ -306,5 +306,5 @@ }; -#if OUTPUT_LAYER_SET_INDEX +#if SVC_EXTENSION class CommonDecoderParams { Index: /branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h (revision 1176) +++ /branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h (revision 1177) @@ -124,8 +124,5 @@ #define VPS_DPB_SIZE_TABLE 1 ///< JCTVC-O0217: DPB operations: signaling DPB-related parameters #if VPS_DPB_SIZE_TABLE -#define OUTPUT_LAYER_SET_INDEX 1 ///< JCTVC-O0217: DPB operations: Inference/input of output layer set index -#if OUTPUT_LAYER_SET_INDEX #define USE_DPB_SIZE_TABLE 1 ///< JCTVC-O0217: DPB operations: Use signaled DPB-size table parameters in the decoder -#endif #endif #define DPB_PARAMS_MAXTLAYERS 1 ///< JCTVC-P0156 DPB parameters up to maximum temporal sub-layers in the layer set Index: /branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (revision 1176) +++ /branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (revision 1177) @@ -699,11 +699,12 @@ #if SVC_EXTENSION m_apcSlicePilot->setVPS( m_parameterSetManagerDecoder.getPrefetchedVPS(0) ); -#if OUTPUT_LAYER_SET_INDEX + // Following check should go wherever the VPS is activated - if (!m_apcSlicePilot->getVPS()->getBaseLayerAvailableFlag()) + if( !m_apcSlicePilot->getVPS()->getBaseLayerAvailableFlag() ) { assert(nalu.m_layerId != 0); assert(m_apcSlicePilot->getVPS()->getNumAddLayerSets() > 0); - if (getCommonDecoderParams()->getTargetOutputLayerSetIdx() >= 0) + + if( m_commonDecoderParams->getTargetOutputLayerSetIdx() >= 0 ) { UInt layerIdx = m_apcSlicePilot->getVPS()->getOutputLayerSetIdx(getCommonDecoderParams()->getTargetOutputLayerSetIdx()); @@ -711,5 +712,5 @@ } } -#endif + m_apcSlicePilot->initSlice( nalu.m_layerId ); #else //SVC_EXTENSION @@ -2454,5 +2455,4 @@ } -#if OUTPUT_LAYER_SET_INDEX Void TDecTop::checkValueOfTargetOutputLayerSetIdx(TComVPS *vps) { @@ -2477,10 +2477,10 @@ // Currently, the target layer ID in the encoder assumes that all the layers are decoded // Check if any of the output layer sets match this description - for(Int i = 0; i < vps->getNumOutputLayerSets(); i++) + for( Int i = 0; i < vps->getNumOutputLayerSets(); i++ ) { Bool layerSetMatchFlag = false; Int layerSetIdx = vps->getOutputLayerSetIdx( i ); - for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++) + for( Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++ ) { if( vps->getLayerSetLayerIdList( layerSetIdx, j ) == params->getTargetLayerId() ) @@ -2498,5 +2498,5 @@ if( params->getTargetDecLayerIdSet()->size() ) { - for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++) + for( Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++ ) { if( *(params->getTargetDecLayerIdSet()->begin() + j) != vps->getLayerIdInNuh(vps->getLayerSetLayerIdList( layerSetIdx, j ))) @@ -2552,5 +2552,5 @@ // Check if the current layer is an output layer - for(Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++) + for( Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++ ) { if( vps->getOutputLayerFlag( targetOlsIdx, i ) ) @@ -2560,5 +2560,4 @@ } } -#endif #if POC_RESET_IDC_DECODER Index: /branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h (revision 1176) +++ /branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h (revision 1177) @@ -150,7 +150,5 @@ TComPic* m_cIlpPic[MAX_NUM_REF]; ///< Inter layer Prediction picture = upsampled picture -#if OUTPUT_LAYER_SET_INDEX CommonDecoderParams* m_commonDecoderParams; -#endif #if NO_CLRAS_OUTPUT_FLAG Bool m_noClrasOutputFlag; @@ -260,6 +258,6 @@ #if AVC_BASE - Void setBLReconFile( fstream* pFile ) { m_pBLReconFile = pFile; } - fstream* getBLReconFile() { return m_pBLReconFile; } + Void setBLReconFile( fstream* pFile ) { m_pBLReconFile = pFile; } + fstream* getBLReconFile() { return m_pBLReconFile; } #if !REPN_FORMAT_IN_VPS Void setBLsize( Int iWidth, Int iHeight ) { m_iBLSourceWidth = iWidth; m_iBLSourceHeight = iHeight; } @@ -273,11 +271,9 @@ Void xInitILRP(TComSPS *pcSPS); #endif -#if OUTPUT_LAYER_SET_INDEX - CommonDecoderParams* getCommonDecoderParams() { return m_commonDecoderParams; } - Void setCommonDecoderParams(CommonDecoderParams* x) { m_commonDecoderParams = x; } + CommonDecoderParams* getCommonDecoderParams() { return m_commonDecoderParams; } + Void setCommonDecoderParams(CommonDecoderParams* x) { m_commonDecoderParams = x; } Void checkValueOfTargetOutputLayerSetIdx(TComVPS *vps); -#endif #if SCALINGLIST_INFERRING - ParameterSetManagerDecoder* getParameterSetManager() { return &m_parameterSetManagerDecoder; } + ParameterSetManagerDecoder* getParameterSetManager() { return &m_parameterSetManagerDecoder; } #endif #if CONFORMANCE_BITSTREAM_MODE