Ticket #1378: slice_bugfix.diff

../source/Lib/TLibCommon/TypeDef.h

@@ -41 +41 @@
 #include <vector>
 #include <cstdlib>
 
+#define IBC_SLICE_BUGFIX                    1 // Don't let IBC use pixels outside of slice:  1=MTK  2=Canon
+#define IBC_VALIDATE_SLICES                 1 // Print at decoder when IBC reaches outside of current slice
+
 //! \ingroup TLibCommon
 //! \{
 

../source/Lib/TLibDecoder/TDecSbac.cpp

@@ -1241 +1241 @@
   mvy = MvPred[uiMvpIdx].getVer() + pcCU->getCUMvField(REF_PIC_LIST_INTRABC)->getMvd(uiAbsPartIdx).getVer();
 
   const TComMv cMv(mvx, mvy );
+#if IBC_VALIDATE_SLICES
+  UInt raster = g_auiZscanToRaster[uiAbsPartIdx];
+  TComPicSym *pcSym = pcCU->getPic()->getPicSym();
+  Int ctuX = (pcCU->getCUPelX() + g_auiRasterToPelX[raster] + mvx) / g_uiMaxCUWidth;
+  Int ctuY = (pcCU->getCUPelY() + g_auiRasterToPelY[raster] + mvy) / g_uiMaxCUHeight;
+  UInt ctuAddr = ctuX + ctuY*pcSym->getFrameWidthInCtus();
+  if (pcSym->getCtu(ctuAddr)->getSlice()->getSliceIdx() != pcCU->getSlice()->getSliceIdx())
+  {
+    printf("BV (%i,%i) for PU%u in CU %u,%u+%u, slice %u points to CTU %u, slice %u\n",
+           mvx, mvy, uiPartIdx, pcCU->getCtuRsAddr(), pcCU->getZorderIdxInCtu(), uiAbsPartIdx,
+           pcCU->getSlice()->getSliceIdx(), ctuAddr, pcSym->getCtu(ctuAddr)->getSlice()->getSliceIdx());
+  }
+#endif
 
   pcCU->getCUMvField( REF_PIC_LIST_INTRABC )->setAllMv( cMv, pcCU->getPartitionSize( uiAbsPartIdx ), uiAbsPartIdx, uiDepth, uiPartIdx );
   if( pcCU->getLastIntraBCMv() != cMv)

../source/Lib/TLibEncoder/TEncSearch.cpp

@@ -6923 +6923 @@
   const UInt uiNonHashSearchWidth = pcCU->getIntraBCSearchAreaWidth( m_pcEncCfg->getIntraBCNonHashSearchWidthInCTUs() );
   const UInt uiCtuPelX            = (cuPelX / uiMaxCuWidth) * uiMaxCuWidth;
   const UInt uiCtuPelY            = (cuPelY / uiMaxCuHeight) * uiMaxCuHeight;
+#if IBC_SLICE_BUGFIX
+  const ChromaFormat format = pcCU->getPic()->getChromaFormat();
+  const Int        iRelCUPelX = cuPelX % uiMaxCuWidth;
+  const Int        iRelCUPelY = cuPelY % uiMaxCuHeight;
+  const Int chromaROIWidthInPixels = (((format == CHROMA_420) || (format == CHROMA_422)) && (iRoiWidth == 4) && ((iRelCUPelX & 0x4) != 0)) ? (iRoiWidth * 2) : iRoiWidth;
+  const Int chromaROIHeightInPixels = (((format == CHROMA_420)) && (iRoiHeight == 4) && ((iRelCUPelY & 0x4) != 0)) ? (iRoiHeight * 2) : iRoiHeight;
+  const Int chromaROIStartXInPixels = iRelCUPelX + iRoiWidth - chromaROIWidthInPixels;
+  const Int chromaROIStartYInPixels = iRelCUPelY + iRoiHeight - chromaROIHeightInPixels;
+#endif
 
   Distortion  uiSad;
 
@@ -6951 +6960 @@
         continue;
       }
     }
+#if IBC_SLICE_BUGFIX
+    if (!isValidIntraBCSearchArea(pcCU, 0, iTempX - cuPelX, chromaROIStartXInPixels, iTempY - cuPelY, chromaROIStartYInPixels, chromaROIWidthInPixels, chromaROIHeightInPixels, 0))
+    {
+      HashLinklist = HashLinklist->next;
+      continue;
+    }
+#endif
 
 #if SCM_S0220_IBC_PRED_CONSTRAINT
      Int uiRefCuX   = (iTempX + iRoiWidth  - 1)/uiMaxCuWidth;

../source/Lib/TLibEncoder/TEncSearch.h

@@ -380 +380 @@
       return false;
     }
 
+#if IBC_SLICE_BUGFIX == 1
+    const Int uiPicWidthinCtu = pcCU->getPic()->getFrameWidthInCtus();
+    Int refPelX = cuPelX + predX;
+    Int refPelY = cuPelY + predY;
+    Int uiRefCtuX = refPelX / uiMaxCuWidth;
+    Int uiRefCtuY = refPelY / uiMaxCuHeight;
+    Int refCtuAddr = uiPicWidthinCtu * uiRefCtuY + uiRefCtuX;
+    
+    if (refCtuAddr < 0 || refCtuAddr >= pcCU->getPic()->getFrameWidthInCtus() || pcCU->getPic()->getCtu(refCtuAddr)->getSlice() == NULL || !pcCU->CUIsFromSameSliceAndTile(pcCU->getPic()->getCtu(refCtuAddr)))
+    {
+      return false;
+    }
+    
+    Int refPelBRX        = cuPelX + predX + roiWidth  - 1;
+    Int refPelBRY        = cuPelY + predY + roiHeight - 1;
+    Int uiRefCtuBRX      = refPelBRX / uiMaxCuWidth;
+    Int uiRefCtuBRY      = refPelBRY / uiMaxCuHeight;
+    Int refCtuBRAddr     = uiPicWidthinCtu * uiRefCtuBRY + uiRefCtuBRX;
+
+    if( refCtuBRAddr < 0 || refCtuBRAddr >= pcCU->getPic()->getFrameWidthInCtus() || pcCU->getPic()->getCtu( refCtuBRAddr )->getSlice() == NULL || !pcCU->CUIsFromSameSliceAndTile(  pcCU->getPic()->getCtu( refCtuBRAddr ) ) )
+    {
+      return false;
+    }
+#endif
+#if IBC_SLICE_BUGFIX == 2
+    TComSlice *pcSlice = pcCU->getSlice();
+    if (pcSlice->getSliceMode())
+    {
+      TComPicSym *pcSym = pcCU->getPic()->getPicSym();
+      Int      ctuX = (cuPelX + predX) / uiMaxCuWidth;
+      Int      ctuY = (cuPelY + predY) / uiMaxCuHeight;
+      UInt   refCtu = ctuX + pcSym->getFrameWidthInCtus()*ctuY;
+      UInt startCtu = pcSym->getCtuTsToRsAddrMap(pcCU->getSlice()->getSliceSegmentCurStartCtuTsAddr());
+      if (refCtu < startCtu) return false;
+    }
+#endif
+
 #if SCM_420_IBC_BUGFIX
     // check boundary
     if ( pcCU->getWidth( 0 ) == 8 && pcCU->getPartitionSize( 0 ) != SIZE_2Nx2N && pcCU->getSlice()->getPic()->getPicYuvOrg()->getChromaFormat() != CHROMA_444 )

../source/Lib/TLibEncoder/TEncSlice.cpp

@@ -794 +794 @@
     pcPic->getPicYuvResi()->DefaultConvertPix( pcPic->getPicYuvOrg() );
   }
 
+#if IBC_SLICE_BUGFIX
+  if (m_pcCfg->getUseHashBasedIntraBCSearch())
+  {
+    m_pcPredSearch->xClearIntraBCHashTable();
+  }
+#endif
+
   // for every CTU in slice
   for( UInt ctuTsAddr = startCtuTsAddr; ctuTsAddr < boundingCtuTsAddr; ++ctuTsAddr)
   {