Ticket #1159: sao.patch

source/Lib/TLibCommon/TComPicSym.cpp

@@ -348 +348 @@
   Bool isLoopFiltAcrossTilePPS = getCU(ctu)->getSlice()->getPPS()->getLoopFilterAcrossTilesEnabledFlag();
   Bool isLoopFiltAcrossSlicePPS= getCU(ctu)->getSlice()->getPPS()->getLoopFilterAcrossSlicesEnabledFlag();
 
-  if(!isLoopFiltAcrossSlicePPS || !isLoopFiltAcrossTilePPS) 
   {
     TComDataCU* ctuCurr  = getCU(ctu);
     TComDataCU* ctuLeft  = isLeftAvail ?getCU(ctu-1):NULL;
@@ -360 +359 @@
     TComDataCU* ctuBelowLeft  = isBelowLeftAvail ? getCU(ctu+m_uiWidthInCU-1):NULL;
     TComDataCU* ctuBelowRight = isBelowRightAvail? getCU(ctu+m_uiWidthInCU+1):NULL;
 
-    if(!isLoopFiltAcrossSlicePPS)
     {
       //left
       if(ctuLeft != NULL)
       {
-        isLeftAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuLeft->getSlice()->getSliceCurStartCUAddr())?ctuCurr->getSlice()->getLFCrossSliceBoundaryFlag():true;
+        isLeftAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuLeft->getSlice()->getSliceCurStartCUAddr())? isLoopFiltAcrossSlicePPS && ctuCurr->getSlice()->getLFCrossSliceBoundaryFlag():true;
       }
       //above
       if(ctuAbove != NULL)
       {
-        isAboveAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuAbove->getSlice()->getSliceCurStartCUAddr())?ctuCurr->getSlice()->getLFCrossSliceBoundaryFlag():true;
+        isAboveAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuAbove->getSlice()->getSliceCurStartCUAddr())? isLoopFiltAcrossSlicePPS && ctuCurr->getSlice()->getLFCrossSliceBoundaryFlag():true;
       }
       //right
       if(ctuRight != NULL)
       {
-        isRightAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuRight->getSlice()->getSliceCurStartCUAddr())?ctuRight->getSlice()->getLFCrossSliceBoundaryFlag():true;
+        isRightAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuRight->getSlice()->getSliceCurStartCUAddr())? isLoopFiltAcrossSlicePPS && ctuRight->getSlice()->getLFCrossSliceBoundaryFlag():true;
       }
       //below
       if(ctuBelow != NULL)
       {
-        isBelowAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuBelow->getSlice()->getSliceCurStartCUAddr())?ctuBelow->getSlice()->getLFCrossSliceBoundaryFlag():true;
+        isBelowAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuBelow->getSlice()->getSliceCurStartCUAddr())? isLoopFiltAcrossSlicePPS && ctuBelow->getSlice()->getLFCrossSliceBoundaryFlag():true;
       }
       //above-left
       if(ctuAboveLeft != NULL)
       {
-        isAboveLeftAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuAboveLeft->getSlice()->getSliceCurStartCUAddr())?ctuCurr->getSlice()->getLFCrossSliceBoundaryFlag():true;
+        isAboveLeftAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuAboveLeft->getSlice()->getSliceCurStartCUAddr())? isLoopFiltAcrossSlicePPS && ctuCurr->getSlice()->getLFCrossSliceBoundaryFlag():true;
       }
       //below-right
       if(ctuBelowRight != NULL)
       {
-        isBelowRightAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuBelowRight->getSlice()->getSliceCurStartCUAddr())?ctuBelowRight->getSlice()->getLFCrossSliceBoundaryFlag():true;
+        isBelowRightAvail = (ctuCurr->getSlice()->getSliceCurStartCUAddr() != ctuBelowRight->getSlice()->getSliceCurStartCUAddr())? isLoopFiltAcrossSlicePPS && ctuBelowRight->getSlice()->getLFCrossSliceBoundaryFlag():true;
       }
 
 
@@ -401 +399 @@
         Int aboveRigthtSliceStartTS = getCUOrderMap(ctuAboveRigtht->getSlice()->getSliceCurStartCUAddr()/m_uiNumPartitions);
 
         isAboveRightAvail = (curSliceStartTS == aboveRigthtSliceStartTS)?(true):
+          !isLoopFiltAcrossSlicePPS                   ?(false):
           (
           (curSliceStartTS > aboveRigthtSliceStartTS)?(ctuCurr->getSlice()->getLFCrossSliceBoundaryFlag())
           :(ctuAboveRigtht->getSlice()->getLFCrossSliceBoundaryFlag())
@@ -413 +412 @@
         Int belowLeftSliceStartTS = getCUOrderMap(ctuBelowLeft->getSlice()->getSliceCurStartCUAddr()/m_uiNumPartitions);
 
         isBelowLeftAvail = (curSliceStartTS == belowLeftSliceStartTS)?(true):
+          !isLoopFiltAcrossSlicePPS                   ?(false):
           (
           (curSliceStartTS > belowLeftSliceStartTS)?(ctuCurr->getSlice()->getLFCrossSliceBoundaryFlag())
           :(ctuBelowLeft->getSlice()->getLFCrossSliceBoundaryFlag())