Changeset 328 in 3DVCSoftware for branches/HTM-6.1-Cleanup/source
- Timestamp:
- 17 Apr 2013, 23:58:51 (12 years ago)
- Location:
- branches/HTM-6.1-Cleanup/source/Lib/TLibCommon
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-6.1-Cleanup/source/Lib/TLibCommon/TComDataCU.cpp
r327 r328 4973 4973 #if H3D_NBDV 4974 4974 4975 Bool TComDataCU::xCheckSpatialNBDV( TComDataCU* pcTmpCU, UInt uiIdx, UInt uiPartIdx, UInt uiPartAddr, DisInfo* pNbDvInfo, Bool bSearchForMvpDv, McpDisInfo* paMvpDvInfo, UInt uiMvpDvPos ) 4976 { 4977 Bool bDepthRefine = true; 4978 4975 Bool TComDataCU::xCheckSpatialNBDV( TComDataCU* pcTmpCU, UInt uiIdx, UInt uiPartIdx, UInt uiPartAddr, DisInfo* pNbDvInfo, Bool bSearchForMvpDv, McpDisInfo* paMvpDvInfo, UInt uiMvpDvPos, Bool bDepthRefine ) 4976 { 4979 4977 if( pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ) ) 4980 4978 { … … 5204 5202 5205 5203 bCheckMcpDv = true; 5206 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_LEFT ) )5204 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_LEFT, bDepthRefine ) ) 5207 5205 return; 5208 5206 … … 5226 5224 { 5227 5225 bCheckMcpDv = ( ( getAddr() - pcTmpCU->getAddr() ) == 0); 5228 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_ABOVE ) )5226 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_ABOVE, bDepthRefine ) ) 5229 5227 return; 5230 5228 } … … 5244 5242 { 5245 5243 bCheckMcpDv = ( ( getAddr() - pcTmpCU->getAddr() ) == 0); 5246 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_ABOVERIGHT ) )5244 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_ABOVERIGHT, bDepthRefine ) ) 5247 5245 return; 5248 5246 } … … 5263 5261 { 5264 5262 bCheckMcpDv = true; 5265 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_LEFTBELOW ) )5263 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_LEFTBELOW, bDepthRefine ) ) 5266 5264 return; 5267 5265 } … … 5283 5281 { 5284 5282 bCheckMcpDv = (( getAddr() - pcTmpCU->getAddr() ) <= 1); 5285 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_ABOVELEFT ) )5283 if ( xCheckSpatialNBDV( pcTmpCU, uiIdx, uiPartIdx, uiPartAddr, pDInfo, bCheckMcpDv, &cMvpDvInfo, DVFROM_ABOVELEFT, bDepthRefine ) ) 5286 5284 return; 5287 5285 } … … 5361 5359 #endif 5362 5360 ); 5361 5363 5362 #if FCO_DVP_REFINE_C0132_C0170 5364 5363 if(getPic()->getDepthCoded() ) … … 7183 7182 else 7184 7183 #endif 7184 7185 7185 getDisMvpCandNBDV( 0, 0, &cDisInfo, false ); 7186 7186 7187 if( cDisInfo.iN == 0) 7187 7188 { -
branches/HTM-6.1-Cleanup/source/Lib/TLibCommon/TComDataCU.h
r325 r328 288 288 #if H3D_NBDV 289 289 Void xDeriveRightBottomNbIdx( PartSize eCUMode, UInt uiPartIdx, Int &uiLCUIdxRBNb, Int &uiPartIdxRBNb ); 290 Bool xCheckSpatialNBDV( TComDataCU* pcTmpCU, UInt uiIdx, UInt uiPartIdx, UInt uiPartAddr, DisInfo* pNbDvInfo, Bool bSearchForMvpDv, McpDisInfo* paMvpDvInfo, UInt uiMvpDvPos );290 Bool xCheckSpatialNBDV( TComDataCU* pcTmpCU, UInt uiIdx, UInt uiPartIdx, UInt uiPartAddr, DisInfo* pNbDvInfo, Bool bSearchForMvpDv, McpDisInfo* paMvpDvInfo, UInt uiMvpDvPos, Bool bDepthRefine ); 291 291 Bool xGetColDisMV( RefPicList eRefPicList, Int refidx, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv, Int & iTargetViewIdx, Int & iStartViewIdx ); 292 292 #endif
Note: See TracChangeset for help on using the changeset viewer.