Changeset 328 in 3DVCSoftware for branches/HTM-6.1-Cleanup


Ignore:
Timestamp:
17 Apr 2013, 23:58:51 (11 years ago)
Author:
tech
Message:

Fixes to NBDV cleanup.

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  
    49734973#if H3D_NBDV
    49744974
    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 
     4975Bool TComDataCU::xCheckSpatialNBDV( TComDataCU* pcTmpCU, UInt uiIdx, UInt uiPartIdx, UInt uiPartAddr, DisInfo* pNbDvInfo, Bool bSearchForMvpDv, McpDisInfo* paMvpDvInfo, UInt uiMvpDvPos, Bool bDepthRefine )
     4976{
    49794977  if( pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ) )
    49804978  {
     
    52045202
    52055203  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 ) )
    52075205    return;
    52085206
     
    52265224  {
    52275225    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 ) )
    52295227      return;
    52305228  }
     
    52445242  {
    52455243    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 ) )
    52475245      return;
    52485246  }
     
    52635261  {
    52645262    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 ) )
    52665264      return;
    52675265  }
     
    52835281  {
    52845282    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 ) )
    52865284      return;
    52875285  }
     
    53615359#endif
    53625360              );
     5361
    53635362#if FCO_DVP_REFINE_C0132_C0170
    53645363      if(getPic()->getDepthCoded() )
     
    71837182  else
    71847183#endif
     7184
    71857185  getDisMvpCandNBDV( 0, 0,  &cDisInfo, false ); 
     7186
    71867187  if( cDisInfo.iN == 0)
    71877188  {
  • branches/HTM-6.1-Cleanup/source/Lib/TLibCommon/TComDataCU.h

    r325 r328  
    288288#if H3D_NBDV
    289289  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 );
    291291  Bool          xGetColDisMV( RefPicList eRefPicList, Int refidx, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv, Int & iTargetViewIdx, Int & iStartViewIdx );
    292292#endif
Note: See TracChangeset for help on using the changeset viewer.