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

Timestamp:

20 Feb 2013, 23:45:18 (12 years ago)

Author:

seregin

Message:

MV_SCALING_FIX: fix base layer MV scaling

File:

• branches/SHM-1.1-dev/source/Lib/TLibCommon/TComDataCU.cpp (modified) (2 diffs)

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

@@ -4933 +4933 @@
    TComMv cMv;
 
+#if MV_SCALING_FIX
+   Int iBWidth   = m_pcSlice->getBaseColPic()->getPicYuvRec()->getWidth () - m_pcSlice->getBaseColPic()->getPicYuvRec()->getPicCropLeftOffset() - m_pcSlice->getBaseColPic()->getPicYuvRec()->getPicCropRightOffset();
+   Int iBHeight  = m_pcSlice->getBaseColPic()->getPicYuvRec()->getHeight() - m_pcSlice->getBaseColPic()->getPicYuvRec()->getPicCropTopOffset() - m_pcSlice->getBaseColPic()->getPicYuvRec()->getPicCropBottomOffset();
+
+   Int iEWidth   = m_pcPic->getPicYuvRec()->getWidth() - m_pcPic->getPicYuvRec()->getPicCropLeftOffset() - m_pcPic->getPicYuvRec()->getPicCropRightOffset();
+   Int iEHeight  = m_pcPic->getPicYuvRec()->getHeight() - m_pcPic->getPicYuvRec()->getPicCropTopOffset() - m_pcPic->getPicYuvRec()->getPicCropBottomOffset();
+#else
    Int iBWidth   = m_pcSlice->getBaseColPic()->getPicYuvRec()->getWidth();
    Int iBHeight  = m_pcSlice->getBaseColPic()->getPicYuvRec()->getHeight();
@@ -4938 +4945 @@
    Int iEWidth   = m_pcPic->getPicYuvRec()->getWidth();
    Int iEHeight  = m_pcPic->getPicYuvRec()->getHeight();
+#endif
 
    Int iMvX = (rcMvFieldBase.getHor()*iEWidth + (iBWidth/2 -1) * (rcMvFieldBase.getHor() > 0 ? 1: -1) )/iBWidth;