Changeset 827 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

13 Jul 2014, 01:29:28 (10 years ago)

Author:

seregin

Message:

set spatial flag for ILR and fix for MFM centre

File:

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

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

@@ -3493 +3493 @@
   TComPic* baseColPic = m_pcSlice->getBaseColPic(refLayerIdc);
 
-  UInt uiPelX = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getWidth()  - 1, pelX + 8);
-  UInt uiPelY = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getHeight() - 1, pelY + 8);
+  UInt uiPelX = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getWidth()  - 1, pelX);
+  UInt uiPelY = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getHeight() - 1, pelY);
+
+#if REF_IDX_MFM
+  // centre of the collocated 16x16 block for motion mapping
+  if( motionMapping )
+  {
+    uiPelX += 8;
+    uiPelY += 8;
+  }
+#endif
 
 #if !LAYER_CTB