Changeset 1131 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

7 Jul 2015, 03:31:59 (9 years ago)

Author:

seregin

Message:

macro cleanup: R0071_IRAP_EOS_CROSS_LAYER_IMPACTS

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (4 diffs)
• TAppEncLayerCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -839 +839 @@
 #endif
   Int*    cfg_waveFrontSynchro[MAX_LAYERS];
-
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   Int*    cfg_layerSwitchOffBegin[MAX_LAYERS];
   Int*    cfg_layerSwitchOffEnd[MAX_LAYERS];
-#endif
 
 #if MULTIPLE_PTL_SUPPORT
@@ -941 +938 @@
     cfg_auxId[layer]                = &m_acLayerCfg[layer].m_auxId; 
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
-    cfg_layerSwitchOffBegin[layer] = &m_acLayerCfg[layer].m_layerSwitchOffBegin;
-    cfg_layerSwitchOffEnd[layer]   = &m_acLayerCfg[layer].m_layerSwitchOffEnd;
-#endif
+    cfg_layerSwitchOffBegin[layer]  = &m_acLayerCfg[layer].m_layerSwitchOffBegin;
+    cfg_layerSwitchOffEnd[layer]    = &m_acLayerCfg[layer].m_layerSwitchOffEnd;
 #if MULTIPLE_PTL_SUPPORT
     cfg_layerPTLIdx[layer]          = &m_acLayerCfg[layer].m_layerPTLIdx; 
@@ -1686 +1681 @@
 #endif
   ("AdaptiveResolutionChange",     m_adaptiveResolutionChange, 0, "Adaptive resolution change frame number. Should coincide with EL RAP picture. (0: disable)")
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   ("LayerSwitchOffBegin%d", cfg_layerSwitchOffBegin, 0, MAX_LAYERS, "Switch layer %d off after given poc")
   ("LayerSwitchOffEnd%d", cfg_layerSwitchOffEnd, 0, MAX_LAYERS, "Switch layer %d on at given poc")
-#endif
   ("SkipPictureAtArcSwitch",     m_skipPictureAtArcSwitch, false, "Code the higher layer picture in ARC up-switching as a skip picture. (0: disable)")
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
@@ -1904 +1897 @@
 #endif
 
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
+#if SVC_EXTENSION
   for (Int layer = 0; layer < MAX_LAYERS; layer++)
   {

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

@@ -147 +147 @@
 #endif
 
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   Int       m_layerSwitchOffBegin;
   Int       m_layerSwitchOffEnd;
-#endif
 
 #if MULTIPLE_PTL_SUPPORT

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -788 +788 @@
 
     m_acTEncTop[layer].setAdaptiveResolutionChange               ( m_adaptiveResolutionChange );
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
-    m_acTEncTop[layer].setLayerSwitchOffBegin                    (m_acLayerCfg[layer].m_layerSwitchOffBegin);
-    m_acTEncTop[layer].setLayerSwitchOffEnd                      (m_acLayerCfg[layer].m_layerSwitchOffEnd);
-#endif
+    m_acTEncTop[layer].setLayerSwitchOffBegin                    ( m_acLayerCfg[layer].m_layerSwitchOffBegin );
+    m_acTEncTop[layer].setLayerSwitchOffEnd                      ( m_acLayerCfg[layer].m_layerSwitchOffEnd );
 #if AUXILIARY_PICTURES
     m_acTEncTop[layer].setChromaFormatIDC                        ( m_acLayerCfg[layer].m_chromaFormatIDC );