Ticket #234: tilesBelowLeftNeighbourBugfix.patch

source/Lib/TLibCommon/TComDataCU.cpp

@@ -2024 +2024 @@
     return m_pcCULeft;
   }
   
+#if TILES
+  TComDataCU*   m_pcCUBelowLeft;
+  if ( m_pcCULeft && ( (getAddr()/m_pcPic->getPicSym()->getFrameWidthInCU()) < (m_pcPic->getPicSym()->getFrameHeightInCU()-1) ) )
+  {
+    m_pcCUBelowLeft = m_pcPic->getCU( getAddr() + m_pcPic->getPicSym()->getFrameWidthInCU() - 1 );
+  }
+  else
+  {
+    m_pcCUBelowLeft = NULL;
+  }
+
+  uiBLPartUnitIdx = g_auiRasterToZscan[uiNumPartInCUWidth-1];
+  if (
+       !RasterAddress::isZeroCol( uiAbsPartIdxLB, uiNumPartInCUWidth ) || 
+       (bEnforceSliceRestriction && (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() ||
+       (m_pcCUBelowLeft==NULL || m_pcCUBelowLeft->getSlice()==NULL || 
+       (m_pcPic->getPicSym()->getInverseCUOrderMap( m_pcCUBelowLeft->getAddr() ) > m_pcPic->getPicSym()->getInverseCUOrderMap(getAddr())) ||
+       (m_pcCUBelowLeft->getSCUAddr()+uiBLPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx))
+       )))||
+       (bEnforceEntropySliceRestriction && (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() ||
+       (m_pcCUBelowLeft==NULL || m_pcCUBelowLeft->getSlice()==NULL ||
+       (m_pcPic->getPicSym()->getInverseCUOrderMap( m_pcCUBelowLeft->getAddr() ) > m_pcPic->getPicSym()->getInverseCUOrderMap(getAddr())) ||
+       (m_pcCUBelowLeft ->getSCUAddr()+uiBLPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx))
+       )))
+     )
+  {
+    uiBLPartUnitIdx = MAX_UINT;
+    return NULL;
+  }
+  else
+  {
+    return m_pcCUBelowLeft;
+  }
+#else
   uiBLPartUnitIdx = MAX_UINT;
   return NULL;
+#endif
 }
 
 TComDataCU* TComDataCU::getPUBelowLeftAdi(UInt& uiBLPartUnitIdx, UInt uiPuHeight,  UInt uiCurrPartUnitIdx, UInt uiPartUnitOffset, Bool bEnforceSliceRestriction, Bool bEnforceEntropySliceRestriction )
@@ -2115 +2150 @@
     return m_pcCULeft;
   }
   
+#if TILES
+  TComDataCU*   m_pcCUBelowLeft;
+  if ( m_pcCULeft && ( (getAddr()/m_pcPic->getPicSym()->getFrameWidthInCU()) < (m_pcPic->getPicSym()->getFrameHeightInCU()-1) ) )
+  {
+    m_pcCUBelowLeft = m_pcPic->getCU( getAddr() + m_pcPic->getPicSym()->getFrameWidthInCU() - 1 );
+  }
+  else
+  {
+    m_pcCUBelowLeft = NULL;
+  }
+  uiBLPartUnitIdx = uiBLPartUnitIdx = g_auiRasterToZscan[uiAbsPartIdxLB + uiPartUnitOffset * uiNumPartInCUWidth - 1 - m_pcPic->getNumPartInHeight()*m_pcPic->getNumPartInWidth()
+      + uiNumPartInCUWidth];//g_auiRasterToZscan[uiNumPartInCUWidth-1];
+  if (
+       !RasterAddress::isZeroCol( uiAbsPartIdxLB, uiNumPartInCUWidth ) ||
+       (bEnforceSliceRestriction && (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() ||
+       (m_pcCUBelowLeft==NULL || m_pcCUBelowLeft->getSlice()==NULL || 
+       (m_pcPic->getPicSym()->getInverseCUOrderMap( m_pcCUBelowLeft->getAddr() ) > m_pcPic->getPicSym()->getInverseCUOrderMap(getAddr())) ||
+       (m_pcCUBelowLeft->getSCUAddr()+uiBLPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx))
+       )))||
+       (bEnforceEntropySliceRestriction && (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() ||
+       (m_pcCUBelowLeft==NULL || m_pcCUBelowLeft->getSlice()==NULL || 
+       (m_pcPic->getPicSym()->getInverseCUOrderMap( m_pcCUBelowLeft->getAddr() ) > m_pcPic->getPicSym()->getInverseCUOrderMap(getAddr())) ||
+       (m_pcCUBelowLeft ->getSCUAddr()+uiBLPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx))
+       )))
+     )
+  {
+    uiBLPartUnitIdx = MAX_UINT;
+    return NULL;
+  }
+  else
+  {
+    return m_pcCUBelowLeft;
+  }
+#else
   uiBLPartUnitIdx = MAX_UINT;
   return NULL;
+#endif
 }
 
 TComDataCU* TComDataCU::getPUAboveRightAdi(UInt&  uiARPartUnitIdx, UInt uiPuWidth, UInt uiCurrPartUnitIdx, UInt uiPartUnitOffset, Bool bEnforceSliceRestriction, Bool bEnforceEntropySliceRestriction )