Changeset 21 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComPattern.cpp


Ignore:
Timestamp:
15 Feb 2012, 19:05:04 (12 years ago)
Author:
hschwarz
Message:

updated with HHI branch (0.2-HHI)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComPattern.cpp

    r5 r21  
    147147  if ( iComp == 0 )
    148148  {
     149#if DEPTH_MAP_GENERATION
     150    m_iPatternStride  = ( bPrdDepthMap ? pcCU->getPic()->getPredDepthMap()->getStride() : pcCU->getPic()->getStride() );
     151#else
    149152    m_iPatternStride  = pcCU->getPic()->getStride();
     153#endif
    150154    m_piPatternOrigin = pcPic->getLumaAddr(pcCU->getAddr(), uiAbsZorderIdx) - m_iOffsetAbove * m_iPatternStride - m_iOffsetLeft;
    151155  }
    152156  else
    153157  {
     158#if DEPTH_MAP_GENERATION
     159    m_iPatternStride  = ( bPrdDepthMap ? pcCU->getPic()->getPredDepthMap()->getCStride() : pcCU->getPic()->getCStride() );
     160#else
    154161    m_iPatternStride = pcCU->getPic()->getCStride();
     162#endif
    155163    if ( iComp == 1 )
    156164      m_piPatternOrigin = pcPic->getCbAddr(pcCU->getAddr(), uiAbsZorderIdx) - m_iOffsetAbove * m_iPatternStride - m_iOffsetLeft;
     
    242250Void TComPattern::initAdiPattern( TComDataCU* pcCU, UInt uiZorderIdxInPart, UInt uiPartDepth, Int* piAdiBuf, Int iOrgBufStride, Int iOrgBufHeight, Bool& bAbove, Bool& bLeft
    243251#if DEPTH_MAP_GENERATION
    244                                 , Bool bPrdDepthMap 
     252                                , Bool bPrdDepthMap, UInt uiSubSampExpX, UInt uiSubSampExpY
    245253#endif
    246254                                )
     
    254262  UInt  uiWidth;
    255263  UInt  uiHeight;
     264
     265#if DEPTH_MAP_GENERATION
     266  Int   iPicStride = ( bPrdDepthMap ? pcCU->getPic()->getPredDepthMap()->getStride() : pcCU->getPic()->getStride() );
     267#else
    256268  Int   iPicStride = pcCU->getPic()->getStride();
     269#endif
     270
    257271  Int   iCuAddr;
    258272#if REFERENCE_SAMPLE_PADDING
     
    375389#endif // REFERENCE_SAMPLE_PADDING
    376390 
     391#if DEPTH_MAP_GENERATION
     392  if ( bPrdDepthMap )
     393  {
     394    uiWidth  = ( uiCuWidth2  >> uiSubSampExpX ) + 1;
     395    uiHeight = ( uiCuHeight2 >> uiSubSampExpY ) + 1;
     396  }
     397  else
     398  {
    377399  uiWidth=uiCuWidth2+1;
    378400  uiHeight=uiCuHeight2+1;
     401  }
     402#else
     403  uiWidth=uiCuWidth2+1;
     404  uiHeight=uiCuHeight2+1;
     405#endif
    379406 
    380407  if (((uiWidth<<2)>iOrgBufStride)||((uiHeight<<2)>iOrgBufHeight))
     
    398425#if REFERENCE_SAMPLE_PADDING
    399426#if DEPTH_MAP_GENERATION
     427  if ( bPrdDepthMap )
     428    fillReferenceSamples ( pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitSize >> uiSubSampExpX, iNumUnitsInCu, iTotalUnits, uiCuWidth >> uiSubSampExpX, uiCuHeight >> uiSubSampExpY, uiWidth, uiHeight, iPicStride, bPrdDepthMap );
     429  else
    400430  fillReferenceSamples ( pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitSize, iNumUnitsInCu, iTotalUnits, uiCuWidth, uiCuHeight, uiWidth, uiHeight, iPicStride, bPrdDepthMap );
    401431#else
Note: See TracChangeset for help on using the changeset viewer.