Changeset 661 in SHVCSoftware for branches/SHM-6-dev

Timestamp:

10 Apr 2014, 01:48:50 (11 years ago)

Author:

seregin

Message:

fix for the ticket #21

File:

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

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

@@ -3507 +3507 @@
   if( iMotionMapping == 1 )
   {
-    iBX += 4;
-    iBY += 4;
-  }
-#endif
-
-  if ( iBX >= baseColPic->getPicYuvRec()->getWidth() || iBY >= baseColPic->getPicYuvRec()->getHeight() ||
-       iBX < 0                                        || iBY < 0                                           )
+    // 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;
+  }
+#endif
+
+  if ( iBX < 0 || iBX >= baseColPic->getPicYuvRec()->getWidth() || iBY < 0 || iBY >= baseColPic->getPicYuvRec()->getHeight() )
   {
     return NULL;