Index: branches/SHM-6-dev/source/Lib/TLibCommon/TComPic.h =================================================================== --- branches/SHM-6-dev/source/Lib/TLibCommon/TComPic.h (revision 721) +++ branches/SHM-6-dev/source/Lib/TLibCommon/TComPic.h (revision 722) @@ -202,5 +202,5 @@ TComPicYuv* getFullPelBaseRec (UInt refLayerIdc) { return m_pcFullPelBaseRec[refLayerIdc]; } #if REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE || REF_IDX_MFM - Bool isILR( UInt currLayerId ) { return ( getIsLongTerm() && m_layerId < currLayerId ); } + Bool isILR( UInt currLayerId ) { return ( m_bIsLongTerm && m_layerId < currLayerId ); } #endif #if REF_IDX_MFM Index: branches/SHM-6-dev/source/Lib/TLibCommon/TComPrediction.cpp =================================================================== --- branches/SHM-6-dev/source/Lib/TLibCommon/TComPrediction.cpp (revision 721) +++ branches/SHM-6-dev/source/Lib/TLibCommon/TComPrediction.cpp (revision 722) @@ -487,6 +487,13 @@ pcCU->clipMv(cMv); +#if SVC_EXTENSION + TComPic* refPic = pcCU->getSlice()->getRefPic(eRefPicList, iRefIdx); + + // ILRP has to be for the sample prediction type + assert( ( refPic->isILR(pcCU->getLayerId()) && pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerId(), refPic->getLayerId() ) ) || refPic->isILR(pcCU->getLayerId()) == false ); + #if REF_IDX_ME_ZEROMV - assert( ( pcCU->getSlice()->getRefPic(eRefPicList, iRefIdx)->isILR(pcCU->getLayerId()) && cMv.getHor() == 0 && cMv.getVer() == 0 ) || pcCU->getSlice()->getRefPic(eRefPicList, iRefIdx)->isILR(pcCU->getLayerId()) == false ); + assert( ( refPic->isILR(pcCU->getLayerId()) && cMv.getHor() == 0 && cMv.getVer() == 0 ) || refPic->isILR(pcCU->getLayerId()) == false ); +#endif #endif Index: branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h =================================================================== --- branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h (revision 721) +++ branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h (revision 722) @@ -836,6 +836,6 @@ #endif #if ILP_SSH_SIG - Bool getIlpSshSignalingEnabledFlag() { return m_ilpSshSignalingEnabledFlag;} - Void setIlpSshSignalingEnabledFlag(Bool x) { m_ilpSshSignalingEnabledFlag = x;} + Bool getIlpSshSignalingEnabledFlag() { return m_ilpSshSignalingEnabledFlag;} + Void setIlpSshSignalingEnabledFlag(Bool x) { m_ilpSshSignalingEnabledFlag = x;} #endif #if VPS_EXTN_PROFILE_INFO @@ -883,4 +883,5 @@ UInt getDirectDependencyType(Int currLayerId, Int refLayerId) { return m_directDependencyType[currLayerId][refLayerId]; } Void setDirectDependencyType(Int currLayerId, Int refLayerId, UInt x) { m_directDependencyType[currLayerId][refLayerId] = x; } + Bool isSamplePredictionType(Int currLayerId, Int refLayerId) { assert(currLayerId != refLayerId); return ( ( m_directDependencyType[currLayerId][refLayerId] + 1 ) & 1 ) ? true : false; } #endif UInt getNumProfileTierLevel() { return m_numProfileTierLevel; } Index: branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp =================================================================== --- branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp (revision 721) +++ branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp (revision 722) @@ -1543,6 +1543,7 @@ { UInt refLayerIdc = i; + UInt refLayerId = pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc); #if AVC_BASE - if( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getAvcBaseLayerFlag() ) + if( refLayerId == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getAvcBaseLayerFlag() ) { TComPic* pic = *m_ppcTDecTop[0]->getListPic()->begin(); @@ -1593,5 +1594,5 @@ #if O0098_SCALED_REF_LAYER_ID - const Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindowForLayer(pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc)); + const Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindowForLayer(refLayerId); #else const Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc); @@ -1629,17 +1630,20 @@ #if SVC_UPSAMPLING if( pcPic->isSpatialEnhLayer(refLayerIdc) ) - { + { + // check for the sample prediction picture type + if( m_ppcTDecTop[m_layerId]->getSamplePredEnabledFlag(refLayerId) ) + { #if O0215_PHASE_ALIGNMENT #if O0194_JOINT_US_BITSHIFT #if Q0048_CGS_3D_ASYMLUT - m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); -#else - m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); + m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); +#else + m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); #endif #else #if Q0048_CGS_3D_ASYMLUT - m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc), pcSlice->getVPS()->getPhaseAlignFlag() ); -#else - m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() ); + m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc), pcSlice->getVPS()->getPhaseAlignFlag() ); +#else + m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() ); #endif #endif @@ -1647,16 +1651,17 @@ #if O0194_JOINT_US_BITSHIFT #if Q0048_CGS_3D_ASYMLUT - m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); -#else - m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); + m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); +#else + m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); #endif #else #if Q0048_CGS_3D_ASYMLUT - m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); -#else - m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); -#endif -#endif -#endif + m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); +#else + m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); +#endif +#endif +#endif + } } else Index: branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp =================================================================== --- branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 721) +++ branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 722) @@ -1012,10 +1012,11 @@ if (m_layerId > 0) { - Int interLayerPredLayerIdcTmp[MAX_VPS_LAYER_ID_PLUS1]; - Int activeNumILRRefIdxTmp = 0; + Int interLayerPredLayerIdcTmp[MAX_VPS_LAYER_ID_PLUS1]; + Int activeNumILRRefIdxTmp = 0; for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ ) { UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i); + UInt refLayerId = pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc); #if VPS_EXTN_DIRECT_REF_LAYERS TComList *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(refLayerIdc)->getListPic(); @@ -1041,5 +1042,5 @@ #if O0098_SCALED_REF_LAYER_ID - const Window &scalEL = m_pcEncTop->getScaledRefLayerWindowForLayer(pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc)); + const Window &scalEL = m_pcEncTop->getScaledRefLayerWindowForLayer(refLayerId); #else const Window &scalEL = m_pcEncTop->getScaledRefLayerWindow(refLayerIdc); @@ -1089,25 +1090,28 @@ #endif #if SVC_UPSAMPLING - if( pcPic->isSpatialEnhLayer(refLayerIdc)) - { + if( pcPic->isSpatialEnhLayer(refLayerIdc) ) + { + // check for the sample prediction picture type + if( m_ppcTEncTop[m_layerId]->getSamplePredEnabledFlag(refLayerId) ) + { #if P0312_VERT_PHASE_ADJ - //when PhasePositionEnableFlag is equal to 1, set vertPhasePositionFlag to 0 if BL is top field and 1 if bottom - if( scalEL.getVertPhasePositionEnableFlag() ) - { - pcSlice->setVertPhasePositionFlag( pcSlice->getPOC()%2, refLayerIdc ); - } + //when PhasePositionEnableFlag is equal to 1, set vertPhasePositionFlag to 0 if BL is top field and 1 if bottom + if( scalEL.getVertPhasePositionEnableFlag() ) + { + pcSlice->setVertPhasePositionFlag( pcSlice->getPOC()%2, refLayerIdc ); + } #endif #if O0215_PHASE_ALIGNMENT #if O0194_JOINT_US_BITSHIFT #if Q0048_CGS_3D_ASYMLUT - m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); -#else - m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); + m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); +#else + m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getVPS()->getPhaseAlignFlag() ); #endif #else #if Q0048_CGS_3D_ASYMLUT - m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() ); -#else - m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() ); + m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() ); +#else + m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL, pcSlice->getVPS()->getPhaseAlignFlag() ); #endif #endif @@ -1115,16 +1119,17 @@ #if O0194_JOINT_US_BITSHIFT #if Q0048_CGS_3D_ASYMLUT - m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); -#else - m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); + m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); +#else + m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); #endif #else #if Q0048_CGS_3D_ASYMLUT - m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); -#else - m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); -#endif -#endif -#endif + m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec(), scalEL ); +#else + m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL ); +#endif +#endif +#endif + } } else @@ -1154,5 +1159,5 @@ pcSlice->setInterLayerPredEnabledFlag(false); } - + if( pocCurr % m_pcCfg->getIntraPeriod() == 0 ) { @@ -1173,5 +1178,5 @@ else #endif - pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA); + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA); #if IDR_ALIGNMENT @@ -1188,5 +1193,5 @@ #endif } - + if( pcSlice->getActiveNumILRRefIdx() == 0 && pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA ) { @@ -1196,10 +1201,10 @@ { if( (pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && - (pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && - pcSlice->getSliceType() == B_SLICE ) + (pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && + pcSlice->getSliceType() == B_SLICE ) { pcSlice->setSliceType(P_SLICE); } - } + } } #endif //#if SVC_EXTENSION @@ -1471,4 +1476,24 @@ if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() ) { + // check for the reference pictures whether there is at least one either temporal picture or ILRP with sample prediction type + if( pcSlice->getNumRefIdx( REF_PIC_LIST_0 ) == 0 && pcSlice->getNumRefIdx( REF_PIC_LIST_1 ) == 0 ) + { + Bool foundSamplePredPicture = false; + + for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ ) + { + if( m_ppcTEncTop[m_layerId]->getSamplePredEnabledFlag( pcSlice->getVPS()->getRefLayerId( m_layerId, pcSlice->getInterLayerPredLayerIdc(i) ) ) ) + { + foundSamplePredPicture = true; + break; + } + } + + if( !foundSamplePredPicture ) + { + pcSlice->setSliceType(I_SLICE); + } + } + #if POC_RESET_FLAG if ( pocCurr > 0 && pcSlice->isRADL() && pcPic->getSlice(0)->getBaseColPic(pcPic->getSlice(0)->getInterLayerPredLayerIdc(0))->getSlice(0)->isRASL()) @@ -1567,4 +1592,56 @@ pcSlice->setColFromL0Flag(ColFromL0Flag); pcSlice->setColRefIdx(ColRefIdx); + + // remove motion only ILRP from the end of the ColFromL0Flag reference picture list + RefPicList refList = RefPicList(ColFromL0Flag); + Int numRefIdx = pcSlice->getNumRefIdx(refList); + + if( numRefIdx > 0 ) + { + for( Int refIdx = pcSlice->getNumRefIdx(refList) - 1; refIdx >= pcSlice->getNumRefIdx(refList) - pcSlice->getActiveNumILRRefIdx(); refIdx-- ) + { + TComPic* ilrp = pcSlice->getRefPic(refList, refIdx); + + assert( ilrp->isILR(m_layerId) ); + + if( m_ppcTEncTop[m_layerId]->getSamplePredEnabledFlag( ilrp->getLayerId() ) ) + { + break; + } + else + { + assert( numRefIdx > 1 ); + numRefIdx--; + } + } + + pcSlice->setNumRefIdx( refList, numRefIdx ); + } + + // remove motion only ILRP from the end of the (1-ColFromL0Flag) reference picture list up to ColRefIdx + refList = RefPicList(1 - ColFromL0Flag); + numRefIdx = pcSlice->getNumRefIdx(refList); + + if( numRefIdx > 0 ) + { + for( Int refIdx = pcSlice->getNumRefIdx(refList) - 1; refIdx >= pcSlice->getNumRefIdx(refList) - pcSlice->getActiveNumILRRefIdx() && refIdx > ColRefIdx; refIdx-- ) + { + TComPic* ilrp = pcSlice->getRefPic(refList, refIdx); + + assert( ilrp->isILR(m_layerId) ); + + if( m_ppcTEncTop[m_layerId]->getSamplePredEnabledFlag( ilrp->getLayerId() ) ) + { + break; + } + else + { + assert( numRefIdx > 1 ); + numRefIdx--; + } + } + + pcSlice->setNumRefIdx( refList, numRefIdx ); + } } } Index: branches/SHM-6-dev/source/Lib/TLibEncoder/TEncSearch.cpp =================================================================== --- branches/SHM-6-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 721) +++ branches/SHM-6-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 722) @@ -3222,16 +3222,25 @@ for ( Int iRefIdxTemp = 0; iRefIdxTemp < pcCU->getSlice()->getNumRefIdx(eRefPicList); iRefIdxTemp++ ) { +#if SVC_EXTENSION + TComPic* pcPic = pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp ); + + // motion search only for the ILRP with sample prediction type + if( pcPic->isILR( pcCU->getLayerId() ) && !pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerId(), pcPic->getLayerId() ) ) + { + continue; + } + #if N0383_IL_CONSTRAINED_TILE_SETS_SEI - if (pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp )->isILR(pcCU->getLayerId()) && m_disableILP) + if( pcPic->isILR(pcCU->getLayerId()) && m_disableILP ) { continue; } #endif -#if (ENCODER_FAST_MODE) - TComPic* pcPic = pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp ); +#if (ENCODER_FAST_MODE) if( pcPic->isILR(pcCU->getLayerId()) && (ePartSize == SIZE_2Nx2N) ) { continue; } +#endif #endif @@ -3462,5 +3471,12 @@ #if (ENCODER_FAST_MODE) Bool testRefIdx = true; - pcPic = pcCU->getSlice()->getRefPic( RefPicList(iRefList) , iRefIdxTemp ); + pcPic = pcCU->getSlice()->getRefPic( RefPicList(iRefList) , iRefIdxTemp ); + + // motion search only for the ILRP with sample prediction type + if( pcPic->isILR( pcCU->getLayerId() ) && !pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerId(), pcPic->getLayerId() ) ) + { + continue; + } + if(pcPic->isILR(pcCU->getLayerId()) && (ePartSize == SIZE_2Nx2N)) { @@ -5967,143 +5983,148 @@ Bool TEncSearch::predInterSearchILRUni( TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv*& rpcPredYuv, TComYuv*& rpcResiYuv, TComYuv*& rpcRecoYuv, UInt refLayerId ) { - rpcPredYuv->clear(); - rpcRecoYuv->clear(); - - Int iNumPredDir = pcCU->getSlice()->isInterP() ? 1 : 2; - - TComMv cMv[2]; - TComMv cMvPred[2][33]; - TComMv cMvTemp[2][33]; - TComMv TempMv; - - Int iRefIdx[2]={0,0}; - - Int aaiMvpIdx[2][33]; - Int aaiMvpNum[2][33]; - - UInt uiMbBits[3] = {1, 1, 0}; - UInt uiLastMode = 0; - - UInt uiCost[2] = { MAX_UINT, MAX_UINT }; //uni, rdCost - UInt uiCostTemp; - UInt biPDistTemp = MAX_INT; - UInt uiBitsTemp; - - PartSize ePartSize = pcCU->getPartitionSize( 0 ); //2Nx2N - Int iPartIdx = 0; //one PU in CU - UInt uiPartAddr; - Int iRoiWidth, iRoiHeight; - Bool bILRSearched = false; - - xGetBlkBits( ePartSize, pcCU->getSlice()->isInterP(), iPartIdx, uiLastMode, uiMbBits); - pcCU->getPartIndexAndSize( iPartIdx, uiPartAddr, iRoiWidth, iRoiHeight ); - - for( Int iRefList = 0; iRefList < iNumPredDir; iRefList++) //list - { - if(bILRSearched) - continue; - - RefPicList eRefPicList = ( iRefList ? REF_PIC_LIST_1 : REF_PIC_LIST_0 ); - - Int iRefIdxTemp = -1; - Bool foundILR = false; - - for( Int refIdx = 0; refIdx < pcCU->getSlice()->getNumRefIdx(eRefPicList); refIdx++ ) - { - if( pcCU->getSlice()->getRefPic(eRefPicList, refIdx)->isILR(pcCU->getLayerId()) && pcCU->getSlice()->getRefPic(eRefPicList, refIdx)->getLayerId() == refLayerId ) - { - iRefIdxTemp = refIdx; - foundILR = true; - bILRSearched = true; - break; - } - } - - if(!foundILR) //no ILR in eRefPiclist - { - continue; - } - - uiBitsTemp = uiMbBits[iRefList]; - if ( pcCU->getSlice()->getNumRefIdx(eRefPicList) > 1 ) - { - uiBitsTemp += iRefIdxTemp+1; - if ( iRefIdxTemp == pcCU->getSlice()->getNumRefIdx(eRefPicList)-1 ) uiBitsTemp--; - } - - xEstimateMvPredAMVP( pcCU, pcOrgYuv, iPartIdx, eRefPicList, iRefIdxTemp, cMvPred[iRefList][iRefIdxTemp], false, &biPDistTemp); - aaiMvpIdx[iRefList][iRefIdxTemp] = pcCU->getMVPIdx(eRefPicList, uiPartAddr); - aaiMvpNum[iRefList][iRefIdxTemp] = pcCU->getMVPNum(eRefPicList, uiPartAddr); - - uiBitsTemp += m_auiMVPIdxCost[aaiMvpIdx[iRefList][iRefIdxTemp]][AMVP_MAX_NUM_CANDS]; - - xMotionEstimation ( pcCU, pcOrgYuv, iPartIdx, eRefPicList, &cMvPred[iRefList][iRefIdxTemp], iRefIdxTemp, cMvTemp[iRefList][iRefIdxTemp], uiBitsTemp, uiCostTemp ); - xCheckBestMVP(pcCU, eRefPicList, cMvTemp[iRefList][iRefIdxTemp], cMvPred[iRefList][iRefIdxTemp], aaiMvpIdx[iRefList][iRefIdxTemp], uiBitsTemp, uiCostTemp); - - if( uiCostTemp < uiCost[iRefList] ) - { - uiCost[iRefList] = uiCostTemp; - - cMv[iRefList] = cMvTemp[iRefList][iRefIdxTemp]; - iRefIdx[iRefList] = iRefIdxTemp; - - pcCU->getCUMvField(eRefPicList)->setAllMv( cMv[iRefList], ePartSize, uiPartAddr, 0, iPartIdx ); - pcCU->getCUMvField(eRefPicList)->setAllRefIdx( iRefIdx[iRefList], ePartSize, uiPartAddr, 0, iPartIdx ); - } - } - - if( uiCost[0] == MAX_UINT && uiCost[1] == MAX_UINT ) //no ILR in both list0 and list1 - { - return false; - } - - // Clear Motion Field - pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMvField( TComMvField(), ePartSize, uiPartAddr, 0, iPartIdx ); - pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMvField( TComMvField(), ePartSize, uiPartAddr, 0, iPartIdx ); - pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMvd ( TComMv(), ePartSize, uiPartAddr, 0, iPartIdx ); - pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMvd ( TComMv(), ePartSize, uiPartAddr, 0, iPartIdx ); - - pcCU->setMVPIdxSubParts( -1, REF_PIC_LIST_0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); - pcCU->setMVPNumSubParts( -1, REF_PIC_LIST_0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); - pcCU->setMVPIdxSubParts( -1, REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); - pcCU->setMVPNumSubParts( -1, REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); - - if( uiCost[0] <= uiCost[1] ) //list0 ILR - { - pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMv ( cMv[0], ePartSize, uiPartAddr, 0, iPartIdx ); - pcCU->getCUMvField(REF_PIC_LIST_0)->setAllRefIdx( iRefIdx[0], ePartSize, uiPartAddr, 0, iPartIdx ); - - TempMv = cMv[0] - cMvPred[0][iRefIdx[0]]; - pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMvd( TempMv, ePartSize, uiPartAddr, 0, iPartIdx ); - - pcCU->setInterDirSubParts( 1, uiPartAddr, iPartIdx, pcCU->getDepth(0) ); - - pcCU->setMVPIdxSubParts( aaiMvpIdx[0][iRefIdx[0]], REF_PIC_LIST_0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); - pcCU->setMVPNumSubParts( aaiMvpNum[0][iRefIdx[0]], REF_PIC_LIST_0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); - } - else if( uiCost[1] < uiCost[0] ) //list1 ILR - { - pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMv ( cMv[1], ePartSize, uiPartAddr, 0, iPartIdx ); - pcCU->getCUMvField(REF_PIC_LIST_1)->setAllRefIdx( iRefIdx[1], ePartSize, uiPartAddr, 0, iPartIdx ); - - TempMv = cMv[1] - cMvPred[1][iRefIdx[1]]; - pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMvd( TempMv, ePartSize, uiPartAddr, 0, iPartIdx ); - - pcCU->setInterDirSubParts( 2, uiPartAddr, iPartIdx, pcCU->getDepth(0) ); - - pcCU->setMVPIdxSubParts( aaiMvpIdx[1][iRefIdx[1]], REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); - pcCU->setMVPNumSubParts( aaiMvpNum[1][iRefIdx[1]], REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); - } - else - { - assert(0); - } - - pcCU->setMergeFlagSubParts( false, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) ); - - motionCompensation ( pcCU, rpcPredYuv, REF_PIC_LIST_X, iPartIdx ); - setWpScalingDistParam( pcCU, -1, REF_PIC_LIST_X ); - - return true; + rpcPredYuv->clear(); + rpcRecoYuv->clear(); + + Int iNumPredDir = pcCU->getSlice()->isInterP() ? 1 : 2; + + TComMv cMv[2]; + TComMv cMvPred[2][33]; + TComMv cMvTemp[2][33]; + TComMv TempMv; + + Int iRefIdx[2]={0,0}; + + Int aaiMvpIdx[2][33]; + Int aaiMvpNum[2][33]; + + UInt uiMbBits[3] = {1, 1, 0}; + UInt uiLastMode = 0; + + UInt uiCost[2] = { MAX_UINT, MAX_UINT }; //uni, rdCost + UInt uiCostTemp; + UInt biPDistTemp = MAX_INT; + UInt uiBitsTemp; + + PartSize ePartSize = pcCU->getPartitionSize( 0 ); //2Nx2N + Int iPartIdx = 0; //one PU in CU + UInt uiPartAddr; + Int iRoiWidth, iRoiHeight; + Bool bILRSearched = false; + + xGetBlkBits( ePartSize, pcCU->getSlice()->isInterP(), iPartIdx, uiLastMode, uiMbBits); + pcCU->getPartIndexAndSize( iPartIdx, uiPartAddr, iRoiWidth, iRoiHeight ); + + for( Int iRefList = 0; iRefList < iNumPredDir; iRefList++) //list + { + if(bILRSearched) + { + continue; + } + + RefPicList eRefPicList = ( iRefList ? REF_PIC_LIST_1 : REF_PIC_LIST_0 ); + + Int iRefIdxTemp = -1; + Bool foundILR = false; + + for( Int refIdx = 0; refIdx < pcCU->getSlice()->getNumRefIdx(eRefPicList); refIdx++ ) + { + TComPic* refPic = pcCU->getSlice()->getRefPic(eRefPicList, refIdx); + + // ILRP has to be for the sample prediction type + if( refPic->isILR(pcCU->getLayerId()) && refPic->getLayerId() == refLayerId && pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerId(), refLayerId ) ) + { + iRefIdxTemp = refIdx; + foundILR = true; + bILRSearched = true; + break; + } + } + + if(!foundILR) //no ILR in eRefPiclist + { + continue; + } + + uiBitsTemp = uiMbBits[iRefList]; + if ( pcCU->getSlice()->getNumRefIdx(eRefPicList) > 1 ) + { + uiBitsTemp += iRefIdxTemp+1; + if ( iRefIdxTemp == pcCU->getSlice()->getNumRefIdx(eRefPicList)-1 ) uiBitsTemp--; + } + + xEstimateMvPredAMVP( pcCU, pcOrgYuv, iPartIdx, eRefPicList, iRefIdxTemp, cMvPred[iRefList][iRefIdxTemp], false, &biPDistTemp); + aaiMvpIdx[iRefList][iRefIdxTemp] = pcCU->getMVPIdx(eRefPicList, uiPartAddr); + aaiMvpNum[iRefList][iRefIdxTemp] = pcCU->getMVPNum(eRefPicList, uiPartAddr); + + uiBitsTemp += m_auiMVPIdxCost[aaiMvpIdx[iRefList][iRefIdxTemp]][AMVP_MAX_NUM_CANDS]; + + xMotionEstimation ( pcCU, pcOrgYuv, iPartIdx, eRefPicList, &cMvPred[iRefList][iRefIdxTemp], iRefIdxTemp, cMvTemp[iRefList][iRefIdxTemp], uiBitsTemp, uiCostTemp ); + xCheckBestMVP(pcCU, eRefPicList, cMvTemp[iRefList][iRefIdxTemp], cMvPred[iRefList][iRefIdxTemp], aaiMvpIdx[iRefList][iRefIdxTemp], uiBitsTemp, uiCostTemp); + + if( uiCostTemp < uiCost[iRefList] ) + { + uiCost[iRefList] = uiCostTemp; + + cMv[iRefList] = cMvTemp[iRefList][iRefIdxTemp]; + iRefIdx[iRefList] = iRefIdxTemp; + + pcCU->getCUMvField(eRefPicList)->setAllMv( cMv[iRefList], ePartSize, uiPartAddr, 0, iPartIdx ); + pcCU->getCUMvField(eRefPicList)->setAllRefIdx( iRefIdx[iRefList], ePartSize, uiPartAddr, 0, iPartIdx ); + } + } + + if( uiCost[0] == MAX_UINT && uiCost[1] == MAX_UINT ) //no ILR in both list0 and list1 + { + return false; + } + + // Clear Motion Field + pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMvField( TComMvField(), ePartSize, uiPartAddr, 0, iPartIdx ); + pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMvField( TComMvField(), ePartSize, uiPartAddr, 0, iPartIdx ); + pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMvd ( TComMv(), ePartSize, uiPartAddr, 0, iPartIdx ); + pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMvd ( TComMv(), ePartSize, uiPartAddr, 0, iPartIdx ); + + pcCU->setMVPIdxSubParts( -1, REF_PIC_LIST_0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); + pcCU->setMVPNumSubParts( -1, REF_PIC_LIST_0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); + pcCU->setMVPIdxSubParts( -1, REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); + pcCU->setMVPNumSubParts( -1, REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); + + if( uiCost[0] <= uiCost[1] ) //list0 ILR + { + pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMv ( cMv[0], ePartSize, uiPartAddr, 0, iPartIdx ); + pcCU->getCUMvField(REF_PIC_LIST_0)->setAllRefIdx( iRefIdx[0], ePartSize, uiPartAddr, 0, iPartIdx ); + + TempMv = cMv[0] - cMvPred[0][iRefIdx[0]]; + pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMvd( TempMv, ePartSize, uiPartAddr, 0, iPartIdx ); + + pcCU->setInterDirSubParts( 1, uiPartAddr, iPartIdx, pcCU->getDepth(0) ); + + pcCU->setMVPIdxSubParts( aaiMvpIdx[0][iRefIdx[0]], REF_PIC_LIST_0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); + pcCU->setMVPNumSubParts( aaiMvpNum[0][iRefIdx[0]], REF_PIC_LIST_0, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); + } + else if( uiCost[1] < uiCost[0] ) //list1 ILR + { + pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMv ( cMv[1], ePartSize, uiPartAddr, 0, iPartIdx ); + pcCU->getCUMvField(REF_PIC_LIST_1)->setAllRefIdx( iRefIdx[1], ePartSize, uiPartAddr, 0, iPartIdx ); + + TempMv = cMv[1] - cMvPred[1][iRefIdx[1]]; + pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMvd( TempMv, ePartSize, uiPartAddr, 0, iPartIdx ); + + pcCU->setInterDirSubParts( 2, uiPartAddr, iPartIdx, pcCU->getDepth(0) ); + + pcCU->setMVPIdxSubParts( aaiMvpIdx[1][iRefIdx[1]], REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); + pcCU->setMVPNumSubParts( aaiMvpNum[1][iRefIdx[1]], REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr)); + } + else + { + assert(0); + } + + pcCU->setMergeFlagSubParts( false, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) ); + + motionCompensation ( pcCU, rpcPredYuv, REF_PIC_LIST_X, iPartIdx ); + setWpScalingDistParam( pcCU, -1, REF_PIC_LIST_X ); + + return true; } #endif Index: branches/SHM-6-dev/source/Lib/TLibEncoder/TEncSearch.h =================================================================== --- branches/SHM-6-dev/source/Lib/TLibEncoder/TEncSearch.h (revision 721) +++ branches/SHM-6-dev/source/Lib/TLibEncoder/TEncSearch.h (revision 722) @@ -126,9 +126,8 @@ #if SVC_EXTENSION - TEncTop** m_ppcTEncTop; #if N0383_IL_CONSTRAINED_TILE_SETS_SEI Bool m_disableILP; #endif -#endif //SVC_EXTENAION +#endif //SVC_EXTENSION public: