Changeset 142 in SHVCSoftware for branches/SHM-2.0-dev/source

Timestamp:

2 May 2013, 19:33:48 (12 years ago)

Author:

seregin

Message:

clean up macro MV_SCALING_POS_FIX

Location:

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

Files:

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

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

@@ -2537 +2537 @@
   if(m_layerId)  
   {
-#if MV_SCALING_POS_FIX
     pcColCU = getBaseColCU( xP + nPSW/2, yP + nPSH/2, uiCUAddrBase, uiAbsPartAddrBase );
-#else
-    UInt uiPartIdxCenter;
-    xDeriveCenterIdx( cCurPS, uiPUIdx, uiPartIdxCenter );
-    uiPartIdxCenter -= m_uiAbsIdxInLCU;
-    pcColCU = getBaseColCU( uiPartIdxCenter, uiCUAddrBase, uiAbsPartAddrBase );
-#endif
     
 #if INTRA_BL

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_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
 #define MFM_CLIPPING_FIX                 1      ///< set the right picture size for the clipping