Changeset 1203 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

Timestamp:

8 Jul 2015, 20:57:55 (9 years ago)

Author:

seregin

Message:

macro cleanup: REPN_FORMAT_IN_VPS

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h (modified) (2 diffs)

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

@@ -472 +472 @@
   Int       m_adaptiveResolutionChange;                       ///< Indicate adaptive resolution change frame
   Bool      m_skipPictureAtArcSwitch;                         ///< Indicates that when ARC up-switching is performed the higher layer picture is a skip picture
-#if REPN_FORMAT_IN_VPS
+
   RepFormatCfg m_repFormatCfg[16];                            ///< Rep_format structures
-#endif
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
   Bool      m_interLayerConstrainedTileSetsSEIEnabled;
@@ -557 +556 @@
   Void cfgStringToArrayNumEntries(Int **arr, string const cfgString, Int &numEntries, const char* logString);
 
-#if REPN_FORMAT_IN_VPS
   RepFormatCfg* getRepFormatCfg(Int i)  { return &m_repFormatCfg[i]; }
-#endif
 #if LAYER_CTB
   Bool getUsePCM()                  { return m_usePCM;               }