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

Timestamp:

2 May 2013, 08:47:06 (12 years ago)

Author:

mediatek

Message:

M0133/M0449: inter-layer MV scaling and pixel mapping position calculation
Author: Peter Chuang <peter.chuang@…>

Location:

branches/SHM-2.0-dev/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (5 diffs)
• TLibCommon/TComMv.h (modified) (1 diff)
• TLibCommon/TComRom.cpp (modified) (1 diff)
• TLibCommon/TComRom.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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

@@ -4175 +4175 @@
   TComPic* cBaseColPic = m_pcSlice->getBaseColPic();
 
+#if !SIMPLIFIED_MV_POS_SCALING
 #if SVC_UPSAMPLING
   const Window &confBL = cBaseColPic->getPicYuvRec()->getConformanceWindow();
@@ -4191 +4192 @@
   Int heightEL  = m_pcPic->getPicYuvRec()->getHeight();
 #endif
+#endif
 
   uiPelX = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getWidth() - 1, uiPelX);
@@ -4197 +4199 @@
   UInt uiMinUnitSize = m_pcPic->getMinCUWidth();
 
+#if SIMPLIFIED_MV_POS_SCALING
+  Int iBX = (uiPelX*g_posScalingFactor[m_layerId][0] + (1<<15)) >> 16;
+  Int iBY = (uiPelY*g_posScalingFactor[m_layerId][1] + (1<<15)) >> 16;
+#else
   Int iBX = (uiPelX*widthBL + widthEL/2)/widthEL;
   Int iBY = (uiPelY*heightBL+ heightEL/2)/heightEL;
+#endif
 
   if ( iBX >= cBaseColPic->getPicYuvRec()->getWidth() || iBY >= cBaseColPic->getPicYuvRec()->getHeight())
@@ -4228 +4235 @@
   TComMvField cMvFieldBase;
   TComMv cMv;
-
+#if SIMPLIFIED_MV_POS_SCALING
+  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();
@@ -4250 +4259 @@
 
   cMv.set(iMvX, iMvY);
+#endif
 
   rcMvFieldEnhance.setMvField( cMv, rcMvFieldBase.getRefIdx() );

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

@@ -149 +149 @@
     return TComMv( mvx, mvy );
   }
+#if SIMPLIFIED_MV_POS_SCALING
+  const TComMv scaleMv( Int iScaleX, Int iScaleY ) const
+  {
+    Int mvx = Clip3( -32768, 32767, (iScaleX * getHor() + 127 + (iScaleX * getHor() < 0)) >> 8 );
+    Int mvy = Clip3( -32768, 32767, (iScaleY * getVer() + 127 + (iScaleY * getVer() < 0)) >> 8 );
+    return TComMv( mvx, mvy );
+  }
+#endif
 };// END CLASS DEFINITION TComMV
 

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

@@ -518 +518 @@
 Int  g_eTTable[4] = {0,3,1,2};
 
+#if SIMPLIFIED_MV_POS_SCALING
+Int g_mvScalingFactor  [MAX_LAYERS][2] = {{0,0}, {0,0}};
+Int g_posScalingFactor [MAX_LAYERS][2] = {{0,0}, {0,0}};
+#endif
+
 //! \}

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

@@ -273 +273 @@
 extern UInt g_scalingListNum  [SCALING_LIST_SIZE_NUM];
 extern Int  g_eTTable[4];
+
+#if SIMPLIFIED_MV_POS_SCALING
+extern Int g_mvScalingFactor  [MAX_LAYERS][2];
+extern Int g_posScalingFactor [MAX_LAYERS][2];
+#endif
+
 //! \}
 

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

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

branches/SHM-2.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -922 +922 @@
   }
 
+#if SIMPLIFIED_MV_POS_SCALING
+  if (m_layerId > 0)
+  {
+    const Window &confBL = pcSlice->getBaseColPic()->getPicYuvRec()->getConformanceWindow();
+    const Window &confEL = pcPic->getPicYuvRec()->getConformanceWindow();
+
+    Int widthBL   = pcSlice->getBaseColPic()->getPicYuvRec()->getWidth () - confBL.getWindowLeftOffset() - confBL.getWindowRightOffset();
+    Int heightBL  = pcSlice->getBaseColPic()->getPicYuvRec()->getHeight() - confBL.getWindowTopOffset() - confBL.getWindowBottomOffset();
+
+    Int widthEL   = pcPic->getPicYuvRec()->getWidth() - confEL.getWindowLeftOffset() - confEL.getWindowRightOffset();
+    Int heightEL  = pcPic->getPicYuvRec()->getHeight() - confEL.getWindowTopOffset() - confEL.getWindowBottomOffset();
+
+    g_mvScalingFactor[m_layerId][0] = Clip3(-4096, 4095, ((widthEL  << 8) + (widthBL  >> 1)) / widthBL);
+    g_mvScalingFactor[m_layerId][1] = Clip3(-4096, 4095, ((heightEL << 8) + (heightBL >> 1)) / heightBL);
+
+    g_posScalingFactor[m_layerId][0] = ((widthBL  << 16) + (widthEL  >> 1)) / widthEL;
+    g_posScalingFactor[m_layerId][1] = ((heightBL << 16) + (heightEL >> 1)) / heightEL;
+  }
+#endif
+
   //  Decode a picture
   m_cGopDecoder.decompressSlice(nalu.m_Bitstream, pcPic);

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -970 +970 @@
 
     UInt uiNumSlices = 1;
+
+#if SIMPLIFIED_MV_POS_SCALING
+    if (m_layerId > 0)
+    {
+      const Window &confBL = pcSlice->getBaseColPic()->getPicYuvRec()->getConformanceWindow();
+      const Window &confEL = pcPic->getPicYuvRec()->getConformanceWindow();
+
+      Int widthBL   = pcSlice->getBaseColPic()->getPicYuvRec()->getWidth () - confBL.getWindowLeftOffset() - confBL.getWindowRightOffset();
+      Int heightBL  = pcSlice->getBaseColPic()->getPicYuvRec()->getHeight() - confBL.getWindowTopOffset() - confBL.getWindowBottomOffset();
+
+      Int widthEL   = pcPic->getPicYuvRec()->getWidth() - confEL.getWindowLeftOffset() - confEL.getWindowRightOffset();
+      Int heightEL  = pcPic->getPicYuvRec()->getHeight() - confEL.getWindowTopOffset() - confEL.getWindowBottomOffset();
+
+      g_mvScalingFactor[m_layerId][0] = Clip3(-4096, 4095, ((widthEL  << 8) + (widthBL  >> 1)) / widthBL);
+      g_mvScalingFactor[m_layerId][1] = Clip3(-4096, 4095, ((heightEL << 8) + (heightBL >> 1)) / heightBL);
+
+      g_posScalingFactor[m_layerId][0] = ((widthBL  << 16) + (widthEL  >> 1)) / widthEL;
+      g_posScalingFactor[m_layerId][1] = ((heightBL << 16) + (heightEL >> 1)) / heightEL;
+    }
+#endif
 
     UInt uiInternalAddress = pcPic->getNumPartInCU()-4;