Changeset 222 in SHVCSoftware

Timestamp:

21 May 2013, 19:33:57 (11 years ago)

Author:

seregin

Message:

use minimum height of BL and EL for upsampling

File:

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

branches/SHM-2.0avc-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -345 +345 @@
 #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 +503 @@
 
 #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