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

Timestamp:

7 Jul 2015, 02:24:58 (10 years ago)

Author:

seregin

Message:

macro cleanup: P0300_ALT_OUTPUT_LAYER_FLAG, O0153_ALT_OUTPUT_LAYER_FLAG

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (3 diffs)
• TEncCfg.h (modified) (3 diffs)

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

@@ -1988 +1988 @@
 Void TEncCavlc::codeVPSExtension (TComVPS *vps)
 {
-  // ... More syntax elements to be written here
-#if P0300_ALT_OUTPUT_LAYER_FLAG
   Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
   Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1];
-#endif
 #if LIST_OF_PTL
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
@@ -2247 +2244 @@
     WRITE_CODE( vps->getProfileLevelTierIdx(i), numBits, "profile_level_tier_idx[i]" );     
 #endif
-#if P0300_ALT_OUTPUT_LAYER_FLAG
+
     NumOutputLayersInOutputLayerSet[i] = 0;
     for (j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
@@ -2265 +2262 @@
     assert( NumOutputLayersInOutputLayerSet[i]>0 );
 #endif
-
-#endif
-  }
-
-#if !P0300_ALT_OUTPUT_LAYER_FLAG
-#if O0153_ALT_OUTPUT_LAYER_FLAG
-  if( vps->getMaxLayers() > 1 )
-  {
-    WRITE_FLAG( vps->getAltOuputLayerFlag(), "alt_output_layer_flag" );   
-  }
-#endif
-#endif
+  }
 
 #if REPN_FORMAT_IN_VPS

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

@@ -377 +377 @@
   int       m_layerSwitchOffEnd;
 #endif
-#if O0153_ALT_OUTPUT_LAYER_FLAG
   Bool      m_altOutputLayerFlag;
-#endif
 #if HIGHER_LAYER_IRAP_SKIP_FLAG
   Int       m_skipPictureAtArcSwitch;
@@ -1036 +1034 @@
   ChromaFormat getChromaFormatIDC()               { return m_chromaFormatIDC; }
 #endif
-#if O0153_ALT_OUTPUT_LAYER_FLAG
   Bool      getAltOuputLayerFlag() const { return m_altOutputLayerFlag; }
   Void      setAltOuputLayerFlag(Bool b) { m_altOutputLayerFlag = b;    }
-#endif
 #if O0149_CROSS_LAYER_BLA_FLAG
   Bool      getCrossLayerBLAFlag() const { return m_crossLayerBLAFlag; }
@@ -1179 +1175 @@
 #endif
 #endif
-#endif
+#endif //SVC_EXTENSION
 };