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

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/TLibEncoder

Files:

• TEncGOP.cpp (modified) (2 diffs)
• TEncTop.cpp (modified) (2 diffs)

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