Changeset 423 in 3DVCSoftware
- Timestamp:
- 20 May 2013, 02:48:30 (11 years ago)
- Location:
- branches/HTM-6.2-dev1-LG/source/Lib/TLibCommon
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-6.2-dev1-LG/source/Lib/TLibCommon/TComDataCU.cpp
r408 r423 3820 3820 #endif // H3D_IVMP 3821 3821 3822 #if MERL_VSP_COMPENSATION_C01523823 //===== vsp 0 =====3824 #if LGE_VSP_INHERIT_D00923825 if ( !xAddVspMergeCand(0, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )3826 #else3827 if( iCount < 4 + extraMergeCand )3828 if ( !xAddVspMergeCand(0, 1, bVspMvZeroDone, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )3829 #endif3830 return;3831 #endif3832 3833 3822 //left 3834 3823 UInt uiLeftPartIdx = 0; … … 3919 3908 } 3920 3909 3921 #if MERL_VSP_COMPENSATION_C01523922 //===== vsp 1 =====3923 #if LGE_VSP_INHERIT_D00923924 if ( !xAddVspMergeCand(1, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )3925 #else3926 if( iCount < 4 + extraMergeCand )3927 if ( !xAddVspMergeCand(1, 1, bVspMvZeroDone, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )3928 #endif3929 return;3930 #endif3931 3932 3910 // above 3933 3911 UInt uiAbovePartIdx = 0; … … 4012 3990 #endif 4013 3991 } 4014 4015 #if MERL_VSP_COMPENSATION_C01524016 //===== vsp 2 =====4017 #if LGE_VSP_INHERIT_D00924018 if ( !xAddVspMergeCand(2, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )4019 #else4020 if( iCount < 4 + extraMergeCand )4021 if ( !xAddVspMergeCand(2, 1, bVspMvZeroDone, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )4022 #endif4023 return;4024 #endif4025 3992 4026 3993 // above right … … 4213 4180 } 4214 4181 #endif 4215 #endif4216 4217 #if MERL_VSP_COMPENSATION_C01524218 //===== vsp 4 =====4219 if( iCount < 4 + extraMergeCand )4220 #if LGE_VSP_INHERIT_D00924221 if ( !xAddVspMergeCand(4, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )4222 #else4223 if ( !xAddVspMergeCand(4, 1, bVspMvZeroDone, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )4224 #endif4225 return;4226 4182 #endif 4227 4183 -
branches/HTM-6.2-dev1-LG/source/Lib/TLibCommon/TypeDef.h
r408 r423 162 162 #define FIX_APPENCTOP_T_ONLY 1 // For Texture-only coding 163 163 #define LGE_ROUND_OFFSET_D0135 1 // JCT3V-D0135 Rounding offset 164 #define LGE_SAO_MIGRATION_D0091 1164 #define LGE_SAO_MIGRATION_D0091 0 165 165 166 166 #if LGE_SAO_MIGRATION_D0091 … … 201 201 202 202 #define MTK_D0156 1 203 #define LGE_VSP_INHERIT_D0092 1203 #define LGE_VSP_INHERIT_D0092 0 204 204 /* 205 205 * Two macros are used to configure combinations of JCT3V-C0152 and JCT3V-C0131
Note: See TracChangeset for help on using the changeset viewer.