Changeset 388 in SHVCSoftware for branches/SHM-3.1-dev/source

Timestamp:

9 Sep 2013, 20:18:50 (11 years ago)

Author:

interdigital

Message:

fixed a bug to set source and destination Y/U/V buffer when scale ratio is 1; added border extension and padding for ratio 1x SNR case.

File:

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

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

@@ -156 +156 @@
   if( scaleX == 65536 && scaleY == 65536 ) // ratio 1x
   {
-    piSrcY = piSrcBufY - scalEL.getWindowLeftOffset() - scalEL.getWindowTopOffset() * strideEL;
-    piDstY = piDstBufY;
-    for( i = 0; i < heightEL; i++ )
+    piSrcY = piSrcBufY;
+    piDstY = piDstBufY + scalEL.getWindowLeftOffset() + scalEL.getWindowTopOffset() * strideEL;
+    for( i = 0; i < heightBL; i++ )
     {
       memcpy( piDstY, piSrcY, sizeof(Pel) * widthBL );
@@ -174 +174 @@
     strideEL  = pcUsPic->getCStride();
 
-    piSrcU = piSrcBufU - ( scalEL.getWindowLeftOffset() >> 1 ) - ( scalEL.getWindowTopOffset() >> 1 ) * strideEL;
-    piSrcV = piSrcBufV - ( scalEL.getWindowLeftOffset() >> 1 ) - ( scalEL.getWindowTopOffset() >> 1 ) * strideEL;
-
-    piDstU = piDstBufU;
-    piDstV = piDstBufV;
-
-    for( i = 0; i < heightEL; i++ )
+    piSrcU = piSrcBufU;
+    piSrcV = piSrcBufV;
+
+    piDstU = piDstBufU + ( scalEL.getWindowLeftOffset() >> 1 ) + ( scalEL.getWindowTopOffset() >> 1 ) * strideEL;
+    piDstV = piDstBufV + ( scalEL.getWindowLeftOffset() >> 1 ) + ( scalEL.getWindowTopOffset() >> 1 ) * strideEL;
+
+    for( i = 0; i < heightBL; i++ )
     {
       memcpy( piDstU, piSrcU, sizeof(Pel) * widthBL );
@@ -623 +623 @@
 #endif
     }
-
+  }
     pcUsPic->setBorderExtension(false);
     pcUsPic->extendPicBorder   (); // extend the border.
@@ -631 +631 @@
     pcTempPic->setBorderExtension(false);
     pcBasePic->setBorderExtension(false);
-  }
 }
 #endif //SVC_EXTENSION