Changeset 1430 in SHVCSoftware for branches/SHM-dev

Timestamp:

10 Aug 2015, 20:01:28 (9 years ago)

Author:

seregin

Message:

fix posScalingFactor invocation for CGS

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComUpsampleFilter.cpp (modified) (4 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (5 diffs)
• TLibEncoder/TEncGOP.h (modified) (1 diff)

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

@@ -125 +125 @@
       shift = bitDepthLuma - currSlice->getPPS()->getCGSOutputBitDepthY();
     }
+#endif
     assert( shift >= 0 );
-#endif
 
     for( i = 0; i < heightBL; i++ )
@@ -159 +159 @@
     if( currSlice->getPPS()->getCGSFlag() )
     {
-      shift = currSlice->getBitDepth(CHANNEL_TYPE_CHROMA) - currSlice->getPPS()->getCGSOutputBitDepthC();
+      shift = bitDepthChroma - currSlice->getPPS()->getCGSOutputBitDepthC();
     }
 #endif
+    assert( shift >= 0 );
 
     for( i = 0; i < heightBL; i++ )
@@ -220 +221 @@
     Int rlClipB = heightBL - 1 + (NTAPS_US_LUMA>>1);
 
-    // g_bitDepthY was set to EL bit-depth, but shift1 should be calculated using BL bit-depth
+    // shift1 should be calculated using BL bit-depth
     Int shift1 = refBitDepthLuma - 8;
 
@@ -320 +321 @@
     heightBL  = min<Int>( pcBasePic->getHeight(COMPONENT_Y) >> 1, heightEL );
 
-    // g_bitDepthC was set to EL bit-depth, but shift1 should be calculated using BL bit-depth
+    // shift1 should be calculated using BL bit-depth
     shift1 = refBitDepthChroma - 8;
 

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

@@ -1799 +1799 @@
           m_Enc3DAsymLUTPicUpdate.addRefLayerId( pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc) );
 
-          if( pcSlice->getPic()->getMvScalingFactor(refLayerIdc, 0) < (1<<16) || pcSlice->getPic()->getMvScalingFactor(refLayerIdc, 1) < (1<<16) ) //if(pcPic->isSpatialEnhLayer(refLayerIdc))
+          if( pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 0) < (1<<16) || pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 1) < (1<<16) ) //if(pcPic->isSpatialEnhLayer(refLayerIdc))
           {
             //downsampling
-            downScalePic(pcPic->getPicYuvOrg(), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvOrg(), pcSlice->getBitDepths(), pcPic->getPosScalingFactor());
+            downScalePic(pcPic->getPicYuvOrg(), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvOrg(), pcSlice->getBitDepths(), pcPic->getPosScalingFactor(refLayerIdc, 0));
             
             m_Enc3DAsymLUTPPS.setDsOrigPic(pcSlice->getBaseColPic(refLayerIdc)->getPicYuvOrg());
@@ -4194 +4194 @@
 }
 
-Void TEncGOP::downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest, BitDepths& bitDepth, Int** posScalingFactor)
+Void TEncGOP::downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest, BitDepths& bitDepth, const Int posScalingFactorX)
 {
   pcYuvSrc->setBorderExtension(false);
@@ -4205 +4205 @@
   if(!m_temp)
   {
-    initDs(iWidth, iHeight, m_pcCfg->getIntraPeriod()>1, posScalingFactor);
+    initDs(iWidth, iHeight, m_pcCfg->getIntraPeriod()>1, posScalingFactorX);
   }
 
@@ -4329 +4329 @@
 }
 
-Void TEncGOP::initDs(Int iWidth, Int iHeight, Int iType, Int** posScalingFactor)
+Void TEncGOP::initDs(Int iWidth, Int iHeight, Int iType, const Int posScalingFactorX)
 {
   m_iTap = 13;
-  if(posScalingFactor[0][0] == (1<<15))
+  if(posScalingFactorX == (1<<15))
   {
     m_iM = 4;
     m_iN = 8;
     m_phase_filter_luma = iType? m_phase_filter_0_t1 : m_phase_filter_0_t0;
-    m_phase_filter_chroma = m_phase_filter_0_t1_chroma; 
+    m_phase_filter_chroma = m_phase_filter_0_t1_chroma;    
   }
   else
@@ -4347 +4347 @@
   }
 
-  get_mem2DintWithPad (&m_temp, iHeight, iWidth*m_iM/m_iN,   m_iTap>>1, 0);
+  get_mem2DintWithPad (&m_temp, iHeight, iWidth*m_iM/m_iN, m_iTap>>1, 0);
 }
 

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

@@ -287 +287 @@
 #if CGS_3D_ASYMLUT
   Void xDetermine3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS );
-  Void downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest, BitDepths& bitDepth, Int** posScalingFactor);
+  Void downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest, BitDepths& bitDepth, const Int posScalingFactorX);
   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, Int** posScalingFactor);
+  Void initDs(Int iWidth, Int iHeight, Int iType, const Int posScalingFactorX);
   Void filterImg( Pel *src, Int iSrcStride, Pel *dst, Int iDstStride, Int height1, Int width1, BitDepths& bitDepth, Int plane );