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

Timestamp:

15 Feb 2012, 19:05:04 (13 years ago)

Author:

hschwarz

Message:

updated with HHI branch (0.2-HHI)

File:

• trunk/source/Lib/TLibCommon/TComPattern.cpp (modified) (5 diffs)

trunk/source/Lib/TLibCommon/TComPattern.cpp

@@ -147 +147 @@
   if ( iComp == 0 )
   {
+#if DEPTH_MAP_GENERATION
+    m_iPatternStride  = ( bPrdDepthMap ? pcCU->getPic()->getPredDepthMap()->getStride() : pcCU->getPic()->getStride() );
+#else
     m_iPatternStride  = pcCU->getPic()->getStride();
+#endif
     m_piPatternOrigin = pcPic->getLumaAddr(pcCU->getAddr(), uiAbsZorderIdx) - m_iOffsetAbove * m_iPatternStride - m_iOffsetLeft;
   }
   else
   {
+#if DEPTH_MAP_GENERATION
+    m_iPatternStride  = ( bPrdDepthMap ? pcCU->getPic()->getPredDepthMap()->getCStride() : pcCU->getPic()->getCStride() );
+#else
     m_iPatternStride = pcCU->getPic()->getCStride();
+#endif
     if ( iComp == 1 )
       m_piPatternOrigin = pcPic->getCbAddr(pcCU->getAddr(), uiAbsZorderIdx) - m_iOffsetAbove * m_iPatternStride - m_iOffsetLeft;
@@ -242 +250 @@
 Void TComPattern::initAdiPattern( TComDataCU* pcCU, UInt uiZorderIdxInPart, UInt uiPartDepth, Int* piAdiBuf, Int iOrgBufStride, Int iOrgBufHeight, Bool& bAbove, Bool& bLeft
 #if DEPTH_MAP_GENERATION
-                                , Bool bPrdDepthMap 
+                                , Bool bPrdDepthMap, UInt uiSubSampExpX, UInt uiSubSampExpY
 #endif
                                 )
@@ -254 +262 @@
   UInt  uiWidth;
   UInt  uiHeight;
+
+#if DEPTH_MAP_GENERATION
+  Int   iPicStride = ( bPrdDepthMap ? pcCU->getPic()->getPredDepthMap()->getStride() : pcCU->getPic()->getStride() );
+#else
   Int   iPicStride = pcCU->getPic()->getStride();
+#endif
+
   Int   iCuAddr;
 #if REFERENCE_SAMPLE_PADDING
@@ -375 +389 @@
 #endif // REFERENCE_SAMPLE_PADDING
   
+#if DEPTH_MAP_GENERATION
+  if ( bPrdDepthMap )
+  {
+    uiWidth  = ( uiCuWidth2  >> uiSubSampExpX ) + 1;
+    uiHeight = ( uiCuHeight2 >> uiSubSampExpY ) + 1;
+  }
+  else
+  {
   uiWidth=uiCuWidth2+1;
   uiHeight=uiCuHeight2+1;
+  }
+#else
+  uiWidth=uiCuWidth2+1;
+  uiHeight=uiCuHeight2+1;
+#endif
   
   if (((uiWidth<<2)>iOrgBufStride)||((uiHeight<<2)>iOrgBufHeight))
@@ -398 +425 @@
 #if REFERENCE_SAMPLE_PADDING
 #if DEPTH_MAP_GENERATION
+  if ( bPrdDepthMap )
+    fillReferenceSamples ( pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitSize >> uiSubSampExpX, iNumUnitsInCu, iTotalUnits, uiCuWidth >> uiSubSampExpX, uiCuHeight >> uiSubSampExpY, uiWidth, uiHeight, iPicStride, bPrdDepthMap );
+  else
   fillReferenceSamples ( pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitSize, iNumUnitsInCu, iTotalUnits, uiCuWidth, uiCuHeight, uiWidth, uiHeight, iPicStride, bPrdDepthMap );
 #else