Changeset 1148 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

Timestamp:

8 Jul 2015, 00:10:36 (9 years ago)

Author:

seregin

Message:

macro cleanup: VPS_EXTN_DIRECT_REF_LAYERS

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (modified) (4 diffs)

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

@@ -378 +378 @@
   Bool      m_crossLayerBLAFlag;
 #endif
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
   Int       m_numDirectRefLayers;
   Int       m_refLayerId[MAX_VPS_LAYER_IDX_PLUS1];
@@ -390 +390 @@
   Bool      m_samplePredEnabledFlag[MAX_VPS_LAYER_IDX_PLUS1];
   Bool      m_motionPredEnabledFlag[MAX_VPS_LAYER_IDX_PLUS1];
-#endif
+
   Int       m_maxTidIlRefPicsPlus1;
 #if FAST_INTRA_SHVC
@@ -1032 +1032 @@
   Void      setUseFastIntraScalable         ( Bool  b )      { m_useFastIntraScalable = b; }
 #endif
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
   Int       getNumDirectRefLayers           ()                              { return m_numDirectRefLayers;      }
   Void      setNumDirectRefLayers           (Int num)                       { m_numDirectRefLayers = num;       }
@@ -1062 +1062 @@
   Bool      getMotionPredEnabledFlag        (Int layerIdx)                  { return m_motionPredEnabledFlag[layerIdx];  }
   Void      setMotionPredEnabledFlag        (Int layerIdx,Bool flag)        { m_motionPredEnabledFlag[layerIdx] = flag;  }
-#endif
+
   Int       getMaxTidIlRefPicsPlus1         ()                              { return m_maxTidIlRefPicsPlus1; }
   Void      setMaxTidIlRefPicsPlus1         (Int num)                       { m_maxTidIlRefPicsPlus1 = num;  }