Changeset 1137 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

Timestamp:

7 Jul 2015, 23:15:25 (9 years ago)

Author:

seregin

Message:

macro cleanup: BITRATE_PICRATE_SIGNALLING

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -635 +635 @@
   UInt       m_layerIdxInVps[MAX_NUM_LAYER_IDS];            // Maps layer_id_in_nuh with the layer ID in the VPS
 #endif
-#if BITRATE_PICRATE_SIGNALLING
 #if Q0078_ADD_LAYER_SETS
   UInt       m_maxSLInLayerSetMinus1[MAX_VPS_LAYER_SETS_PLUS1 + MAX_NUM_ADD_LAYER_SETS];
@@ -641 +640 @@
   UInt       m_maxSLInLayerSetMinus1[MAX_VPS_LAYER_SETS_PLUS1];
 #endif
-#endif
-    
   Bool       m_ilpSshSignalingEnabledFlag;
 #if VPS_EXTN_PROFILE_INFO
@@ -1005 +1002 @@
   Void   setLayerIdxInVps(Int layerId, UInt layerIdx)           { m_layerIdxInVps[layerId] = layerIdx; }
 #endif
-#if BITRATE_PICRATE_SIGNALLING
   UInt   getMaxSLayersInLayerSetMinus1(Int ls)                  { return m_maxSLInLayerSetMinus1[ls]; }
   Void   setMaxSLayersInLayerSetMinus1(Int ls, Int x)           { m_maxSLInLayerSetMinus1[ls] = x;    }
-#endif
   Bool   getIlpSshSignalingEnabledFlag()                        { return m_ilpSshSignalingEnabledFlag;}
   Void   setIlpSshSignalingEnabledFlag(Bool x)                  { m_ilpSshSignalingEnabledFlag = x;}