Changeset 813 in SHVCSoftware

Timestamp:

28 Jun 2014, 02:34:32 (11 years ago)

Author:

seregin

Message:

fix the motion resampling condition, related to SHM ticket #21

File:

• branches/SHM-6-dev/source/Lib/TLibCommon/TComDataCU.cpp (modified) (1 diff)

branches/SHM-6-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3521 +3521 @@
   if( iMotionMapping == 1 )
   {
+    Bool unequalPictureSizeFlag = g_posScalingFactor[refLayerIdc][0] != 65536 || g_posScalingFactor[refLayerIdc][1] != 65536; //the condition should be updated according to the WD.
+
     // actually, motion field compression is performed in the Void TComPic::compressMotion() function, but with (+4) the rounding may have effect on the picture boundary check.
-    iBX = ( ( iBX + 4 ) >> 4 ) << 4;
-    iBY = ( ( iBY + 4 ) >> 4 ) << 4;
+    if( unequalPictureSizeFlag )
+    {
+      iBX = ( ( iBX + 4 ) >> 4 ) << 4;
+      iBY = ( ( iBY + 4 ) >> 4 ) << 4;
+    }
+    else
+    {
+      iBX += 4;
+      iBY += 4;
+    }
   }
 #endif