- Timestamp:
- 2 May 2013, 05:51:06 (12 years ago)
- Location:
- branches/SHM-2.0-dev/source/Lib/TLibCommon
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-2.0-dev/source/Lib/TLibCommon/TComDataCU.cpp
r134 r136 2671 2671 #endif 2672 2672 Bool isAvailableB0 = pcCUAboveRight && 2673 #if SVC_MVP 2673 #if SVC_MVP && !IL_MRG_SIMPLIFIED_PRUNING 2674 2674 ( !pcColCU || pcColCU->isIntra( uiAbsPartAddrBase ) || !pcCUAboveRight->hasEqualMotion( uiAboveRightPartIdx, puhInterDirNeighbours[0], &pcMvFieldNeighbours[0] )) && 2675 2675 #endif … … 2715 2715 Bool isAvailableA0 = pcCULeftBottom && 2716 2716 pcCULeftBottom->isDiffMER(xP-1, yP+nPSH, xP, yP) && 2717 #if SVC_MVP 2717 #if SVC_MVP && !IL_MRG_SIMPLIFIED_PRUNING 2718 2718 ( !pcColCU || pcColCU->isIntra( uiAbsPartAddrBase ) || !pcCULeftBottom->hasEqualMotion( uiLeftBottomPartIdx, puhInterDirNeighbours[0], &pcMvFieldNeighbours[0])) && 2719 2719 #endif … … 2759 2759 Bool isAvailableB2 = pcCUAboveLeft && 2760 2760 pcCUAboveLeft->isDiffMER(xP-1, yP-1, xP, yP) && 2761 #if SVC_MVP 2761 #if SVC_MVP && !IL_MRG_SIMPLIFIED_PRUNING 2762 2762 ( !pcColCU || pcColCU->isIntra( uiAbsPartAddrBase ) || !pcCUAboveLeft->hasEqualMotion( uiAboveLeftPartIdx, puhInterDirNeighbours[0], &pcMvFieldNeighbours[0] )) && 2763 2763 #endif -
branches/SHM-2.0-dev/source/Lib/TLibCommon/TypeDef.h
r134 r136 99 99 #define INTRA_BL_DST4x4 1 ///< L0067/L0204: DST4x4 for Intra BL 100 100 #define NO_RESIDUAL_FLAG_FOR_BLPRED 1 ///< L0437: Root cbf for Intra_BL 101 #define IL_MRG_SIMPLIFIED_PRUNING 1 ///< M0124: simplified pruning, Only the left and above candidates are checked with BL-C candidate for redundancy removal 101 102 102 103 // Hooks
Note: See TracChangeset for help on using the changeset viewer.