Changeset 1419 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

5 Aug 2015, 03:02:48 (9 years ago)

Author:

seregin

Message:

remove global variables g_mvScalingFactor and g_posScalingFactor, and make them TComPic members

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEnc3DAsymLUT.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (7 diffs)
• TEncGOP.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp

@@ -549 +549 @@
   TComPicYuv *pcRecPicBL = pSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
   // borders of down-sampled picture
-  Int leftDS =  (scalEL.getWindowLeftOffset()*g_posScalingFactor[refLayerIdc][0]+(1<<15))>>16;
-  Int rightDS = pcRecPicBL->getWidth(COMPONENT_Y) - 1 + (((scalEL.getWindowRightOffset())*g_posScalingFactor[refLayerIdc][0]+(1<<15))>>16);
-  Int topDS = (((scalEL.getWindowTopOffset())*g_posScalingFactor[refLayerIdc][1]+(1<<15))>>16);
-  Int bottomDS = pcRecPicBL->getHeight(COMPONENT_Y) - 1 + (((scalEL.getWindowBottomOffset())*g_posScalingFactor[refLayerIdc][1]+(1<<15))>>16);
+  Int leftDS =  (scalEL.getWindowLeftOffset() * pSlice->getPic()->getPosScalingFactor(refLayerIdc, 0)+(1<<15))>>16;
+  Int rightDS = pcRecPicBL->getWidth(COMPONENT_Y) - 1 + (((scalEL.getWindowRightOffset()) * pSlice->getPic()->getPosScalingFactor(refLayerIdc, 0)+(1<<15))>>16);
+  Int topDS = (((scalEL.getWindowTopOffset()) * pSlice->getPic()->getPosScalingFactor(refLayerIdc, 1)+(1<<15))>>16);
+  Int bottomDS = pcRecPicBL->getHeight(COMPONENT_Y) - 1 + (((scalEL.getWindowBottomOffset()) * pSlice->getPic()->getPosScalingFactor(refLayerIdc, 1)+(1<<15))>>16);
   // overlapped region
   Int left = max( 0 , leftDS );

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

@@ -1732 +1732 @@
     if (m_layerId > 0)
     {
+      if( pcSlice->getSliceIdx() == 0 )
+      {
+        // create buffers for scaling factors
+        pcSlice->getPic()->createMvScalingFactor(pcSlice->getNumILRRefIdx());
+        pcSlice->getPic()->createPosScalingFactor(pcSlice->getNumILRRefIdx());
+      }
+
       Int interLayerPredLayerIdcTmp[MAX_VPS_LAYER_IDX_PLUS1];
       Int activeNumILRRefIdxTmp = 0;
@@ -1773 +1780 @@
              && ( (heightEL != heightBL) || (resamplingPhase.phaseVerLuma == 0 && resamplingPhase.phaseVerChroma == 0) ) );
 
-        g_mvScalingFactor[refLayerIdc][0] = widthEL  == widthBL  ? 4096 : Clip3(-4096, 4095, ((widthEL  << 8) + (widthBL  >> 1)) / widthBL);
-        g_mvScalingFactor[refLayerIdc][1] = heightEL == heightBL ? 4096 : Clip3(-4096, 4095, ((heightEL << 8) + (heightBL >> 1)) / heightBL);
-
-        g_posScalingFactor[refLayerIdc][0] = ((widthBL  << 16) + (widthEL  >> 1)) / widthEL;
-        g_posScalingFactor[refLayerIdc][1] = ((heightBL << 16) + (heightEL >> 1)) / heightEL;
+        pcSlice->getPic()->setMvScalingFactor( refLayerIdc,
+                                               widthEL  == widthBL  ? 4096 : Clip3(-4096, 4095, ((widthEL  << 8) + (widthBL  >> 1)) / widthBL),
+                                               heightEL == heightBL ? 4096 : Clip3(-4096, 4095, ((heightEL << 8) + (heightBL >> 1)) / heightBL) );
+
+        pcSlice->getPic()->setPosScalingFactor( refLayerIdc, 
+                                                ((widthBL  << 16) + (widthEL  >> 1)) / widthEL,
+                                                ((heightBL << 16) + (heightEL >> 1)) / heightEL );
 
 #if CGS_3D_ASYMLUT 
@@ -1787 +1796 @@
           m_Enc3DAsymLUTPicUpdate.addRefLayerId( pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc) );
 
-          if( g_posScalingFactor[refLayerIdc][0] < (1<<16) || g_posScalingFactor[refLayerIdc][1] < (1<<16) ) //if(pcPic->isSpatialEnhLayer(refLayerIdc))
+          if( pcSlice->getPic()->getMvScalingFactor(refLayerIdc, 0) < (1<<16) || pcSlice->getPic()->getMvScalingFactor(refLayerIdc, 1) < (1<<16) ) //if(pcPic->isSpatialEnhLayer(refLayerIdc))
           {
             //downsampling
-            downScalePic(pcPic->getPicYuvOrg(), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvOrg(), pcSlice->getBitDepths());
+            downScalePic(pcPic->getPicYuvOrg(), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvOrg(), pcSlice->getBitDepths(), pcPic->getPosScalingFactor());
             
             m_Enc3DAsymLUTPPS.setDsOrigPic(pcSlice->getBaseColPic(refLayerIdc)->getPicYuvOrg());
@@ -3297 +3306 @@
         UInt refLayerId = pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->getLayerId();
         UInt refLayerIdc = pcSlice->getReferenceLayerIdc(refLayerId);
-        assert( g_posScalingFactor[refLayerIdc][0] );
-        assert( g_posScalingFactor[refLayerIdc][1] );
-
-        printf( "%d(%d, {%1.2f, %1.2f}x)", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex), refLayerId, 65536.0/g_posScalingFactor[refLayerIdc][0], 65536.0/g_posScalingFactor[refLayerIdc][1] );
+        assert( pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 0) );
+        assert( pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 1) );
+
+        printf( "%d(%d, {%1.2f, %1.2f}x)", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex), refLayerId, 65536.0/pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 0), 65536.0/pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 1) );
       }
       else
@@ -4178 +4187 @@
 }
 
-Void TEncGOP::downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest, BitDepths& bitDepth)
+Void TEncGOP::downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest, BitDepths& bitDepth, Int** posScalingFactor)
 {
   pcYuvSrc->setBorderExtension(false);
-  pcYuvSrc->extendPicBorder   (); // extend the border.
+  pcYuvSrc->extendPicBorder(); // extend the border.
   pcYuvSrc->setBorderExtension(false);
 
@@ -4189 +4198 @@
   if(!m_temp)
   {
-    initDs(iWidth, iHeight, m_pcCfg->getIntraPeriod()>1);
+    initDs(iWidth, iHeight, m_pcCfg->getIntraPeriod()>1, posScalingFactor);
   }
 
@@ -4313 +4322 @@
 }
 
-Void TEncGOP::initDs(Int iWidth, Int iHeight, Int iType)
+Void TEncGOP::initDs(Int iWidth, Int iHeight, Int iType, Int** posScalingFactor)
 {
   m_iTap = 13;
-  if(g_posScalingFactor[0][0] == (1<<15))
+  if(posScalingFactor[0][0] == (1<<15))
   {
     m_iM = 4;

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h

@@ -287 +287 @@
 #if CGS_3D_ASYMLUT
   Void xDetermin3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS );
-  Void downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest, BitDepths& bitDepth);
+  Void downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest, BitDepths& bitDepth, Int** posScalingFactor);
   Void downScaleComponent2x2( const Pel* pSrc, Pel* pDest, const Int iSrcStride, const Int iDestStride, const Int iSrcWidth, const Int iSrcHeight, const Int inputBitDepth, const Int outputBitDepth );
   inline Short xClip( Short x , Int bitdepth );
-  Void initDs(Int iWidth, Int iHeight, Int iType);
+  Void initDs(Int iWidth, Int iHeight, Int iType, Int** posScalingFactor);
   Void filterImg( Pel *src, Int iSrcStride, Pel *dst, Int iDstStride, Int height1, Int width1, BitDepths& bitDepth, Int plane );