Changeset 950 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSearch.cpp
- Timestamp:
- 25 Apr 2014, 12:38:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/Lib/TLibEncoder/TEncSearch.cpp
r884 r950 1146 1146 for( UInt uiX = 0; uiX < uiWidth; uiX++ ) 1147 1147 { 1148 #if H_3D_DIM 1148 #if H_3D_DIM && !SEC_NO_RESI_DLT_H0105 1149 1149 if( (isDimMode( uiLumaPredMode ) || uiLumaPredMode == HOR_IDX || uiLumaPredMode == VER_IDX || uiLumaPredMode == DC_IDX) && pcCU->getSlice()->getIsDepth() && pcCU->getSlice()->getPPS()->getDLT()->getUseDLTFlag(pcCU->getSlice()->getLayerIdInVps()) ) 1150 1150 { … … 1221 1221 for( UInt uiX = 0; uiX < uiWidth; uiX++ ) 1222 1222 { 1223 #if H_3D_DIM 1223 #if H_3D_DIM && !SEC_NO_RESI_DLT_H0105 1224 1224 if( (isDimMode( uiLumaPredMode ) || uiLumaPredMode == HOR_IDX || uiLumaPredMode == VER_IDX || uiLumaPredMode == DC_IDX) && pcCU->getSlice()->getIsDepth() && pcCU->getSlice()->getPPS()->getDLT()->getUseDLTFlag(pcCU->getSlice()->getLayerIdInVps()) ) 1225 1225 { … … 1989 1989 // get DC prediction for each segment 1990 1990 Pel apDCPredValues[2]; 1991 #if HS_DMM_SDC_PREDICTOR_UNIFY_H0108 1992 if ( getDimType( uiLumaPredMode ) == DMM1_IDX || getDimType( uiLumaPredMode ) == DMM4_IDX ) 1993 { 1994 apDCPredValues[0] = pcCU->getDmmPredictor( 0 ); 1995 apDCPredValues[1] = pcCU->getDmmPredictor( 1 ); 1996 } 1997 else 1998 #endif 1991 1999 analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride, uiLumaPredMode ); 1992 2000 … … 3666 3674 pcCU->setInterDirSubParts(pDBBPTmpData->auhInterDir[0], 0, 0, pcCU->getDepth(0)); // interprets depth relative to LCU level 3667 3675 3676 #if !RWTH_DBBP_NO_SPU_H0057 3668 3677 pcCU->setVSPFlagSubParts(pDBBPTmpData->ahVSPFlag[0], 0, 0, pcCU->getDepth(0)); 3669 3678 pcCU->setDvInfoSubParts(pDBBPTmpData->acDvInfo[0], 0, 0, pcCU->getDepth(0)); 3679 #endif 3670 3680 3671 3681 for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ ) … … 3697 3707 pcCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours 3698 3708 #if H_3D_VSP 3709 #if !ETRIKHU_CLEANUP_H0083 3699 3710 , vspFlag 3711 #endif 3700 3712 , inheritedVSPDisInfo 3701 3713 #endif 3702 3714 #if H_3D_SPIVMP 3703 , pbSPIVMPFlag, pcMvFieldSP, puhInterDirSP 3715 #if !ETRIKHU_CLEANUP_H0083_MISSING 3716 , pbSPIVMPFlag 3717 #endif 3718 , pcMvFieldSP, puhInterDirSP 3719 #endif 3720 , numValidMergeCand 3721 ); 3722 3723 #if ETRIKHU_CLEANUP_H0083 3724 pcCU->buildMCL( cMvFieldNeighbours,uhInterDirNeighbours 3725 #if H_3D_VSP 3726 , vspFlag 3727 #endif 3728 #if H_3D_SPIVMP 3729 , pbSPIVMPFlag 3704 3730 #endif 3705 3731 , numValidMergeCand 3706 3732 ); 3733 #endif 3707 3734 #else 3708 3735 pcCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand ); … … 3718 3745 pcCU->xGetInterMergeCandidates( uiAbsPartIdx, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours 3719 3746 #if H_3D_VSP 3747 #if !ETRIKHU_CLEANUP_H0083 3720 3748 , vspFlag 3749 #endif 3721 3750 , inheritedVSPDisInfo 3722 3751 #endif 3723 3752 #if H_3D_SPIVMP 3724 , pbSPIVMPFlag, pcMvFieldSP, puhInterDirSP 3753 #if !ETRIKHU_CLEANUP_H0083_MISSING 3754 , pbSPIVMPFlag 3755 #endif 3756 , pcMvFieldSP, puhInterDirSP 3757 #endif 3758 , numValidMergeCand 3759 ); 3760 3761 #if ETRIKHU_CLEANUP_H0083 3762 pcCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours 3763 #if H_3D_VSP 3764 , vspFlag 3765 #endif 3766 #if H_3D_SPIVMP 3767 , pbSPIVMPFlag 3725 3768 #endif 3726 3769 , numValidMergeCand 3727 3770 ); 3771 #endif 3728 3772 #else 3729 3773 pcCU->getInterMergeCandidates( uiAbsPartIdx, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand
Note: See TracChangeset for help on using the changeset viewer.