Changeset 141 in SHVCSoftware for branches

Timestamp:

2 May 2013, 19:28:50 (12 years ago)

Author:

seregin

Message:

clean up macro MV_SCALING_FIX

Location:

branches/SHM-2.0-dev/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -4245 +4245 @@
   cMv = rcMvFieldBase.getMv().scaleMv( g_mvScalingFactor[m_layerId][0], g_mvScalingFactor[m_layerId][1] );
 #else
-#if MV_SCALING_FIX
   const Window &confBL = m_pcSlice->getBaseColPic()->getPicYuvRec()->getConformanceWindow();
   const Window &confEL = m_pcPic->getPicYuvRec()->getConformanceWindow();
@@ -4254 +4253 @@
   Int widthEL   = m_pcPic->getPicYuvRec()->getWidth() - confEL.getWindowLeftOffset() - confEL.getWindowRightOffset();
   Int heightEL  = m_pcPic->getPicYuvRec()->getHeight() - confEL.getWindowTopOffset() - confEL.getWindowBottomOffset();
-#else
-  Int widthBL   = m_pcSlice->getBaseColPic()->getPicYuvRec()->getWidth();
-  Int heightBL  = m_pcSlice->getBaseColPic()->getPicYuvRec()->getHeight();
-
-  Int widthEL   = m_pcPic->getPicYuvRec()->getWidth();
-  Int heightEL  = m_pcPic->getPicYuvRec()->getHeight();
-#endif
 
   Int iMvX = (rcMvFieldBase.getHor()*widthEL + (widthBL/2 -1) * (rcMvFieldBase.getHor() > 0 ? 1: -1) )/widthBL;

branches/SHM-2.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -62 +62 @@
 #define CHROMA_UPSAMPLING                1      ///< L0335: Chroma upsampling with 5 bits coefficients
 
-#define MV_SCALING_FIX                   1      ///< fixing the base layer MV scaling
 #define MV_SCALING_POS_FIX               1      ///< use center pixels to get co-located base layer block
 #define SIMPLIFIED_MV_POS_SCALING        1      ///< M0133/M0449: inter-layer MV scaling and pixel mapping position calculation