Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 1055) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 1057) @@ -2170,10 +2170,10 @@ if( !vps->getSplittingFlag() ) { - for(j = 0; j < vps->getNumScalabilityTypes(); j++) - { - UInt bits = vps->getDimensionIdLen(j); - WRITE_CODE( vps->getDimensionId(i, j), bits, "dimension_id[i][j]" ); - } - } + for(j = 0; j < vps->getNumScalabilityTypes(); j++) + { + UInt bits = vps->getDimensionIdLen(j); + WRITE_CODE( vps->getDimensionId(i, j), bits, "dimension_id[i][j]" ); + } + } } #endif @@ -2208,5 +2208,5 @@ #if VPS_EXTN_DIRECT_REF_LAYERS - for( Int layerCtr = 1; layerCtr <= vps->getMaxLayers() - 1; layerCtr++) + for( Int layerCtr = 1; layerCtr < vps->getMaxLayers(); layerCtr++) { for( Int refLayerCtr = 0; refLayerCtr < layerCtr; refLayerCtr++) @@ -2282,5 +2282,5 @@ assert( vps->getNumProfileTierLevel() == vps->getPTLForExtnPtr()->size()); #endif - for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++) + for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++) #else for(Int idx = 1; idx <= vps->getNumProfileTierLevel() - 1; idx++) Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (revision 1055) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (revision 1057) @@ -391,5 +391,5 @@ Int m_numActiveRefLayers; - Int m_predLayerId[MAX_VPS_LAYER_IDX_PLUS1]; + Int m_predLayerIdx[MAX_VPS_LAYER_IDX_PLUS1]; Int m_numSamplePredRefLayers; Int m_samplePredRefLayerId[MAX_VPS_LAYER_IDX_PLUS1]; @@ -1119,24 +1119,24 @@ Void setNumActiveRefLayers (Int num) { m_numActiveRefLayers = num; } - Int getPredLayerId (Int i) { return m_predLayerId[i]; } - Void setPredLayerId (Int i, Int refLayerId) { m_predLayerId[i] = refLayerId; } + Int getPredLayerIdx (Int lyaerIdc) { return m_predLayerIdx[lyaerIdc]; } + Void setPredLayerIdx (Int lyaerIdc, Int refLayerIdx) { m_predLayerIdx[lyaerIdc] = refLayerIdx; } Int getNumSamplePredRefLayers () { return m_numSamplePredRefLayers; } Void setNumSamplePredRefLayers (Int num) { m_numSamplePredRefLayers = num; } - Int getSamplePredRefLayerId (Int i) { return m_samplePredRefLayerId[i]; } - Void setSamplePredRefLayerId (Int i, Int refLayerId) { m_samplePredRefLayerId[i] = refLayerId; } + Int getSamplePredRefLayerId (Int layerIdc) { return m_samplePredRefLayerId[layerIdc]; } + Void setSamplePredRefLayerId (Int layerIdc, Int refLayerId) { m_samplePredRefLayerId[layerIdc] = refLayerId; } Int getNumMotionPredRefLayers () { return m_numMotionPredRefLayers; } Void setNumMotionPredRefLayers (Int num) { m_numMotionPredRefLayers = num; } - Int getMotionPredRefLayerId (Int i) { return m_motionPredRefLayerId[i]; } - Void setMotionPredRefLayerId (Int i, Int refLayerId) { m_motionPredRefLayerId[i] = refLayerId; } - - Bool getSamplePredEnabledFlag (Int i) { return m_samplePredEnabledFlag[i]; } - Void setSamplePredEnabledFlag (Int i,Bool flag) { m_samplePredEnabledFlag[i] = flag; } - - Bool getMotionPredEnabledFlag (Int i) { return m_motionPredEnabledFlag[i]; } - Void setMotionPredEnabledFlag (Int i,Bool flag) { m_motionPredEnabledFlag[i] = flag; } + Int getMotionPredRefLayerId (Int layerIdc) { return m_motionPredRefLayerId[layerIdc]; } + Void setMotionPredRefLayerId (Int layerIdc, Int refLayerId) { m_motionPredRefLayerId[layerIdc] = refLayerId; } + + Bool getSamplePredEnabledFlag (Int layerIdx) { return m_samplePredEnabledFlag[layerIdx]; } + Void setSamplePredEnabledFlag (Int layerIdx, Bool flag) { m_samplePredEnabledFlag[layerIdx] = flag; } + + Bool getMotionPredEnabledFlag (Int layerIdx) { return m_motionPredEnabledFlag[layerIdx]; } + Void setMotionPredEnabledFlag (Int layerIdx,Bool flag) { m_motionPredEnabledFlag[layerIdx] = flag; } #endif Int getMaxTidIlRefPicsPlus1 () { return m_maxTidIlRefPicsPlus1; } Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h (revision 1055) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h (revision 1057) @@ -182,5 +182,5 @@ #if SVC_EXTENSION - TEncTop* getLayerEnc(UInt LayerId) {return m_ppcTEncTop[LayerId]; } + TEncTop* getLayerEnc(UInt layerIdx) {return m_ppcTEncTop[layerIdx]; } #if ENCODER_FAST_MODE Void xCheckRDCostILRUni ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt refLayerId); Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 1055) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 1057) @@ -192,5 +192,6 @@ if( pcTEncTop->getLayerId() ) { - UInt prevLayerId = pcTEncTop->getLayerId()-1; // it should be changed + UInt prevLayerIdx = pcTEncTop->getPredLayerIdx( pcTEncTop->getNumActiveRefLayers() - 1); + UInt prevLayerId = pcTEncTop->getRefLayerId(prevLayerIdx); m_Enc3DAsymLUTPicUpdate.create( m_pcCfg->getCGSMaxOctantDepth() , g_bitDepthLayer[CHANNEL_TYPE_LUMA][prevLayerId] , g_bitDepthLayer[CHANNEL_TYPE_CHROMA][prevLayerId] , g_bitDepthLayer[CHANNEL_TYPE_LUMA][pcTEncTop->getLayerId()] , g_bitDepthLayer[CHANNEL_TYPE_CHROMA][pcTEncTop->getLayerId()] , m_pcCfg->getCGSMaxYPartNumLog2() /*, m_pcCfg->getCGSPhaseAlignment()*/ ); @@ -1172,7 +1173,6 @@ for (UInt i = 0; i < m_pcCfg->getNumLayer(); i++) { - Int layerId = pcSlice->getVPS()->getLayerIdInNuh(i); - m_ppcTEncTop[layerId]->setLayerInitializedFlag(false); - m_ppcTEncTop[layerId]->setFirstPicInLayerDecodedFlag(false); + m_ppcTEncTop[i]->setLayerInitializedFlag(false); + m_ppcTEncTop[i]->setFirstPicInLayerDecodedFlag(false); } } @@ -1224,5 +1224,5 @@ // infer the scaling list from the reference layer - pcSlice->setScalingList ( m_ppcTEncTop[refLayerId]->getScalingList() ); + pcSlice->setScalingList ( m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(refLayerId)]->getScalingList() ); } else @@ -1258,5 +1258,5 @@ // infer the scaling list from the reference layer - pcSlice->setScalingList ( m_ppcTEncTop[refLayerId]->getScalingList() ); + pcSlice->setScalingList ( m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(refLayerId)]->getScalingList() ); } else @@ -1311,5 +1311,5 @@ UInt refLayerId = pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc); #if VPS_EXTN_DIRECT_REF_LAYERS - TComList *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(refLayerIdc)->getListPic(); + TComList *cListPic = m_ppcTEncTop[refLayerIdc]->getRefLayerEnc(refLayerIdc)->getListPic(); #else TComList *cListPic = m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)-1]->getListPic(); @@ -1415,5 +1415,5 @@ { // check for the sample prediction picture type - if( m_ppcTEncTop[m_layerId]->getSamplePredEnabledFlag(pcSlice->getVPS()->getLayerIdxInVps(refLayerId))) + if( m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getSamplePredEnabledFlag(pcSlice->getVPS()->getLayerIdxInVps(refLayerId))) { #if P0312_VERT_PHASE_ADJ @@ -1494,5 +1494,5 @@ if(pcSlice->getVPS()->getCrossLayerIrapAlignFlag()) { - TComList *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic(); + TComList *cListPic = m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getRefLayerEnc(0)->getListPic(); TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() ); if(picLayer0) @@ -1536,5 +1536,5 @@ if (pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_TRAIL_R && #if SVC_EXTENSION - ( m_iGopSize != 1 || m_ppcTEncTop[m_layerId]->getIntraPeriod() > 1 ) ) + ( m_iGopSize != 1 || m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getIntraPeriod() > 1 ) ) #else !(m_iGopSize == 1 && pcSlice->getSliceType() == I_SLICE)) @@ -1841,5 +1841,5 @@ for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ ) { - if( m_ppcTEncTop[m_layerId]->getSamplePredEnabledFlag( pcSlice->getVPS()->getRefLayerId( m_layerId, pcSlice->getInterLayerPredLayerIdc(i) ) ) ) + if( m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getSamplePredEnabledFlag( pcSlice->getInterLayerPredLayerIdc(i) ) ) { foundSamplePredPicture = true; @@ -1875,5 +1875,5 @@ for( Int i = 0; i < pcSlice->getLayerId(); i++) { - TComList *cListPic = m_ppcTEncTop[i]->getListPic(); + TComList *cListPic = m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(i)]->getListPic(); TComPic *lowerLayerPic = pcSlice->getRefPic(*cListPic, pcSlice->getPOC()); if( lowerLayerPic && pcSlice->getVPS()->getDirectDependencyFlag(pcSlice->getLayerIdx(), i) ) @@ -1969,7 +1969,7 @@ // It is a requirement of bitstream conformance when the collocated picture, used for temporal motion vector prediction, is an inter-layer reference picture, // VpsInterLayerMotionPredictionEnabled[ LayerIdxInVps[ currLayerId ] ][ LayerIdxInVps[ rLId ] ] shall be equal to 1, where rLId is set equal to nuh_layer_id of the inter-layer picture. - if( refPic->isILR(m_layerId) && m_ppcTEncTop[m_layerId]->getMotionPredEnabledFlag( pcSlice->getVPS()->getLayerIdxInVps(refPic->getLayerId()) ) + if( refPic->isILR(m_layerId) && m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getMotionPredEnabledFlag( refPic->getLayerIdx() ) #if MFM_ENCCONSTRAINT - && pcSlice->getBaseColPic( *m_ppcTEncTop[refPic->getLayerId()]->getListPic() )->checkSameRefInfo() == true + && pcSlice->getBaseColPic( *m_ppcTEncTop[refPic->getLayerIdx()]->getListPic() )->checkSameRefInfo() == true #endif ) @@ -1991,7 +1991,7 @@ // It is a requirement of bitstream conformance when the collocated picture, used for temporal motion vector prediction, is an inter-layer reference picture, // VpsInterLayerMotionPredictionEnabled[ LayerIdxInVps[ currLayerId ] ][ LayerIdxInVps[ rLId ] ] shall be equal to 1, where rLId is set equal to nuh_layer_id of the inter-layer picture. - if( refPic->isILR(m_layerId) && m_ppcTEncTop[m_layerId]->getMotionPredEnabledFlag(pcSlice->getVPS()->getLayerIdxInVps( refPic->getLayerId())) + if( refPic->isILR(m_layerId) && m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getMotionPredEnabledFlag( refPic->getLayerIdx() ) #if MFM_ENCCONSTRAINT - && pcSlice->getBaseColPic( *m_ppcTEncTop[refPic->getLayerId()]->getListPic() )->checkSameRefInfo() == true + && pcSlice->getBaseColPic( *m_ppcTEncTop[refPic->getLayerIdx()]->getListPic() )->checkSameRefInfo() == true #endif ) @@ -2110,5 +2110,5 @@ // It is a requirement of bitstream conformance when the collocated picture, used for temporal motion vector prediction, is an inter-layer reference picture, // VpsInterLayerMotionPredictionEnabled[ LayerIdxInVps[ currLayerId ] ][ LayerIdxInVps[ rLId ] ] shall be equal to 1, where rLId is set equal to nuh_layer_id of the inter-layer picture. - if( refPic->isILR(m_layerId) && !m_ppcTEncTop[m_layerId]->getMotionPredEnabledFlag(pcSlice->getVPS()->getLayerIdxInVps(refPic->getLayerId()))) + if( refPic->isILR(m_layerId) && !m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getMotionPredEnabledFlag(refPic->getLayerIdx()) ) { pcSlice->setEnableTMVPFlag(false); @@ -2128,5 +2128,5 @@ TComPic* refPic = pcSlice->getRefPic(refList, refIdx); - if( !refPic->isILR(m_layerId) || ( refPic->isILR(m_layerId) && m_ppcTEncTop[m_layerId]->getSamplePredEnabledFlag( pcSlice->getVPS()->getLayerIdxInVps(refPic->getLayerId())) ) ) + if( !refPic->isILR(m_layerId) || ( refPic->isILR(m_layerId) && m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getSamplePredEnabledFlag( refPic->getLayerIdx() ) ) ) { break; @@ -2152,5 +2152,5 @@ TComPic* refPic = pcSlice->getRefPic(refList, refIdx); - if( !refPic->isILR(m_layerId) || ( refPic->isILR(m_layerId) && m_ppcTEncTop[m_layerId]->getSamplePredEnabledFlag( pcSlice->getVPS()->getLayerIdxInVps((refPic->getLayerId())))) ) + if( !refPic->isILR(m_layerId) || ( refPic->isILR(m_layerId) && m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getSamplePredEnabledFlag( refPic->getLayerIdx() ) ) ) { break; @@ -4664,7 +4664,6 @@ for(Int i = 1; i < slice->getVPS()->getMaxLayers(); i++) { - UInt layerId = slice->getVPS()->getLayerIdInNuh(i); - Bool refreshIntervalFlag = ( pocCurr % m_ppcTEncTop[layerId]->getGOPEncoder()->getIntraRefreshInterval() == 0 ); - Bool refreshTypeFlag = ( m_ppcTEncTop[0]->getGOPEncoder()->getIntraRefreshType() == m_ppcTEncTop[layerId]->getGOPEncoder()->getIntraRefreshType() ); + Bool refreshIntervalFlag = ( pocCurr % m_ppcTEncTop[i]->getGOPEncoder()->getIntraRefreshInterval() == 0 ); + Bool refreshTypeFlag = ( m_ppcTEncTop[0]->getGOPEncoder()->getIntraRefreshType() == m_ppcTEncTop[i]->getGOPEncoder()->getIntraRefreshType() ); if( !(refreshIntervalFlag && refreshTypeFlag) ) { @@ -4682,7 +4681,6 @@ for(Int i = 1; i < slice->getVPS()->getMaxLayers() && !needReset; i++) { - UInt layerId = slice->getVPS()->getLayerIdInNuh(i); - Bool idrFlag = ( (m_ppcTEncTop[layerId]->getGOPEncoder()->getIntraRefreshType() == 2) - && ( pocCurr % m_ppcTEncTop[layerId]->getGOPEncoder()->getIntraRefreshInterval() == 0 ) + Bool idrFlag = ( (m_ppcTEncTop[i]->getGOPEncoder()->getIntraRefreshType() == 2) + && ( pocCurr % m_ppcTEncTop[i]->getGOPEncoder()->getIntraRefreshInterval() == 0 ) ); for(Int j = 0; j < slice->getVPS()->getMaxLayers(); j++) @@ -4693,7 +4691,6 @@ } - layerId = slice->getVPS()->getLayerIdInNuh(j); - Bool idrOtherPicFlag = ( (m_ppcTEncTop[layerId]->getGOPEncoder()->getIntraRefreshType() == 2) - && ( pocCurr % m_ppcTEncTop[layerId]->getGOPEncoder()->getIntraRefreshInterval() == 0 ) + Bool idrOtherPicFlag = ( (m_ppcTEncTop[j]->getGOPEncoder()->getIntraRefreshType() == 2) + && ( pocCurr % m_ppcTEncTop[j]->getGOPEncoder()->getIntraRefreshInterval() == 0 ) ); @@ -4739,6 +4736,5 @@ for (UInt i = 0; i < MAX_LAYERS; i++) { - UInt layerId = slice->getVPS()->getLayerIdInNuh(i); - m_ppcTEncTop[layerId]->setPocDecrementedInDPBFlag(false); + m_ppcTEncTop[i]->setPocDecrementedInDPBFlag(false); } #endif @@ -4828,16 +4824,18 @@ for (UInt layerIdx = 0; layerIdx < numAffectedLayers; layerIdx++) { - if (!m_ppcTEncTop[affectedLayerList[layerIdx]]->getPocDecrementedInDPBFlag()) - { - m_ppcTEncTop[affectedLayerList[layerIdx]]->setPocDecrementedInDPBFlag(true); + UInt lIdx = slice->getVPS()->getLayerIdxInVps(affectedLayerList[layerIdx]); + + if (!m_ppcTEncTop[lIdx]->getPocDecrementedInDPBFlag()) + { + m_ppcTEncTop[lIdx]->setPocDecrementedInDPBFlag(true); // Decrement value of associatedIrapPoc of the TEncGop object - m_ppcTEncTop[affectedLayerList[layerIdx]]->getGOPEncoder()->m_associatedIRAPPOC -= deltaPocVal; + m_ppcTEncTop[lIdx]->getGOPEncoder()->m_associatedIRAPPOC -= deltaPocVal; // Decrememnt the value of m_pocCRA - m_ppcTEncTop[affectedLayerList[layerIdx]]->getGOPEncoder()->m_pocCRA -= deltaPocVal; - - TComList::iterator iterPic = m_ppcTEncTop[affectedLayerList[layerIdx]]->getListPic()->begin(); - while (iterPic != m_ppcTEncTop[affectedLayerList[layerIdx]]->getListPic()->end()) + m_ppcTEncTop[lIdx]->getGOPEncoder()->m_pocCRA -= deltaPocVal; + + TComList::iterator iterPic = m_ppcTEncTop[lIdx]->getListPic()->begin(); + while (iterPic != m_ppcTEncTop[lIdx]->getListPic()->end()) #else // Decrement value of associatedIrapPoc of the TEncGop object @@ -5342,10 +5340,10 @@ { Int iLayerId = slice->getVPS()->getPredictedLayerId(dolLayerId, i); - m_ppcTEncTop[iLayerId]->setLayerInitializedFlag(false); - m_ppcTEncTop[iLayerId]->setFirstPicInLayerDecodedFlag(false); + m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(iLayerId)]->setLayerInitializedFlag(false); + m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(iLayerId)]->setFirstPicInLayerDecodedFlag(false); } // Each picture that is in the DPB and has nuh_layer_id equal to dolLayerId is marked as "unused for reference". - for (TComList::iterator pic = m_ppcTEncTop[dolLayerId]->getListPic()->begin(); pic != m_ppcTEncTop[dolLayerId]->getListPic()->end(); pic++) + for (TComList::iterator pic = m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(dolLayerId)]->getListPic()->begin(); pic != m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(dolLayerId)]->getListPic()->end(); pic++) { if ((*pic)->getSlice(0)->getPOC() != slice->getPOC()) @@ -5360,5 +5358,5 @@ { UInt predLId = slice->getVPS()->getPredictedLayerId(dolLayerId, i); - for (TComList::iterator pic = m_ppcTEncTop[predLId]->getListPic()->begin(); pic != m_ppcTEncTop[predLId]->getListPic()->end(); pic++) + for (TComList::iterator pic = m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(predLId)]->getListPic()->begin(); pic != m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(predLId)]->getListPic()->end(); pic++) { if ((*pic)->getSlice(0)->getPOC() != slice->getPOC()) @@ -5381,5 +5379,5 @@ m_noRaslOutputFlag = true; } - else if (!m_ppcTEncTop[m_layerId]->getLayerInitializedFlag()) + else if (!m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(m_layerId)]->getLayerInitializedFlag()) { Bool refLayersInitialized = true; @@ -5387,5 +5385,5 @@ { UInt refLayerId = slice->getVPS()->getRefLayerId(m_layerId, j); - if (!m_ppcTEncTop[refLayerId]->getLayerInitializedFlag()) + if (!m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(refLayerId)]->getLayerInitializedFlag()) { refLayersInitialized = false; @@ -5406,11 +5404,11 @@ if (m_layerId == 0) { - m_ppcTEncTop[m_layerId]->setLayerInitializedFlag(true); - } - else if (!m_ppcTEncTop[m_layerId]->getLayerInitializedFlag() && slice->getVPS()->getNumDirectRefLayers(m_layerId) == 0) - { - m_ppcTEncTop[m_layerId]->setLayerInitializedFlag(true); - } - else if (!m_ppcTEncTop[m_layerId]->getLayerInitializedFlag()) + m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(m_layerId)]->setLayerInitializedFlag(true); + } + else if (!m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(m_layerId)]->getLayerInitializedFlag() && slice->getVPS()->getNumDirectRefLayers(m_layerId) == 0) + { + m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(m_layerId)]->setLayerInitializedFlag(true); + } + else if (!m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(m_layerId)]->getLayerInitializedFlag()) { Bool refLayersInitialized = true; @@ -5418,5 +5416,5 @@ { UInt refLayerId = slice->getVPS()->getRefLayerId(m_layerId, j); - if (!m_ppcTEncTop[refLayerId]->getLayerInitializedFlag()) + if (!m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(refLayerId)]->getLayerInitializedFlag()) { refLayersInitialized = false; @@ -5425,5 +5423,5 @@ if (refLayersInitialized) { - m_ppcTEncTop[m_layerId]->setLayerInitializedFlag(true); + m_ppcTEncTop[slice->getVPS()->getLayerIdxInVps(m_layerId)]->setLayerInitializedFlag(true); } } Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 1055) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 1057) @@ -3243,5 +3243,5 @@ // motion search only for the ILRP with sample prediction type - if( pcPic->isILR( pcCU->getLayerId() ) && !pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerId(), pcPic->getLayerId() ) ) + if( pcPic->isILR( pcCU->getLayerId() ) && !pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerIdx(), pcPic->getLayerIdx() ) ) { continue; @@ -3481,5 +3481,5 @@ // motion search only for the ILRP with sample prediction type - if( pcPic->isILR( pcCU->getLayerId() ) && !pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerId(), pcPic->getLayerId() ) ) + if( pcPic->isILR( pcCU->getLayerId() ) && !pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerIdx(), pcPic->getLayerIdx() ) ) { continue; @@ -6074,5 +6074,5 @@ // ILRP has to be for the sample prediction type - if( refPic->isILR(pcCU->getLayerId()) && refPic->getLayerId() == refLayerId && pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerId(), refLayerId ) ) + if( refPic->isILR(pcCU->getLayerId()) && refPic->getLayerId() == refLayerId && pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerIdx(), pcCU->getSlice()->getVPS()->getLayerIdxInVps(refLayerId) ) ) { iRefIdxTemp = refIdx; Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp (revision 1055) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp (revision 1057) @@ -139,12 +139,12 @@ { #if JCTVC_M0259_LAMBDAREFINEMENT - if( slice->getLayerId() > 0 && m_ppcTEncTop[slice->getLayerId()]->getNumActiveRefLayers() && depth >= 3 && m_pcCfg->getGOPSize() == ( 1 << depth ) ) - { - Int nCurLayerId = slice->getLayerId(); - UInt prevLayerId = slice->getVPS()->getLayerIdInNuh(slice->getVPS()->getLayerIdxInVps(nCurLayerId)-1); - - Double gamma = xCalEnhLambdaFactor( m_ppcTEncTop[prevLayerId]->getQP() - m_ppcTEncTop[nCurLayerId]->getQP() , - 1.0 * m_ppcTEncTop[nCurLayerId]->getSourceWidth() * m_ppcTEncTop[nCurLayerId]->getSourceHeight() - / m_ppcTEncTop[prevLayerId]->getSourceWidth() / m_ppcTEncTop[prevLayerId]->getSourceHeight() ); + if( slice->getLayerId() > 0 && m_ppcTEncTop[slice->getLayerIdx()]->getNumActiveRefLayers() && depth >= 3 && m_pcCfg->getGOPSize() == ( 1 << depth ) ) + { + Int layerIdx = slice->getLayerId(); + UInt prevLayerIdx = m_ppcTEncTop[layerIdx]->getPredLayerIdx( m_ppcTEncTop[layerIdx]->getNumActiveRefLayers() - 1); + + Double gamma = xCalEnhLambdaFactor( m_ppcTEncTop[prevLayerIdx]->getQP() - m_ppcTEncTop[layerIdx]->getQP() , + 1.0 * m_ppcTEncTop[layerIdx]->getSourceWidth() * m_ppcTEncTop[layerIdx]->getSourceHeight() + / m_ppcTEncTop[prevLayerIdx]->getSourceWidth() / m_ppcTEncTop[prevLayerIdx]->getSourceHeight() ); dLambda *= gamma; } @@ -165,5 +165,5 @@ #if JCTVC_M0259_LAMBDAREFINEMENT - if( slice->getLayerId() > 0 && m_ppcTEncTop[slice->getLayerId()]->getNumActiveRefLayers() && m_pcCfg->getGOPSize() >= 8 && slice->isIntra() == false && depth == 0 ) + if( slice->getLayerId() > 0 && m_ppcTEncTop[slice->getLayerIdx()]->getNumActiveRefLayers() && m_pcCfg->getGOPSize() >= 8 && slice->isIntra() == false && depth == 0 ) { dLambdas[0] = dLambda * 1.1; @@ -557,12 +557,12 @@ if( rpcSlice->getNumILRRefIdx() > 0 ) { - rpcSlice->setActiveNumILRRefIdx( m_ppcTEncTop[layerId]->getNumActiveRefLayers() ); + rpcSlice->setActiveNumILRRefIdx( m_ppcTEncTop[rpcSlice->getVPS()->getLayerIdxInVps(layerId)]->getNumActiveRefLayers() ); for( Int i = 0; i < rpcSlice->getActiveNumILRRefIdx(); i++ ) { - rpcSlice->setInterLayerPredLayerIdc( m_ppcTEncTop[layerId]->getPredLayerId(i), i ); + rpcSlice->setInterLayerPredLayerIdc( m_ppcTEncTop[rpcSlice->getVPS()->getLayerIdxInVps(layerId)]->getPredLayerIdx(i), i ); } rpcSlice->setInterLayerPredEnabledFlag(1); } - rpcSlice->setMFMEnabledFlag(m_ppcTEncTop[layerId]->getMFMEnabledFlag()); + rpcSlice->setMFMEnabledFlag(m_ppcTEncTop[rpcSlice->getVPS()->getLayerIdxInVps(layerId)]->getMFMEnabledFlag()); } @@ -764,5 +764,5 @@ } #if O0194_WEIGHTED_PREDICTION_CGS - else if( m_ppcTEncTop[pcSlice->getLayerId()]->getInterLayerWeightedPredFlag() ) + else if( m_ppcTEncTop[pcSlice->getLayerIdx()]->getInterLayerWeightedPredFlag() ) { // Calculate for the base layer to be used in EL as Inter layer reference @@ -1137,5 +1137,5 @@ #if SVC_EXTENSION - m_pcEntropyCoder->encodeSAOBlkParam(saoblkParam, m_ppcTEncTop[pcSlice->getLayerId()]->getSAO()->getSaoMaxOffsetQVal(), sliceEnabled, leftMergeAvail, aboveMergeAvail); + m_pcEntropyCoder->encodeSAOBlkParam(saoblkParam, m_ppcTEncTop[pcSlice->getLayerIdx()]->getSAO()->getSaoMaxOffsetQVal(), sliceEnabled, leftMergeAvail, aboveMergeAvail); #else m_pcEntropyCoder->encodeSAOBlkParam(saoblkParam, sliceEnabled, leftMergeAvail, aboveMergeAvail); Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1055) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1057) @@ -1533,10 +1533,10 @@ TEncTop* TEncTop::getRefLayerEnc( UInt refLayerIdx ) { - if( m_ppcTEncTop[m_layerId]->getNumDirectRefLayers() <= 0 ) + if( m_ppcTEncTop[m_cVPS.getLayerIdxInVps(m_layerId)]->getNumDirectRefLayers() <= 0 ) { return (TEncTop *)getLayerEnc( 0 ); } - return (TEncTop *)getLayerEnc( m_cVPS.getRefLayerId( m_layerId, refLayerIdx ) ); + return (TEncTop *)getLayerEnc( m_cVPS.getLayerIdxInVps(m_cVPS.getRefLayerId( m_layerId, refLayerIdx )) ); } #endif Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h (revision 1055) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h (revision 1057) @@ -117,5 +117,5 @@ static Int m_iPPSIdCnt; ///< next Id number for PPS TEncTop** m_ppcTEncTop; - TEncTop* getLayerEnc(UInt layerId) { return m_ppcTEncTop[layerId]; } + TEncTop* getLayerEnc(UInt layerIdx) { return m_ppcTEncTop[layerIdx]; } TComPic* m_cIlpPic[MAX_NUM_REF]; ///< Inter layer Prediction picture = upsampled picture #if REF_IDX_MFM @@ -235,6 +235,6 @@ Void setNumRefLayerOffsets(Int x) { m_numRefLayerOffsets = x; } UInt getNumRefLayerOffsets() { return m_numRefLayerOffsets; } - Void setRefLayerId(Int x, UInt id) { m_refLayerId[x] = id; } - UInt getRefLayerId(Int x) { return m_refLayerId[x]; } + Void setRefLayerId(Int layerIdx, UInt layerId) { m_refLayerId[layerIdx] = layerId; } + UInt getRefLayerId(Int layerIdx) { return m_refLayerId[layerIdx]; } Window& getRefLayerWindowForLayer(Int layerId); Window& getRefLayerWindow(Int x) { return m_refLayerWindow[x]; }