Changeset 166 in SHVCSoftware for branches/SHM-2.0-dev/source

Timestamp:

9 May 2013, 00:22:09 (12 years ago)

Author:

seregin

Message:

use decoded base layer picture for upsampling

File:

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

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

@@ -330 +330 @@
 #endif
 
+#if ILP_DECODED_PICTURE
+  widthBL   = pcBasePic->getWidth ();
+  heightBL  = pcBasePic->getHeight();
+
+  widthEL   = pcUsPic->getWidth ();
+  heightEL  = pcUsPic->getHeight();
+#endif
+
   //========== horizontal upsampling ===========
   for( i = 0; i < widthEL; i++ )
@@ -391 +399 @@
   }
 
+#if ILP_DECODED_PICTURE
+  widthBL   = pcBasePic->getWidth () - confBL.getWindowLeftOffset() - confBL.getWindowRightOffset();
+  heightBL  = pcBasePic->getHeight() - confBL.getWindowTopOffset() - confBL.getWindowBottomOffset();
+
+  widthEL   = pcUsPic->getWidth () - confEL.getWindowLeftOffset() - confEL.getWindowRightOffset();
+  heightEL  = pcUsPic->getHeight() - confEL.getWindowTopOffset() - confEL.getWindowBottomOffset();
+#endif
+
   //========== UV component upsampling ===========
 
@@ -420 +436 @@
   scaleX     = ( ( widthBL << shiftX ) + ( widthEL >> 1 ) ) / widthEL;
   scaleY     = ( ( heightBL << shiftY ) + ( heightEL >> 1 ) ) / heightEL;
+#endif
+
+#if ILP_DECODED_PICTURE
+  widthBL   = pcBasePic->getWidth () >> 1;
+  heightBL  = pcBasePic->getHeight() >> 1;
+
+  widthEL   = pcUsPic->getWidth () >> 1;
+  heightEL  = pcUsPic->getHeight() >> 1;
 #endif