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

Timestamp:

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

Author:

seregin

Message:

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

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (3 diffs)
• TComDataCU.h (modified) (1 diff)
• TComPic.cpp (modified) (6 diffs)
• TComPic.h (modified) (2 diffs)
• TComRom.cpp (modified) (2 diffs)
• TComRom.h (modified) (2 diffs)
• TComSlice.cpp (modified) (2 diffs)
• TComUpsampleFilter.cpp (modified) (1 diff)

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

@@ -3276 +3276 @@
 
 #if SVC_EXTENSION
-TComDataCU* TComDataCU::getBaseColCU( UInt refLayerIdc, UInt uiCuAbsPartIdx, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Bool motionMapping )
+TComDataCU* TComDataCU::getBaseColCU( UInt refLayerIdc, UInt uiCuAbsPartIdx, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Int** petPosScalingFactor, Bool motionMapping )
 {
   UInt uiPelX = getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiCuAbsPartIdx] ];
   UInt uiPelY = getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiCuAbsPartIdx] ];
 
-  return getBaseColCU( refLayerIdc, uiPelX, uiPelY, uiCUAddrBase, uiAbsPartIdxBase, motionMapping );
-}
-
-TComDataCU* TComDataCU::getBaseColCU( UInt refLayerIdc, UInt pelX, UInt pelY, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Bool motionMapping )
+  return getBaseColCU( refLayerIdc, uiPelX, uiPelY, uiCUAddrBase, uiAbsPartIdxBase, petPosScalingFactor, motionMapping );
+}
+
+TComDataCU* TComDataCU::getBaseColCU( UInt refLayerIdc, UInt pelX, UInt pelY, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Int** posScalingFactor, Bool motionMapping )
 {
   TComPic* baseColPic = m_pcSlice->getBaseColPic(refLayerIdc);
@@ -3302 +3302 @@
 
   const Window &windowRL = m_pcSlice->getPPS()->getRefLayerWindowForLayer(baseColPic->getSlice(0)->getVPS()->getRefLayerId(getSlice()->getLayerId(), refLayerIdc));
-  Int iBX = (((iPelX - leftStartL)*g_posScalingFactor[refLayerIdc][0] + (1<<15)) >> 16) + windowRL.getWindowLeftOffset();
-  Int iBY = (((iPelY - topStartL )*g_posScalingFactor[refLayerIdc][1] + (1<<15)) >> 16) + windowRL.getWindowTopOffset();
+  Int iBX = (((iPelX - leftStartL) * posScalingFactor[0][refLayerIdc] + (1<<15)) >> 16) + windowRL.getWindowLeftOffset();
+  Int iBY = (((iPelY - topStartL ) * posScalingFactor[1][refLayerIdc] + (1<<15)) >> 16) + windowRL.getWindowTopOffset();
 
   // offset for collocated block in the motion mapping
@@ -3346 +3346 @@
 }
 
-Void TComDataCU::scaleBaseMV( UInt refLayerIdc, TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase )
+Void TComDataCU::scaleBaseMV( UInt refLayerIdc, TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase, Int** mvScalingFactor )
 {
   TComMvField cMvFieldBase;
   TComMv cMv;
 
-  cMv = rcMvFieldBase.getMv().scaleMv( g_mvScalingFactor[refLayerIdc][0], g_mvScalingFactor[refLayerIdc][1] );
+  cMv = rcMvFieldBase.getMv().scaleMv( mvScalingFactor[0][refLayerIdc], mvScalingFactor[1][refLayerIdc] );
 
   rcMvFieldEnhance.setMvField( cMv, rcMvFieldBase.getRefIdx() );

branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h

@@ -490 +490 @@
   Bool          xCheckZeroMVILRMvdL1Zero(Int iRefList, Int iRefIdx, Int MvpIdx);
 #endif
-  TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt uiCuAbsPartIdx, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Bool motionMapping = false );
-  TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt pelX, UInt pelY, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Bool motionMapping = false );
-  Void          scaleBaseMV( UInt refLayerIdc, TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase );
+  TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt uiCuAbsPartIdx, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Int** posScalingFactor, Bool motionMapping = false );
+  TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt pelX, UInt pelY, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Int** posScalingFactor, Bool motionMapping = false );
+  Void          scaleBaseMV( UInt refLayerIdc, TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase, Int** mvScalingFactor );
 #if FAST_INTRA_SHVC
   UChar         getReducedSetIntraModes(UChar idx)     { assert( idx < NUM_INTRA_MODE-1 ); return m_reducedSetIntraModes[idx]; }

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

@@ -64 +64 @@
   memset( m_bSpatialEnhLayer, false, sizeof( m_bSpatialEnhLayer ) );
   memset( m_equalPictureSizeAndOffsetFlag, false, sizeof( m_equalPictureSizeAndOffsetFlag ) );
+  memset( m_mvScalingFactor, NULL, sizeof( m_mvScalingFactor ) );
+  memset( m_posScalingFactor, NULL, sizeof( m_posScalingFactor ) );
 #endif
   for(UInt i=0; i<NUM_PIC_YUV; i++)
@@ -160 +162 @@
       delete m_pcFullPelBaseRec[i];
       m_pcFullPelBaseRec[i]  = NULL;
+    }
+  }
+
+  for( Int comp = 0; comp < 2; comp++ )
+  {
+    if( m_mvScalingFactor[comp] )
+    {
+      delete [] m_mvScalingFactor[comp];
+      m_mvScalingFactor[comp] = NULL;
+    }
+
+    if( m_posScalingFactor[comp] )
+    {
+      delete [] m_posScalingFactor[comp];
+      m_posScalingFactor[comp] = NULL;
     }
   }
@@ -220 +237 @@
 
 #if SVC_EXTENSION
+Void TComPic::createMvScalingFactor(UInt numOfILRPs)
+{
+  assert(m_mvScalingFactor[0] == NULL);
+  m_mvScalingFactor[0] = new Int[numOfILRPs];
+
+  assert(m_mvScalingFactor[1] == NULL);
+  m_mvScalingFactor[1] = new Int[numOfILRPs];
+}
+
+Void TComPic::createPosScalingFactor(UInt numOfILRPs)
+{
+  assert(m_posScalingFactor[0] == NULL);
+  m_posScalingFactor[0] = new Int[numOfILRPs];
+
+  assert(m_posScalingFactor[1] == NULL);
+  m_posScalingFactor[1] = new Int[numOfILRPs];
+}
+
 Void copyOnetoOnePicture(    // SVC_NONCOLL
                   Pel *in,        
@@ -262 +297 @@
 }
 
-Void TComPic::copyUpsampledMvField(UInt refLayerIdc)
+Void TComPic::copyUpsampledMvField(UInt refLayerIdc, Int** mvScalingFactor, Int** posScalingFactor)
 {
   const TComSPS *sps       = getSlice(0)->getSPS();
@@ -283 +318 @@
 
       TComDataCU *pcColCU = 0;
-      pcColCU = pcCUDes->getBaseColCU(refLayerIdc, pelX, pelY, baseCUAddr, baseAbsPartIdx, true);
+      pcColCU = pcCUDes->getBaseColCU(refLayerIdc, pelX, pelY, baseCUAddr, baseAbsPartIdx, posScalingFactor, true);
 
       if( pcColCU && pcColCU->getPredictionMode(baseAbsPartIdx) == MODE_INTER )  //base layer unit not skip and invalid mode
@@ -291 +326 @@
           TComMvField sMvFieldBase, sMvField;
           pcColCU->getMvField( pcColCU, baseAbsPartIdx, (RefPicList)refPicList, sMvFieldBase);
-          pcCUDes->scaleBaseMV( refLayerIdc, sMvField, sMvFieldBase );
+          pcCUDes->scaleBaseMV( refLayerIdc, sMvField, sMvFieldBase, mvScalingFactor );
 
           pcCUDes->getCUMvField((RefPicList)refPicList)->setMvField(sMvField, absPartIdx);

branches/SHM-dev/source/Lib/TLibCommon/TComPic.h

@@ -88 +88 @@
   Bool                  m_bSpatialEnhLayer[MAX_LAYERS];       // whether current layer is a spatial enhancement layer,
   TComPicYuv*           m_pcFullPelBaseRec[MAX_LAYERS];    // upsampled base layer recontruction for difference domain inter prediction
-  Bool                  m_equalPictureSizeAndOffsetFlag[MAX_LAYERS]; 
+  Bool                  m_equalPictureSizeAndOffsetFlag[MAX_LAYERS];
+  Int*                  m_mvScalingFactor[2];
+  Int*                  m_posScalingFactor[2];
 #if CGS_3D_ASYMLUT
   Int                   m_nFrameBit;
@@ -199 +201 @@
   Bool          equalPictureSizeAndOffsetFlag(UInt refLayerIdc)             { return m_equalPictureSizeAndOffsetFlag[refLayerIdc];       }
   Void          setEqualPictureSizeAndOffsetFlag(UInt refLayerIdc, Bool b)  { m_equalPictureSizeAndOffsetFlag[refLayerIdc] = b;          }
-  Void          copyUpsampledMvField(UInt refLayerIdc);
+  Void          copyUpsampledMvField(UInt refLayerIdc, Int** mvScalingFactor, Int** posScalingFactor);
   Void          initUpsampledMvField();
   Bool          checkSameRefInfo();
-  Void          copyUpsampledPictureYuv(TComPicYuv*   pcPicYuvIn, TComPicYuv*   pcPicYuvOut); 
+  Void          copyUpsampledPictureYuv(TComPicYuv* pcPicYuvIn, TComPicYuv* pcPicYuvOut); 
+  Void          setMvScalingFactor(UInt refLayerIdc, Int compX, Int compY)  { m_mvScalingFactor[0][refLayerIdc] = compX; m_mvScalingFactor[1][refLayerIdc] = compY;   }
+  Void          setPosScalingFactor(UInt refLayerIdc, Int compX, Int compY) { m_posScalingFactor[0][refLayerIdc] = compX; m_posScalingFactor[1][refLayerIdc] = compY; }
+  Int           getMvScalingFactor(UInt refLayerIdc, UChar comp) const      { return m_mvScalingFactor[comp][refLayerIdc];  }
+  Int           getPosScalingFactor(UInt refLayerIdc, UChar comp) const     { return m_posScalingFactor[comp][refLayerIdc]; }
+  Int**         getPosScalingFactor()                                       { return m_posScalingFactor; }
+  Int**         getMvScalingFactor()                                        { return m_mvScalingFactor;  }
+  Void          createMvScalingFactor(UInt numOfILRPs);
+  Void          createPosScalingFactor(UInt numOfILRPs);
 #if CGS_3D_ASYMLUT
   Void          setFrameBit( Int n )                                        { m_nFrameBit = n;     }

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

@@ -725 +725 @@
 const UInt g_scalingListSizeX  [SCALING_LIST_SIZE_NUM] = { 4, 8, 16,  32};
 
-#if SVC_EXTENSION
-Int g_mvScalingFactor  [MAX_LAYERS][2] = {{0,0}, {0,0}};
-Int g_posScalingFactor [MAX_LAYERS][2] = {{0,0}, {0,0}};
 #if LAYER_CTB
 UInt g_auiLayerZscanToRaster[MAX_LAYERS][ MAX_NUM_SPU_W*MAX_NUM_SPU_W ];
@@ -734 +731 @@
 UInt g_auiLayerRasterToPelY[MAX_LAYERS][ MAX_NUM_SPU_W*MAX_NUM_SPU_W ];
 #endif
-#endif //SVC_EXTENSION
 
 //! \}

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

@@ -171 +171 @@
 extern const UInt g_scalingListSizeX[SCALING_LIST_SIZE_NUM];
 
-#if SVC_EXTENSION
-extern Int g_mvScalingFactor  [MAX_LAYERS][2];
-extern Int g_posScalingFactor [MAX_LAYERS][2];
 #if LAYER_CTB
 extern       UInt g_auiLayerZscanToRaster[MAX_LAYERS][ MAX_NUM_SPU_W*MAX_NUM_SPU_W ];
@@ -180 +177 @@
 extern       UInt g_auiLayerRasterToPelY[MAX_LAYERS][ MAX_NUM_SPU_W*MAX_NUM_SPU_W ];
 #endif
-#endif //SVC_EXTENSION
 
 //! \}

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -510 +510 @@
         // motion resampling constraint
         // Allow maximum of one motion resampling process for direct reference layers, and use motion inter-layer prediction from the same layer as texture inter-layer prediction
-        if( !( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || !scalingOffset || !sameBitDepths 
+        if( !( m_pcPic->getPosScalingFactor(refLayerIdc, 0) == 65536 && m_pcPic->getPosScalingFactor(refLayerIdc, 1) == 65536 ) || !scalingOffset || !sameBitDepths 
 #if CGS_3D_ASYMLUT
           || getPPS()->getCGSFlag()
@@ -3637 +3637 @@
         }
 
-        pcIlpPic[refLayerIdc]->copyUpsampledMvField(refLayerIdc);
+        pcIlpPic[refLayerIdc]->copyUpsampledMvField( refLayerIdc, m_pcPic->getMvScalingFactor(), m_pcPic->getPosScalingFactor() );
       }
       else

branches/SHM-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -109 +109 @@
   Pel* piDstV;
 
-  Int scaleX = g_posScalingFactor[refLayerIdc][0];
-  Int scaleY = g_posScalingFactor[refLayerIdc][1];
+  Int scaleX = currSlice->getPic()->getPosScalingFactor(refLayerIdc, 0);
+  Int scaleY = currSlice->getPic()->getPosScalingFactor(refLayerIdc, 1);
 
   // non-normative software optimization for certain simple resampling cases