Changeset 43 in SHVCSoftware for branches/SHM-1.1-dev/source/Lib/TLibCommon

Timestamp:

21 Feb 2013, 01:11:48 (12 years ago)

Author:

seregin

Message:

MFM_CLIPPING_FIX: set the right picture size for the clipping

Location:

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

Files:

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

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

@@ -565 +565 @@
   UInt uiBaseWidth  = getPicYuvRec()->getWidth();
   UInt uiBaseHeight = getPicYuvRec()->getHeight();
-
+  
   UInt uiWidthInCU       = ( uiBaseWidth % g_uiMaxCUWidth  ) ? uiBaseWidth /g_uiMaxCUWidth  + 1 : uiBaseWidth /g_uiMaxCUWidth;
+
+#if MFM_CLIPPING_FIX
+  uiPelX     = (UInt)Clip3<UInt>(0, getPicYuvRec()->getWidth() - 1, uiPelX);
+  uiPelY     = (UInt)Clip3<UInt>(0, getPicYuvRec()->getHeight() - 1, uiPelY);
+#else
   UInt uiHeightInCU      = ( uiBaseHeight% g_uiMaxCUHeight ) ? uiBaseHeight/ g_uiMaxCUHeight + 1 : uiBaseHeight/ g_uiMaxCUHeight;
 
   uiPelX     = (UInt)Clip3<UInt>(0, uiWidthInCU * g_uiMaxCUWidth - 1, uiPelX);
   uiPelY     = (UInt)Clip3<UInt>(0, uiHeightInCU * g_uiMaxCUHeight - 1, uiPelY);
+#endif
   
   uiBaseCUAddr = uiPelY / g_uiMaxCUHeight * uiWidthInCU + uiPelX / g_uiMaxCUWidth;

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

@@ -55 +55 @@
 
 #define MV_SCALING_FIX                   1      ///< fixing the base layer MV scaling
+#define MFM_CLIPPING_FIX                 1      ///< set the right picture size for the clipping
 
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC
-#define REF_IDX_FRAMEWORK                0      ///< inter-layer reference framework
+#define REF_IDX_FRAMEWORK                1      ///< inter-layer reference framework
 
 #if AVC_BASE