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

Timestamp:

7 Jul 2015, 03:13:38 (10 years ago)

Author:

seregin

Message:

macro cleanup: M0040_ADAPTIVE_RESOLUTION_CHANGE

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncCfg.h (modified) (2 diffs)
• TEncGOP.cpp (modified) (4 diffs)

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

@@ -2642 +2642 @@
 #endif
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   WRITE_FLAG(vps->getSingleLayerForNonIrapFlag(), "single_layer_for_non_irap_flag" );
-#endif
 
   // When single_layer_for_non_irap_flag is equal to 0, higher_layer_irap_skip_flag shall be equal to 0

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

@@ -370 +370 @@
   UInt      m_numLayer;
   Int       m_elRapSliceBEnabled;
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
   Int       m_adaptiveResolutionChange;
-#endif
 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   int       m_layerSwitchOffBegin;
@@ -1007 +1005 @@
 #endif
 #if SVC_EXTENSION
-  UInt      getLayerId            () { return m_layerId;              }
-  Void      setLayerId            (UInt layer) { m_layerId = layer; }
-  UInt      getNumLayer           () { return m_numLayer;             }  
-  Void      setNumLayer           (UInt uiNum)   { m_numLayer = uiNum;  }
+  UInt      getLayerId()                                     { return m_layerId;    }
+  Void      setLayerId( UInt layer )                         { m_layerId = layer;   }
+  UInt      getNumLayer()                                    { return m_numLayer;   }  
+  Void      setNumLayer( UInt uiNum )                        { m_numLayer = uiNum;  }
   Void      setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
-  Void      setElRapSliceTypeB(Int bEnabled) {m_elRapSliceBEnabled = bEnabled;}
-  Int       getElRapSliceTypeB()              {return m_elRapSliceBEnabled;}
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-  Void      setAdaptiveResolutionChange(Int x) { m_adaptiveResolutionChange = x;    }
-  Int       getAdaptiveResolutionChange()      { return m_adaptiveResolutionChange; }
-#endif
+  Void      setElRapSliceTypeB(Int bEnabled)                 { m_elRapSliceBEnabled = bEnabled;   }
+  Int       getElRapSliceTypeB()                             { return m_elRapSliceBEnabled;       }
+  Void      setAdaptiveResolutionChange(Int x)               { m_adaptiveResolutionChange = x;    }
+  Int       getAdaptiveResolutionChange()                    { return m_adaptiveResolutionChange; }
 #if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   Void      setLayerSwitchOffBegin(Int x)    { m_layerSwitchOffBegin = x;    }

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

@@ -1105 +1105 @@
     }
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+#if SVC_EXTENSION
     if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && ((m_layerId > 0 && pocCurr < m_pcEncTop->getAdaptiveResolutionChange()) ||
                                                           (m_layerId == 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())) )
@@ -1263 +1263 @@
     xSetLayerInitializedFlag(pcSlice);
 #endif
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
     if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && m_layerId > 0 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange())
     {
@@ -1270 +1269 @@
       pcSlice->setMFMEnabledFlag(false);
     }
-#endif
 #endif //SVC_EXTENSION
 
@@ -3482 +3480 @@
     pcPic->getPicYuvRec()->copyToPic(pcPicYuvRecOut);
 
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+#if SVC_EXTENSION
     pcPicYuvRecOut->setReconstructed(true);
 #endif