Changeset 1524 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
- Timestamp:
- 3 Feb 2016, 23:00:44 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
r1518 r1524 2294 2294 Void TDecTop::setRefLayerParams( const TComVPS* vps ) 2295 2295 { 2296 for(UInt layerIdx = 0; layerIdx < m_numLayer; layerIdx++) 2297 { 2298 TDecTop *decTop = (TDecTop *)getLayerDec(vps->getLayerIdInNuh(layerIdx)); 2296 #if CONFORMANCE_BITSTREAM_MODE 2297 for(UInt layerIdx = 0; layerIdx < MAX_VPS_LAYER_IDX_PLUS1; layerIdx++) 2298 #else 2299 for(UInt layerIdx = 0; layerIdx <= m_commonDecoderParams->getTargetLayerId(); layerIdx++) 2300 #endif 2301 { 2302 UInt layerId = vps->getLayerIdInNuh(layerIdx); 2303 TDecTop *decTop = m_ppcTDecTop[layerId]; 2299 2304 decTop->setNumSamplePredRefLayers(0); 2300 2305 decTop->setNumMotionPredRefLayers(0); … … 2305 2310 if (vps->getDirectDependencyFlag(layerIdx, j)) 2306 2311 { 2307 decTop->setRefLayerId(decTop->getNumDirectRefLayers(), vps->getLayerIdInNuh(layerIdx));2312 decTop->setRefLayerId(decTop->getNumDirectRefLayers(), layerId); 2308 2313 decTop->setNumDirectRefLayers(decTop->getNumDirectRefLayers() + 1); 2309 2314 … … 2320 2325 Void TDecTop::checkValueOfTargetOutputLayerSetIdx(TComVPS *vps) 2321 2326 { 2322 CommonDecoderParams* params = this->getCommonDecoderParams();2327 CommonDecoderParams* params = m_commonDecoderParams; 2323 2328 2324 2329 if( params->getValueCheckedFlag() ) … … 2390 2395 #endif 2391 2396 Int layerSetIdx = vps->getOutputLayerSetIdx( params->getTargetOutputLayerSetIdx() ); // Index to the layer set 2392 #if !CONFORMANCE_BITSTREAM_MODE2393 assert( params->getTargetLayerId() == vps->getNumLayersInIdList( layerSetIdx ) - 1);2394 #endif2395 2397 2396 2398 // Check if the targetdeclayerIdlist matches the output layer set
Note: See TracChangeset for help on using the changeset viewer.