Changeset 260 in SHVCSoftware for branches/SHM-2.1-multilayers-dev/source/Lib/TLibCommon

Timestamp:

5 Jun 2013, 09:06:22 (12 years ago)

Author:

seregin

Message:

TMVP setting fix, encoder speed up fix, and other minor corrections

Location:

branches/SHM-2.1-multilayers-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComUpsampleFilter.cpp (modified) (2 diffs)

branches/SHM-2.1-multilayers-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -576 +576 @@
       m_activeNumILRRefIdx = numInterLayerRPSPics;
     }
-#if MAX_ONE_RESAMPLING_DIRECT_LAYERS
+#if MAX_ONE_RESAMPLING_DIRECT_LAYERS && SIMPLIFIED_MV_POS_SCALING
     if( m_pcVPS->getScalabilityMask(1) )
     {

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

@@ -127 +127 @@
   Pel* piDstV;
 
+#if SIMPLIFIED_MV_POS_SCALING
   Int scaleX = g_posScalingFactor[refLayerIdc][0];
   Int scaleY = g_posScalingFactor[refLayerIdc][1];
+#else
+  Int   scaleX     = ( ( widthBL << shiftX ) + ( widthEL >> 1 ) ) / widthEL;
+  Int   scaleY     = ( ( heightBL << shiftY ) + ( heightEL >> 1 ) ) / heightEL;
+#endif
 
   if( scaleX == 65536 && scaleY == 65536 ) // ratio 1x
@@ -334 +339 @@
     shiftYM4 = shiftY - 4;
 
+#if !SIMPLIFIED_MV_POS_SCALING
+    scaleX     = ( ( widthBL << shiftX ) + ( widthEL >> 1 ) ) / widthEL;
+    scaleY     = ( ( heightBL << shiftY ) + ( heightEL >> 1 ) ) / heightEL;
+#endif
+
 #if ILP_DECODED_PICTURE
     widthEL   = pcUsPic->getWidth () >> 1;