Changeset 286 in SHVCSoftware for branches/SHM-2.1-dev/source

Timestamp:

11 Jun 2013, 03:09:32 (11 years ago)

Author:

seregin

Message:

Per E. Alshina suggestion, avoid 2 conditional checks in the upsamling loop

File:

• branches/SHM-2.1-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp (modified) (2 diffs)

branches/SHM-2.1-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -271 +271 @@
       piDstY = piDstBufY + j * strideEL;
 #if SCALED_REF_LAYER_OFFSETS
-      for( i = 0; i < pcTempPic->getWidth(); i++ )
+      for( i = 0; i < leftStartL; i++ )
+      {
+        *piDstY = ClipY( (sumLumaVer(piSrcY, coeff, strideEL) + iOffset) >> (nShift));
+        piDstY++;
+      }
+
+      for( i = leftStartL; i < rightEndL-1; i++ )
+      {
+        *piDstY = ClipY( (sumLumaVer(piSrcY, coeff, strideEL) + iOffset) >> (nShift));
+        piSrcY++;
+        piDstY++;
+      }
+
+      for( i = rightEndL-1; i < pcTempPic->getWidth(); i++ )
+      {
+        *piDstY = ClipY( (sumLumaVer(piSrcY, coeff, strideEL) + iOffset) >> (nShift));
+        piDstY++;
+      }
 #else
       for( i = 0; i < widthEL; i++ )
-#endif
       {
         *piDstY = ClipY( (sumLumaVer(piSrcY, coeff, strideEL) + iOffset) >> (nShift));
-#if SCALED_REF_LAYER_OFFSETS
-        // Only increase the x position of reference upsample picture when within the window
-        // "-2" to ensure that pointer doesn't go beyond the boundary rightEndL-1
-        if( (i >= leftStartL) && (i <= rightEndL-2) )
-        {
-          piSrcY++;
-        }
-#else
         piSrcY++;
-#endif
         piDstY++;
       }
+#endif
     }
 
@@ -411 +419 @@
 
 #if SCALED_REF_LAYER_OFFSETS
-      for( i = 0; i < pcTempPic->getWidth() >> 1; i++ )
-#else
-      for( i = 0; i < widthEL; i++ )
-#endif
+      for( i = 0; i < leftStartC; i++ )
       {
         *piDstU = ClipC( (sumChromaVer(piSrcU, coeff, strideEL) + iOffset) >> (nShift));
         *piDstV = ClipC( (sumChromaVer(piSrcV, coeff, strideEL) + iOffset) >> (nShift));
-
-#if SCALED_REF_LAYER_OFFSETS
-        // Only increase the x position of reference upsample picture when within the window
-        // "-2" to ensure that pointer doesn't go beyond the boundary rightEndC-1
-        if( (i >= leftStartC) && (i <= rightEndC-2) )
-        {
-          piSrcU++;
-          piSrcV++;
-        }
-#else
+        piDstU++;
+        piDstV++;
+      }
+
+      for( i = leftStartC; i < rightEndC-1; i++ )
+      {
+        *piDstU = ClipC( (sumChromaVer(piSrcU, coeff, strideEL) + iOffset) >> (nShift));
+        *piDstV = ClipC( (sumChromaVer(piSrcV, coeff, strideEL) + iOffset) >> (nShift));
         piSrcU++;
         piSrcV++;
-#endif
         piDstU++;
         piDstV++;
       }
+
+      for( i = rightEndC-1; i < pcTempPic->getWidth() >> 1; i++ )
+      {
+        *piDstU = ClipC( (sumChromaVer(piSrcU, coeff, strideEL) + iOffset) >> (nShift));
+        *piDstV = ClipC( (sumChromaVer(piSrcV, coeff, strideEL) + iOffset) >> (nShift));
+        piDstU++;
+        piDstV++;
+      }
+#else
+      for( i = 0; i < widthEL; i++ )
+      {
+        *piDstU = ClipC( (sumChromaVer(piSrcU, coeff, strideEL) + iOffset) >> (nShift));
+        *piDstV = ClipC( (sumChromaVer(piSrcV, coeff, strideEL) + iOffset) >> (nShift));
+        piSrcU++;
+        piSrcV++;
+        piDstU++;
+        piDstV++;
+      }
+#endif
     }