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

Timestamp:

23 May 2013, 21:02:18 (12 years ago)

Author:

seregin

Message:

merge with the trunk

Location:

branches/SHM-2.1-dev/source

Files:

• . (modified) (1 prop)
• Lib/TLibCommon/TComUpsampleFilter.cpp (modified) (4 diffs)

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

@@ -209 +209 @@
  
 #endif
-  
+
+  if( widthEL == widthBL && heightEL == heightBL )
+  {
+    piSrcY = piSrcBufY - scalEL.getWindowLeftOffset() - scalEL.getWindowTopOffset() * strideEL;
+    piDstY = piDstBufY;
+    for( i = 0; i < heightEL; i++ )
+    {
+      memcpy( piDstY, piSrcY, sizeof(Pel) * widthBL );
+      piSrcY += strideBL;
+      piDstY += strideEL;
+    }
+
+    widthEL  >>= 1;
+    heightEL >>= 1;
+
+    widthBL  >>= 1;
+    heightBL >>= 1;
+
+    strideBL  = pcBasePic->getCStride();
+    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++ )
+    {
+      memcpy( piDstU, piSrcU, sizeof(Pel) * widthBL );
+      memcpy( piDstV, piSrcV, sizeof(Pel) * widthBL );
+      piSrcU += strideBL;
+      piSrcV += strideBL;
+      piDstU += strideEL;
+      piDstV += strideEL;
+    }
+  }
+  else
+  {
 #if PHASE_DERIVATION_IN_INTEGER
   Int refPos16 = 0;
@@ -345 +383 @@
 #endif
 #if ILP_DECODED_PICTURE
-  widthBL   = pcBasePic->getWidth ();
-  heightBL  = pcBasePic->getHeight();
-
   widthEL   = pcUsPic->getWidth ();
   heightEL  = pcUsPic->getHeight();
+
+  widthBL   = pcBasePic->getWidth ();
+  heightBL  = min<Int>( pcBasePic->getHeight(), heightEL );
 #endif
 #if SCALED_REF_LAYER_OFFSETS
@@ -503 +541 @@
 
 #if ILP_DECODED_PICTURE
-  widthBL   = pcBasePic->getWidth () >> 1;
-  heightBL  = pcBasePic->getHeight() >> 1;
-
   widthEL   = pcUsPic->getWidth () >> 1;
   heightEL  = pcUsPic->getHeight() >> 1;
+
+  widthBL   = pcBasePic->getWidth () >> 1;
+  heightBL  = min<Int>( pcBasePic->getHeight(), heightEL );
 #endif
 
@@ -720 +758 @@
   }
 #endif
+  }
 }
 #endif //SVC_EXTENSION