Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.cpp =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.cpp (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.cpp (revision 647) @@ -2656,9 +2656,5 @@ // check prediction mode UInt uiLumaPredMode = getLumaIntraDir( uiAbsPartIdx ); -#if LGE_SDC_REMOVE_DC_E0158 if( uiLumaPredMode == PLANAR_IDX || ( getDimType( uiLumaPredMode ) == DMM1_IDX && !isDimDeltaDC( uiLumaPredMode ) ) ) -#else - if( uiLumaPredMode == DC_IDX || uiLumaPredMode == PLANAR_IDX || ( getDimType( uiLumaPredMode ) == DMM1_IDX && !isDimDeltaDC( uiLumaPredMode ) ) ) -#endif return true; @@ -3536,5 +3532,5 @@ UInt uiPartIdxCenter; xDeriveCenterIdx( uiPUIdx, uiPartIdxCenter ); -#if H_3D_FCO_E0163 +#if H_3D_FCO TComPic * pcTexturePic = m_pcSlice->getTexturePic(); TComDataCU *pcTextureCU = 0; @@ -3545,5 +3541,5 @@ #endif -#if H_3D_FCO_E0163 +#if H_3D_FCO if ( pcTextureCU && pcTexturePic->getReconMark() && !pcTextureCU->isIntra( uiPartIdxCenter ) ) #else @@ -5487,11 +5483,4 @@ xDeriveCenterIdx(uiPartIdx, uiPartIdxCenter ); - ///*** Derive bottom right neighbour position *** -#if !SEC_SIMPLIFIED_NBDV_E0142 - Int iLCUIdxRBNb = -1; - Int iPartIdxRBNb = -1; - xDeriveRightBottomNbIdx(iLCUIdxRBNb, iPartIdxRBNb ); -#endif - ///*** Search temporal candidate pictures for disparity vector *** const Int iNumCandPics = getPic()->getNumDdvCandPics(); @@ -5511,60 +5500,37 @@ } -#if !SEC_SIMPLIFIED_NBDV_E0142 - // Check BR and Center - for(Int curPosition = 0; curPosition < 2; curPosition++) - { -#endif - Bool bCheck = false; -#if !SEC_SIMPLIFIED_NBDV_E0142 - if ( curPosition == 0 && iLCUIdxRBNb >= 0 ) -#if MTK_NBDV_TN_FIX_E0172 - bCheck = xGetColDisMV( curCandPic, eCurRefPicList, curCandPicRefIdx, iLCUIdxRBNb, iPartIdxRBNb, cColMv, iTargetViewIdx, iTStartViewIdx); + Bool bCheck = xGetColDisMV( curCandPic, eCurRefPicList, curCandPicRefIdx, uiLCUIdx, uiPartIdxCenter, cColMv, iTargetViewIdx, iTStartViewIdx ); + + if( bCheck ) + { + clipMv(cColMv); + pDInfo->m_acNBDV = cColMv; + pDInfo->m_aVIdxCan = iTargetViewIdx; + +#if H_3D_NBDV_REF + TComPic* picDepth = NULL; +#if H_3D_FCO_VSP_DONBDV_E0163 + picDepth = getSlice()->getIvPic(true, getSlice()->getViewIndex() ); + if ( picDepth->getPicYuvRec() != NULL ) + { + cColMv.setZero(); + } + else // Go back with virtual depth + { + picDepth = getSlice()->getIvPic( true, iTargetViewIdx ); + } + + assert(picDepth != NULL); #else - bCheck = xGetColDisMV( eCurRefPicList, curCandPicRefIdx, iLCUIdxRBNb, iPartIdxRBNb, cColMv, iTargetViewIdx, iTStartViewIdx); -#endif - - if (curPosition == 1 ) -#endif -#if MTK_NBDV_TN_FIX_E0172 - bCheck = xGetColDisMV( curCandPic, eCurRefPicList, curCandPicRefIdx, uiLCUIdx, uiPartIdxCenter, cColMv, iTargetViewIdx, iTStartViewIdx ); -#else - bCheck = xGetColDisMV( eCurRefPicList, curCandPicRefIdx, uiLCUIdx, uiPartIdxCenter, cColMv, iTargetViewIdx, iTStartViewIdx ); -#endif - - if( bCheck ) - { - clipMv(cColMv); - pDInfo->m_acNBDV = cColMv; - pDInfo->m_aVIdxCan = iTargetViewIdx; - -#if H_3D_NBDV_REF - TComPic* picDepth = NULL; -#if H_3D_FCO_VSP_DONBDV_E0163 - picDepth = getSlice()->getIvPic(true, getSlice()->getViewIndex() ); - if ( picDepth->getPicYuvRec() != NULL ) - { - cColMv.setZero(); - } - else // Go back with virtual depth - { - picDepth = getSlice()->getIvPic( true, iTargetViewIdx ); - } - - assert(picDepth != NULL); -#else - picDepth = getSlice()->getIvPic( true, iTargetViewIdx ); - assert(picDepth != NULL); -#endif - if (picDepth && bDepthRefine) - estimateDVFromDM(iTargetViewIdx, uiPartIdx, picDepth, uiPartAddr, &cColMv ); - - pDInfo->m_acDoNBDV = cColMv; + picDepth = getSlice()->getIvPic( true, iTargetViewIdx ); + assert(picDepth != NULL); +#endif + if (picDepth && bDepthRefine) + estimateDVFromDM(iTargetViewIdx, uiPartIdx, picDepth, uiPartAddr, &cColMv ); + + pDInfo->m_acDoNBDV = cColMv; #endif //H_3D_NBDV_REF - return true; - } -#if !SEC_SIMPLIFIED_NBDV_E0142 - } -#endif + return true; + } } } @@ -5579,5 +5545,5 @@ if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, pDInfo, bCheckMcpDv, &cIDVInfo, DVFROM_LEFT #if H_3D_NBDV_REF - , bDepthRefine + , bDepthRefine #endif ) ) @@ -5591,52 +5557,9 @@ if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, pDInfo, bCheckMcpDv, &cIDVInfo, DVFROM_ABOVE #if H_3D_NBDV_REF - , bDepthRefine -#endif - ) ) + , bDepthRefine +#endif + ) ) return true; } - -#if !SEC_SIMPLIFIED_NBDV_E0142 - //// ******* Get disparity from above right block ******* ///// - pcTmpCU = getPUAboveRight(uiIdx, uiPartIdxRT, true); - if(pcTmpCU != NULL ) - { - bCheckMcpDv = ( ( getAddr() - pcTmpCU->getAddr() ) == 0); - if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, pDInfo, bCheckMcpDv, &cIDVInfo, DVFROM_ABOVERIGHT -#if H_3D_NBDV_REF - , bDepthRefine -#endif - ) ) - return true; - } - - //// ******* Get disparity from below left block ******* ///// - pcTmpCU = getPUBelowLeft(uiIdx, uiPartIdxLB, true); - if( pcTmpCU != NULL ) - { - bCheckMcpDv = true; - if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, pDInfo, bCheckMcpDv, &cIDVInfo, DVFROM_LEFTBELOW -#if H_3D_NBDV_REF - , bDepthRefine -#endif - ) ) - return true; - } - - //// ******* Get disparity from above left block ******* ///// - pcTmpCU = getPUAboveLeft(uiIdx, (m_uiAbsIdxInLCU + uiPartAddr), true); - assert(uiPartIdxLT == (m_uiAbsIdxInLCU + uiPartAddr)); - - if( pcTmpCU != NULL ) - { - bCheckMcpDv = (( getAddr() - pcTmpCU->getAddr() ) <= 1); - if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, pDInfo, bCheckMcpDv, &cIDVInfo, DVFROM_ABOVELEFT -#if H_3D_NBDV_REF - , bDepthRefine -#endif - ) ) - return true; - } -#endif //// ******* Search MCP blocks ******* ///// @@ -5747,15 +5670,8 @@ Int iPictureHeight = pcBaseViewDepthPicYuv->getHeight(); -#if NTT_DoNBDV_VECTOR_CLIP_E0141 Int depthStartPosX = Clip3(0, iPictureWidth - 1, iBlkX + ((mv->getHor()+2)>>2)); Int depthStartPosY = Clip3(0, iPictureHeight - 1, iBlkY + ((mv->getVer()+2)>>2)); Int depthEndPosX = Clip3(0, iPictureWidth - 1, iBlkX + iBlkWidth - 1 + ((mv->getHor()+2)>>2)); Int depthEndPosY = Clip3(0, iPictureHeight - 1, iBlkY + iBlkHeight - 1 + ((mv->getVer()+2)>>2)); -#else - Int depthStartPosX = Clip3(0, iPictureWidth - iBlkWidth, iBlkX + ((mv->getHor()+2)>>2)); - Int depthStartPosY = Clip3(0, iPictureHeight- iBlkHeight, iBlkY + ((mv->getVer()+2)>>2)); - Int depthEndPosX = Clip3(0, iPictureWidth - 1, iBlkX + iBlkWidth - 1 + ((mv->getHor()+2)>>2)); - Int depthEndPosY = Clip3(0, iPictureHeight - 1, iBlkY + iBlkHeight - 1 + ((mv->getVer()+2)>>2)); -#endif Pel* depthTL = pcBaseViewDepthPicYuv->getLumaAddr(); @@ -5848,5 +5764,5 @@ assert( uiMvpDvPos < IDV_CANDS ); paIDVInfo->m_acMvCand[iList][ uiMvpDvPos ] = TComMv( cMvPred.getIDVHor(), cMvPred.getIDVVer() ); - //Notes from QC: DvMCP is implemented in a way that doesnE½t carry the reference view identifier as NBDV. It only works for CTC and needs to be fixed to be aligned with other part of the NBDV design. + //Notes from QC: DvMCP is implemented in a way that doesnot carry the reference view identifier as NBDV. It only works for CTC and needs to be fixed to be aligned with other part of the NBDV design. paIDVInfo->m_aVIdxCan[iList][ uiMvpDvPos ] = cMvPred.getIDVVId(); paIDVInfo->m_bAvailab[iList][ uiMvpDvPos ] = true; @@ -5920,9 +5836,6 @@ } #endif -#if MTK_NBDV_TN_FIX_E0172 + Bool TComDataCU::xGetColDisMV( Int currCandPic, RefPicList eRefPicList, Int refidx, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv , Int & iTargetViewIdx, Int & iStartViewIdx ) -#else -Bool TComDataCU::xGetColDisMV( RefPicList eRefPicList, Int refidx, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv , Int & iTargetViewIdx, Int & iStartViewIdx ) -#endif { @@ -5940,5 +5853,5 @@ if(pColCU->getSlice()->isInterB()) { - eColRefPicList = RefPicList(ilist); + eColRefPicList = RefPicList(ilist); } @@ -5958,16 +5871,12 @@ else { -#if MTK_NBDV_TN_FIX_E0172 if(getPic()->isTempIVRefValid(currCandPic, ilist, iColRefIdx)) { -#endif - rcMv = pColCU->getCUMvField(eColRefPicList)->getMv(uiPartUnitIdx); - rcMv.setIDVFlag(0); - iTargetViewIdx = iColRefViewIdx ; - iStartViewIdx = iColViewIdx ; - return true; -#if MTK_NBDV_TN_FIX_E0172 - } -#endif + rcMv = pColCU->getCUMvField(eColRefPicList)->getMv(uiPartUnitIdx); + rcMv.setIDVFlag(0); + iTargetViewIdx = iColRefViewIdx ; + iStartViewIdx = iColViewIdx ; + return true; + } } } @@ -5976,5 +5885,5 @@ } #endif -#if MTK_FAST_TEXTURE_ENCODING_E0173 +#if H_3D_FAST_TEXTURE_ENCODIN Void TComDataCU::getIVNStatus ( UInt uiPartIdx, DisInfo* pDInfo, Bool& bIVFMerge, Int& iIVFMaxD) Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.h (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.h (revision 647) @@ -486,9 +486,5 @@ #endif ); -#if MTK_NBDV_TN_FIX_E0172 Bool xGetColDisMV ( Int currCandPic, RefPicList eRefPicList, Int refidx, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv, Int & iTargetViewIdx, Int & iStartViewIdx ); -#else - Bool xGetColDisMV ( RefPicList eRefPicList, Int refidx, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv, Int & iTargetViewIdx, Int & iStartViewIdx ); -#endif Bool getDisMvpCandNBDV ( DisInfo* pDInfo #if H_3D_NBDV_REF @@ -502,5 +498,5 @@ #endif //H_3D_NBDV_REF #endif -#if MTK_FAST_TEXTURE_ENCODING_E0173 +#if H_3D_FAST_TEXTURE_ENCODIN Void getIVNStatus ( UInt uiPartIdx, DisInfo* pDInfo, Bool& bIVFMerge, Int& iIVFMaxD); #endif Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.cpp =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.cpp (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.cpp (revision 647) @@ -119,5 +119,5 @@ /* initialize the texture to depth reference status */ -#if H_3D_FCO_E0163 +#if H_3D_FCO for (int j=0; j<2; j++) { @@ -672,6 +672,5 @@ return numDdvCandPics; } -#endif -#if MTK_NBDV_TN_FIX_E0172 + Void TComPic::checkTemporalIVRef() { @@ -727,11 +726,10 @@ return m_abTIVRINCurrRL[currCandPic][iColRefDir][iColRefIdx]; } -#endif -#if MTK_TEXTURE_MRGCAND_BUGFIX_E0182 + Void TComPic::checkTextureRef( ) { TComSlice* pcCurrSlice = getSlice(getCurrSliceIdx()); TComPic* pcTextPic = pcCurrSlice->getTexturePic(); -#if H_3D_FCO_E0163 +#if H_3D_FCO if ( pcTextPic ) { @@ -759,5 +757,5 @@ } -#if H_3D_FCO_E0163 +#if H_3D_FCO } #endif Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.h (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.h (revision 647) @@ -104,9 +104,5 @@ RefPicList m_eRapRefList; Int m_iNumDdvCandPics; -#endif -#if MTK_NBDV_TN_FIX_E0172 Bool m_abTIVRINCurrRL [2][2][MAX_NUM_REF]; //whether an inter-view reference picture with the same view index of the inter-view reference picture of temporal reference picture of current picture exists in current reference picture lists -#endif -#if MTK_TEXTURE_MRGCAND_BUGFIX_E0182 Int m_aiTexToDepRef [2][MAX_NUM_REF]; #endif @@ -224,12 +220,8 @@ UInt getRapRefIdx() {return m_uiRapRefIdx; } RefPicList getRapRefList() {return m_eRapRefList; } -#endif -#if MTK_NBDV_TN_FIX_E0172 - Void checkTemporalIVRef(); - Bool isTempIVRefValid(Int currCandPic, Int iTempRefDir, Int iTempRefIdx); -#endif -#if MTK_TEXTURE_MRGCAND_BUGFIX_E0182 - Void checkTextureRef( ); - Int isTextRefValid(Int iTextRefDir, Int iTextRefIdx); + Void checkTemporalIVRef(); + Bool isTempIVRefValid(Int currCandPic, Int iTempRefDir, Int iTempRefIdx); + Void checkTextureRef( ); + Int isTextRefValid(Int iTextRefDir, Int iTextRefIdx); #endif /** transfer ownership of seis to this picture */ Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPrediction.cpp =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPrediction.cpp (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPrediction.cpp (revision 647) @@ -1976,11 +1976,6 @@ Int uiColTexIntraDir = pcColTexCU->isIntra( uiTexPartIdx ) ? pcColTexCU->getLumaIntraDir( uiTexPartIdx ) : 255; -#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX assert( uiColTexIntraDir > DC_IDX && uiColTexIntraDir < 35 ); return g_aauiWdgLstM3[g_aucConvertToBit[uiWidth]][uiColTexIntraDir-2].at(intraTabIdx); -#else - if( uiColTexIntraDir > DC_IDX && uiColTexIntraDir < 35 ) { return g_aauiWdgLstM3[g_aucConvertToBit[uiWidth]][uiColTexIntraDir-2].at(intraTabIdx); } - else { return g_dmmWedgeNodeLists[(g_aucConvertToBit[uiWidth])].at(intraTabIdx).getPatternIdx(); } -#endif } Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRdCost.cpp =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRdCost.cpp (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRdCost.cpp (revision 647) @@ -484,5 +484,5 @@ } -#if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX +#if H_3D_FAST_DEPTH_INTRA UInt TComRdCost::calcVAR (Pel* pi0, Int stride, Int width, Int height, Int cuDepth) Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRdCost.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRdCost.h (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRdCost.h (revision 647) @@ -235,5 +235,5 @@ UInt calcHAD(Int bitDepth, Pel* pi0, Int iStride0, Pel* pi1, Int iStride1, Int iWidth, Int iHeight ); -#if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX +#if H_3D_FAST_DEPTH_INTRA UInt calcVAR(Pel* pi0, Int stride, Int width, Int height, Int cuDepth); #endif Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRom.cpp =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRom.cpp (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRom.cpp (revision 647) @@ -347,13 +347,8 @@ { //2x2 4x4 8x8 16x16 32x32 64x64 0, 7, 10, 11, 11, 13 }; -#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX + const UChar g_dmm3IntraTabIdxBits[6] = { //2x2 4x4 8x8 16x16 32x32 64x64 0, 4, 7, 8, 8, 0 }; -#else -const UChar g_dmm3IntraTabIdxBits[6] = -{ //2x2 4x4 8x8 16x16 32x32 64x64 - 0, 6, 9, 9, 9, 0 }; -#endif extern std::vector< std::vector > g_dmmWedgeLists; @@ -614,9 +609,5 @@ std::vector< std::vector< std::vector > > g_aauiWdgLstM3; -#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX Void initWedgeLists( Bool initNodeList ) -#else -Void initWedgeLists( Bool initRefinements ) -#endif { if( !g_dmmWedgeLists.empty() ) return; @@ -631,21 +622,15 @@ g_dmmWedgeRefLists.push_back( acWedgeRefList ); -#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX if( initNodeList ) { -#endif - // create WedgeNodeList - std::vector acWedgeNodeList; - for( UInt uiPos = 0; uiPos < acWedgeList.size(); uiPos++ ) - { - if( acWedgeList[uiPos].getIsCoarse() ) - { - TComWedgeNode cWedgeNode; - cWedgeNode.setPatternIdx( uiPos ); - -#if !LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX - if( initRefinements ) + // create WedgeNodeList + std::vector acWedgeNodeList; + for( UInt uiPos = 0; uiPos < acWedgeList.size(); uiPos++ ) + { + if( acWedgeList[uiPos].getIsCoarse() ) { -#endif + TComWedgeNode cWedgeNode; + cWedgeNode.setPatternIdx( uiPos ); + UInt uiRefPos = 0; for( Int iOffS = -1; iOffS <= 1; iOffS++ ) @@ -674,7 +659,7 @@ { if( iSx == (Int)acWedgeRefList[k].getStartX() && - iSy == (Int)acWedgeRefList[k].getStartY() && - iEx == (Int)acWedgeRefList[k].getEndX() && - iEy == (Int)acWedgeRefList[k].getEndY() ) + iSy == (Int)acWedgeRefList[k].getStartY() && + iEx == (Int)acWedgeRefList[k].getEndX() && + iEy == (Int)acWedgeRefList[k].getEndY() ) { if( acWedgeRefList[k].getRefIdx() != cWedgeNode.getPatternIdx() ) @@ -694,16 +679,10 @@ } } -#if !LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX + acWedgeNodeList.push_back( cWedgeNode ); } -#endif - acWedgeNodeList.push_back( cWedgeNode ); - } - } - g_dmmWedgeNodeLists.push_back( acWedgeNodeList ); -#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX - } -#endif - } - return; + } + g_dmmWedgeNodeLists.push_back( acWedgeNodeList ); + } + } } Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRom.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRom.h (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRom.h (revision 647) @@ -174,9 +174,5 @@ extern std::vector< std::vector< std::vector > > g_aauiWdgLstM3; -#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX Void initWedgeLists( Bool initNodeList = false ); -#else -Void initWedgeLists( Bool initRefinements = false ); -#endif Void createWedgeList( UInt uiWidth, UInt uiHeight, std::vector &racWedgeList, std::vector &racWedgeRefList, WedgeResolution eWedgeRes ); Void addWedgeletToList( TComWedgelet cWedgelet, std::vector &racWedgeList, std::vector &racWedgeRefList ); Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TypeDef.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TypeDef.h (revision 646) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TypeDef.h (revision 647) @@ -92,5 +92,8 @@ // QC_CU_NBDV_D0181 // SEC_DEFAULT_DV_D0112 - // MTK_DVMCP_FIX_E0172 1 // fix the mismatch between software and WD for DV derivation from DVMCP blocks, issue 2 in JCT3V-E0172 + // MTK_DVMCP_FIX_E0172 fix the mismatch between software and WD for DV derivation from DVMCP blocks, issue 2 in JCT3V-E0172 + // SEC_SIMPLIFIED_NBDV_E0142 Simplified NBDV, JCT3V-E0142 and JCT3V-E0190 + // MTK_NBDV_TN_FIX_E0172 fix the issue of DV derivation from the temporal neighboring blocks, issue 7 in JCT3V-E0172 + // MTK_TEXTURE_MRGCAND_BUGFIX_E0182 Bug fix for TEXTURE MERGING CANDIDATE , JCT3V-E0182 #define H_3D_ARP 1 // Advanced residual prediction (ARP), JCT3V-D0177 #define H_3D_IC 1 // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060 @@ -106,4 +109,6 @@ // MERL_C0152: Basic VSP // NBDV_DEFAULT_VIEWIDX_BUGFIX Bug fix for invalid default view index for NBDV + // NTT_DoNBDV_VECTOR_CLIP_E0141 disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209 + #endif @@ -149,7 +154,10 @@ // KWU_SDC_SIMPLE_DC_E0117 Simplified DC calculation for SDC // SCU_HS_DMM4_REMOVE_DIV_E0242 DMM4 Division Removal + // LGE_SDC_REMOVE_DC_E0158 Removal of DC mode from SDC + // LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX 1 Removal of overlap between DMM3 and DMM1 + #define H_3D_INTER_SDC 1 // INTER SDC, Inter simplified depth coding // LGE_INTER_SDC_E0156 Enable inter SDC for depth coding -#define H_3D_FCO_E0163 0 // Flexible coding order for 3D +#define H_3D_FCO 0 // Flexible coding order for 3D @@ -157,52 +165,24 @@ // OTHERS // MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170 // Progressive MV Compression, JCT3V-E0170 - -#define H_3D_REN_MAX_DEV_OUT 0 // Output maximal possible shift deviation - -///////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////// HTM-8.0 INTEGRATIONS ////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////// - -#define MTK_FAST_TEXTURE_ENCODING_E0173 1 // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173 - - -#if H_3D_NBDV -#define MTK_RVS_BUGFIX_E0172 1 // Bug fix for issues caused by reference view selection, JCT3V-E0172 -#define MTK_TEXTURE_MRGCAND_BUGFIX_E0182 1 // Bug fix for TEXTURE MERGING CANDIDATE , JCT3V-E0182 - -#if MTK_RVS_BUGFIX_E0172 -#define MTK_DIVMC_FIX_E0172 1 // fix the issue of derivation of disparity inter-view merge candidate, issue 5 in JCT3V-E0172 -#define MTK_NBDV_TN_FIX_E0172 1 // fix the issue of DV derivation from the temporal neighboring blocks, issue 7 in JCT3V-E0172 -#endif // MTK_RVS_BUGFIX_E0172 - -#if H_3D_NBDV_REF -#define NTT_DoNBDV_VECTOR_CLIP_E0141 1 // disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209 -#define SEC_SIMPLIFIED_NBDV_E0142 1 // Simplified NBDV, JCT3V-E0142 and JCT3V-E0190 -#endif -#endif // H_3D_NBDV - +#define H_3D_REN_MAX_DEV_OUT 0 // Output maximal possible shift deviation +#define H_3D_FAST_TEXTURE_ENCODING 1 // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173 + // MTK_FAST_TEXTURE_ENCODING_E0173 #if H_3D_DIM -#define SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX 1 // Fast DMM and RBC Mode Selection -#endif - -#if H_3D_FCO_E0163 -#define H_3D_FCO_VSP_DONBDV_E0163 1 // Adaptive depth reference for flexible coding order -#else -#define H_3D_FCO_VSP_DONBDV_E0163 0 // Adaptive depth reference for flexible coding order -#endif +#define H_3D_FAST_DEPTH_INTRA 1 // Fast DMM and RBC Mode Selection + // SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX +#endif + #endif // H_3D -///////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////// HTM-8.1 INTEGRATIONS ////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////// - -// Please put HTM-8.1 Integration defines here, when possible +// Rate Control +#define KWU_FIX_URQ 1 +#define KWU_RC_VIEWRC_E0227 0 ///< JCT3V-E0227, view-wise target bitrate allocation +#define KWU_RC_MADPRED_E0227 0 ///< JCT3V-E0227, inter-view MAD prediction /// FIXES #if H_MV -#define H_MV_FIX_LID_PIC_HASH_SEI_T40 1 // Fix wrong layer_id in decoded picture hash SEI -#define H_MV5 1 // Update to MV-HEVC 5 HLS +#define H_MV5 1 // Update to MV-HEVC 5 HLS #endif ///////////////////////////////////////////////////////////////////////////////////////// @@ -217,22 +197,12 @@ #define H_3D_VSO_RM_ASSERTIONS 0 // Output VSO assertions #define H_3D_VSO_SYNTH_DIST_OUT 0 // Output of synthesized view distortion instead of depth distortion in encoder output - #define H_3D_VSO_FIX 0 // This fix should be enabled after verification - -#endif -//// ****** Neighbouring block-based Disparity Vector ********* +#endif + +//// ****** neighbouring block-based disparity vector ********* #if H_3D_NBDV -#if SEC_SIMPLIFIED_NBDV_E0142 #define DVFROM_LEFT 0 #define DVFROM_ABOVE 1 #define IDV_CANDS 2 -#else -#define DVFROM_LEFTBELOW 0 -#define DVFROM_LEFT 1 -#define DVFROM_ABOVERIGHT 2 -#define DVFROM_ABOVE 3 -#define DVFROM_ABOVELEFT 4 -#define IDV_CANDS 5 -#endif #endif @@ -241,4 +211,5 @@ #define H_3D_ARP_WFNR 3 #endif + ///// ***** DEPTH INTRA MODES ********* #if H_3D_DIM @@ -250,12 +221,5 @@ // HHI_DEPTH_INTRA_SEARCH_RAU_C0160 // LG_ZEROINTRADEPTHRESI_A0087 -#if H_3D_DIM_SDC -#define LGE_SDC_REMOVE_DC_E0158 1 // Removal of DC mode from SDC -#endif -#if H_3D_DIM_DMM -#define LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX 1 // Removal of overlap between DMM3 and DMM1 -#endif -#endif - +#endif ///// ***** VIEW SYNTHESIS PREDICTION ********* #if H_3D_VSP @@ -270,10 +234,15 @@ ///// ***** ILLUMATION COMPENSATION ********* - - #if H_3D_IC -#define IC_REG_COST_SHIFT 7 -#define IC_CONST_SHIFT 5 -#define IC_SHIFT_DIFF 12 +#define IC_REG_COST_SHIFT 7 +#define IC_CONST_SHIFT 5 +#define IC_SHIFT_DIFF 12 +#endif + +///// ***** FCO ********* +#if H_3D_FCO +#define H_3D_FCO_VSP_DONBDV_E0163 1 // Adaptive depth reference for flexible coding order +#else +#define H_3D_FCO_VSP_DONBDV_E0163 0 // Adaptive depth reference for flexible coding order #endif @@ -302,22 +271,15 @@ #define M0036_RC_IMPROVEMENT 1 ///< JCTVC-M0036, improvement for R-lambda model based rate control #define TICKET_1090_FIX 1 -#define KWU_FIX_URQ 1 #if KWU_FIX_URQ - #if RATE_CONTROL_LAMBDA_DOMAIN #define RC_FIX 1 /// suggested fix for M0036 #define RATE_CONTROL_INTRA 1 ///< JCTVC-M0257, rate control for intra #endif - -#else - +#else #define RC_FIX 1 /// suggested fix for M0036 #define RATE_CONTROL_INTRA 1 ///< JCTVC-M0257, rate control for intra - -#endif - -#define KWU_RC_VIEWRC_E0227 0 ///< JCT3V-E0227, view-wise target bitrate allocation -#define KWU_RC_MADPRED_E0227 0 ///< JCT3V-E0227, inter-view MAD prediction +#endif + #define MAX_CPB_CNT 32 ///< Upper bound of (cpb_cnt_minus1 + 1)