Changeset 1124 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder

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/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (2 diffs)

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

@@ -1685 +1685 @@
   ("SEIOverlayPersistenceFlag",               m_overlayInfoPersistenceFlag,              true, "Indicates if the SEI message applies to the current picture only (0) or also to following pictures (1)")
 #endif
+#if SVC_EXTENSION
 #if Q0189_TMVP_CONSTRAINTS
   ("SEITemporalMotionVectorPredictionConstraints",             m_TMVPConstraintsSEIEnabled,              0, "Control generation of TMVP constrants SEI message")
@@ -1703 +1704 @@
   ("TileSetsArray",                    cfg_tileSets,                         string(""), "Array containing tile sets params (TopLeftTileIndex, BottonRightTileIndex and ilcIdc for each set) ")
 #endif
-#if O0153_ALT_OUTPUT_LAYER_FLAG
   ("AltOutputLayerFlag",               m_altOutputLayerFlag,                      false, "Specifies the value of alt_output_layer_flag in VPS extension")
-#endif
 #if O0149_CROSS_LAYER_BLA_FLAG
   ("CrossLayerBLAFlag",                m_crossLayerBLAFlag,                       false, "Specifies the value of cross_layer_bla_flag in VPS")
@@ -1724 +1723 @@
   ("InheritCodingStruct%d",m_inheritCodingStruct, 0, MAX_LAYERS, "Predicts the GOP structure of one layer for another layer")
 #endif
+#endif //SVC_EXTENSION
   ;
 

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

@@ -451 +451 @@
   Int       m_TMVPConstraintsSEIEnabled;
 #endif
-#if O0153_ALT_OUTPUT_LAYER_FLAG
   Bool      m_altOutputLayerFlag;                             ///< Specifies the value of alt_output_laye_flag in VPS extension
-#endif
   Int       m_elRapSliceBEnabled;
 #endif

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

@@ -799 +799 @@
     m_acTEncTop[layer].setChromaFormatIDC                        ( m_acLayerCfg[layer].m_chromaFormatIDC );
 #endif
-#if O0153_ALT_OUTPUT_LAYER_FLAG
     m_acTEncTop[layer].setAltOuputLayerFlag                      ( m_altOutputLayerFlag );
-#endif
 #if O0149_CROSS_LAYER_BLA_FLAG
     m_acTEncTop[layer].setCrossLayerBLAFlag                      ( m_crossLayerBLAFlag );
@@ -1784 +1782 @@
 #endif
 
-#if P0300_ALT_OUTPUT_LAYER_FLAG
   for (Int k = 0; k < MAX_VPS_LAYER_SETS_PLUS1; k++)
   {
     vps->setAltOuputLayerFlag( k, m_altOutputLayerFlag );
   }
-#else
-#if O0153_ALT_OUTPUT_LAYER_FLAG
-  vps->setAltOuputLayerFlag( m_altOutputLayerFlag );
-#endif
-#endif
 
 #if VPS_VUI_BSP_HRD_PARAMS