Changeset 1512 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

15 Dec 2015, 19:47:27 (10 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/TLibDecoder

Files:

• TDecTop.cpp (modified) (5 diffs)
• TDecTop.h (modified) (2 diffs)

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);