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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: REPN_FORMAT_IN_VPS

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)

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

@@ -737 +737 @@
   Double* cfg_fQP            [MAX_LAYERS];
   Int*    cfg_layerId        [MAX_LAYERS];
-#if REPN_FORMAT_IN_VPS
   Int*    cfg_repFormatIdx  [MAX_LAYERS];
-#endif
   Int*    cfg_SourceWidth   [MAX_LAYERS]; 
   Int*    cfg_SourceHeight  [MAX_LAYERS];
@@ -848 +846 @@
     cfg_colourRemapSEIFileRoot[layer] = &m_acLayerCfg[layer].m_colourRemapSEIFileRoot;
 #endif
-#if REPN_FORMAT_IN_VPS
-    cfg_repFormatIdx[layer] = &m_acLayerCfg[layer].m_repFormatIdx;
-#endif
+    cfg_repFormatIdx[layer]         = &m_acLayerCfg[layer].m_repFormatIdx;
     cfg_layerId[layer]              = &m_acLayerCfg[layer].m_layerId;
     cfg_SourceWidth[layer]          = &m_acLayerCfg[layer].m_iSourceWidth;
@@ -1041 +1037 @@
   ("FrameRate%d,-fr%d",                             cfg_FrameRate,                               0, MAX_LAYERS, "Frame rate for layer %d")
   ("LambdaModifier%d,-LM%d",                        m_adLambdaModifier,                Double(1.0), MAX_TLAYER, "Lambda modifier for temporal layer %d")
-#if REPN_FORMAT_IN_VPS
   ("RepFormatIdx%d",                                cfg_repFormatIdx,                           -1, MAX_LAYERS, "Index to the representation format structure used from the VPS")
-#endif
   ("LayerId%d",                                     cfg_layerId,                                -1, MAX_LAYERS,  "Layer id")