Ticket #1474: IBC_TILES_fix.patch

source/Lib/TLibEncoder/TEncSearch.cpp

@@ -6881 +6881 @@
     return false;
   }
 
-  TComSlice *pcSlice = pcCU->getSlice();
-  if( pcSlice->getSliceMode() )
+  // check same slice and tile
+  TComPicSym *pcSym = pcCU->getPic()->getPicSym();
+  TComDataCU* tlCtu = pcSym->getCtu(((xPos + xBv - interpolationSamplesX) >> ctuSizeLog2) + ((yPos + yBv - interpolationSamplesY) >> ctuSizeLog2) * pcSym->getFrameWidthInCtus());
+  TComDataCU* rbCtu = pcSym->getCtu((refRightX >> ctuSizeLog2) + (refBottomY >> ctuSizeLog2) * pcSym->getFrameWidthInCtus());
+  if (!pcCU->CUIsFromSameSliceAndTile(tlCtu) || !pcCU->CUIsFromSameSliceAndTile(rbCtu))
   {
-    TComPicSym *pcSym = pcCU->getPic()->getPicSym();
-    Int      ctuX = (xPos + xBv) / ctuSize;
-    Int      ctuY = (yPos + yBv) / ctuSize;
-    UInt   refCtu = ctuX + pcSym->getFrameWidthInCtus()*ctuY;
-    UInt startCtu = /*pcCU->getSlice()->getSliceSegmentCurStartCtuTsAddr();*/ pcSym->getCtuTsToRsAddrMap( pcCU->getSlice()->getSliceSegmentCurStartCtuTsAddr() );
-    if (refCtu < startCtu) return false;
+    return false;
   }
 
   if ( refBottomY>>ctuSizeLog2 < yPos>>ctuSizeLog2 )