Changeset 1512 in SHVCSoftware for branches

Timestamp:

15 Dec 2015, 19:47:27 (9 years ago)

Author:

seregin

Message:

rename isSpatialEnhLayer to requireResampling for clarity since the difference may be in bitdepth only

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComPic.cpp (modified) (3 diffs)
• TLibCommon/TComPic.h (modified) (2 diffs)
• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (5 diffs)
• TLibDecoder/TDecTop.h (modified) (2 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (2 diffs)
• TLibEncoder/TEncTop.cpp (modified) (2 diffs)

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

@@ -62 +62 @@
 #if SVC_EXTENSION
   memset( m_pcFullPelBaseRec, 0, sizeof( m_pcFullPelBaseRec ) );
-  memset( m_bSpatialEnhLayer, false, sizeof( m_bSpatialEnhLayer ) );
+  memset( m_requireResampling, false, sizeof( m_requireResampling ) );
   memset( m_equalPictureSizeAndOffsetFlag, false, sizeof( m_equalPictureSizeAndOffsetFlag ) );
   memset( m_mvScalingFactor, 0, sizeof( m_mvScalingFactor ) );
@@ -100 +100 @@
   for( Int i = 0; i < MAX_LAYERS; i++ )
   {
-    if( m_bSpatialEnhLayer[i] )
+    if( m_requireResampling[i] )
     {
       m_pcFullPelBaseRec[i] = new TComPicYuv;  m_pcFullPelBaseRec[i]->create( iWidth, iHeight, chromaFormatIDC, uiMaxCuWidth, uiMaxCuHeight, uiMaxDepth, true, &conformanceWindow );
@@ -158 +158 @@
   for( Int i = 0; i < MAX_LAYERS; i++ )
   {
-    if( m_bSpatialEnhLayer[i] && m_pcFullPelBaseRec[i] )
+    if( m_requireResampling[i] && m_pcFullPelBaseRec[i] )
     {
       m_pcFullPelBaseRec[i]->destroy();

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

@@ -86 +86 @@
 
 #if SVC_EXTENSION
-  UInt                  m_layerId;              //  Layer ID
-  Bool                  m_bSpatialEnhLayer[MAX_LAYERS];       // whether current layer is a spatial enhancement layer,
+  UInt                  m_layerId;                         //  Layer ID
+  Bool                  m_requireResampling[MAX_LAYERS];   // whether current layer requires resampling
   TComPicYuv*           m_pcFullPelBaseRec[MAX_LAYERS];    // upsampled base layer recontruction for difference domain inter prediction
   Bool                  m_equalPictureSizeAndOffsetFlag[MAX_LAYERS];
@@ -192 +192 @@
   UInt          getLayerId() const                                          { return m_layerId;                                          }
   UInt          getLayerIdx() const                                         { return m_picSym.getSlice(0)->getVPS()->getLayerIdxInVps(m_layerId);     }
-  Bool          isSpatialEnhLayer(UInt refLayerIdc) const                   { return m_bSpatialEnhLayer[refLayerIdc];                    }
-  Void          setSpatialEnhLayerFlag (UInt refLayerIdc, Bool b)           { m_bSpatialEnhLayer[refLayerIdc] = b;                       }
+  Bool          requireResampling(UInt refLayerIdc) const                   { return m_requireResampling[refLayerIdc];                   }
+  Void          setRequireResamplingFlag (UInt refLayerIdc, Bool b)         { m_requireResampling[refLayerIdc] = b;                      }
   Void          setFullPelBaseRec   (UInt refLayerIdc, TComPicYuv* p)       { m_pcFullPelBaseRec[refLayerIdc] = p;                       }
   TComPicYuv*   getFullPelBaseRec   (UInt refLayerIdc) const                { return  m_pcFullPelBaseRec[refLayerIdc];                   }

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

@@ -3333 +3333 @@
 
       // copy scalability ratio, it is needed to get the correct location for the motion field of the corresponding reference layer block
-      pcIlpPic[refLayerIdc]->setSpatialEnhLayerFlag( refLayerIdc, m_pcPic->isSpatialEnhLayer(refLayerIdc) );
+      pcIlpPic[refLayerIdc]->setRequireResamplingFlag( refLayerIdc, m_pcPic->requireResampling(refLayerIdc) );
 
       pcIlpPic[refLayerIdc]->copyUpsampledPictureYuv( m_pcPic->getFullPelBaseRec( refLayerIdc ), pcIlpPic[refLayerIdc]->getPicYuvRec() );      

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

@@ -272 +272 @@
     if(m_layerId > 0)
     {
-      xSetSpatialEnhLayerFlag( vps, sps, pps, rpcPic );
+      xSetRequireResamplingFlag( vps, sps, pps, rpcPic );
     }
 
@@ -321 +321 @@
   if( m_layerId > 0 )
   {
-    xSetSpatialEnhLayerFlag( vps, sps, pps, rpcPic );
+    xSetRequireResamplingFlag( vps, sps, pps, rpcPic );
   }
 
@@ -1711 +1711 @@
 #endif
 
-        if( m_pcPic->isSpatialEnhLayer(refLayerIdc) )
+        if( m_pcPic->requireResampling(refLayerIdc) )
         {
           // check for the sample prediction picture type
@@ -2590 +2590 @@
 }
 
-Void TDecTop::xSetSpatialEnhLayerFlag( const TComVPS &vps, const TComSPS &sps, const TComPPS &pps, TComPic* pic )
+Void TDecTop::xSetRequireResamplingFlag( const TComVPS &vps, const TComSPS &sps, const TComPPS &pps, TComPic* pic )
 {
   for(UInt i = 0; i < vps.getNumDirectRefLayers( m_layerId ); i++ )
@@ -2620 +2620 @@
       )
     {
-      pic->setSpatialEnhLayerFlag( i, true );
+      pic->setRequireResamplingFlag( i, true );
 
       //only for scalable extension

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -262 +262 @@
 
 #if CONFORMANCE_BITSTREAM_MODE
-  std::vector<TComPic>* getConfListPic() { return &m_confListPic; }
-  Bool      getConfModeFlag() const      { return m_confModeFlag; }
-  Void      setConfModeFlag(Bool x)      { m_confModeFlag = x;    }
+  std::vector<TComPic>* getConfListPic()                                    { return &m_confListPic; }
+  Bool      getConfModeFlag() const                                         { return m_confModeFlag; }
+  Void      setConfModeFlag(Bool x)                                         { m_confModeFlag = x;    }
 #endif
 #endif //SVC_EXTENSION
@@ -279 +279 @@
 #if SVC_EXTENSION
   Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay, UInt& curLayerId, Bool& bNewPOC);
-  Void      xSetSpatialEnhLayerFlag( const TComVPS &vps, const TComSPS &sps, const TComPPS &pps, TComPic* pic );
+  Void      xSetRequireResamplingFlag( const TComVPS &vps, const TComSPS &sps, const TComPPS &pps, TComPic* pic );
 #else
   Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay);

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

@@ -1652 +1652 @@
           m_Enc3DAsymLUTPicUpdate.addRefLayerId( pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc) );
 
-          if( pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 0) < POS_SCALING_FACTOR_1X || pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 1) < POS_SCALING_FACTOR_1X ) //if(pcPic->isSpatialEnhLayer(refLayerIdc))
+          if( pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 0) < POS_SCALING_FACTOR_1X || pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 1) < POS_SCALING_FACTOR_1X ) //if(pcPic->requireResampling(refLayerIdc))
           {
             //downsampling
@@ -1681 +1681 @@
 #endif
 
-        if( pcPic->isSpatialEnhLayer(refLayerIdc) )
+        if( pcPic->requireResampling(refLayerIdc) )
         {
           // check for the sample prediction picture type

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

@@ -741 +741 @@
             )
           {
-            pcEPic->setSpatialEnhLayerFlag( i, true );
+            pcEPic->setRequireResamplingFlag( i, true );
 
             //only for scalable extension
@@ -786 +786 @@
             )
           {
-            rpcPic->setSpatialEnhLayerFlag( i, true );
+            rpcPic->setRequireResamplingFlag( i, true );
 
             //only for scalable extension