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

Timestamp:

8 Jul 2015, 03:09:51 (9 years ago)

Author:

seregin

Message:

macro cleanup: DPB_PARAMS_MAXTLAYERS, MULTIPLE_PTL_SUPPORT

File:

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

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

@@ -582 +582 @@
   UInt        m_numOpSets;
   Bool        m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1];
-#endif
-#if !MULTIPLE_PTL_SUPPORT
   TComPTL     m_pcPTL;
 #endif
@@ -591 +589 @@
   Bool        m_baseLayerInternalFlag;
   Bool        m_baseLayerAvailableFlag;
-#if MULTIPLE_PTL_SUPPORT
   TComPTL     m_pcPTLList[MAX_NUM_LAYER_IDS + 1];
-#endif
 
   std::vector< std::vector<Int> >     m_layerSetLayerIdList;
@@ -623 +619 @@
   // Profile-tier-level signalling related
   Bool       m_profilePresentFlag[MAX_VPS_LAYER_SETS_PLUS1];    // The value with index 0 will not be used.
-#if !MULTIPLE_PTL_SUPPORT
+#if !SVC_EXTENSION
   std::vector<TComPTL>    m_pcPTLForExtn;  
 #endif
@@ -811 +807 @@
   Void    setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id)  { m_layerIdIncludedFlag[opsIdx][id] = v;    }
 
-#if !MULTIPLE_PTL_SUPPORT
+#if !SVC_EXTENSION
   TComPTL* getPTL() { return &m_pcPTL; }
 #endif
@@ -847 +843 @@
   }
 #endif
-#if MULTIPLE_PTL_SUPPORT
-  TComPTL* getPTL() { return &m_pcPTLList[0]; }
-  TComPTL* getPTL(UInt idx) { return &m_pcPTLList[idx]; }
-#endif
+  TComPTL* getPTL()                                             { return &m_pcPTLList[0]; }
+  TComPTL* getPTL(UInt idx)                                     { return &m_pcPTLList[idx]; }
+
   Int     getLayerSetLayerIdList(Int set, Int layerId)          { return m_layerSetLayerIdList[set][layerId]; }
   Void    setLayerSetLayerIdList(Int set, Int layerId, Int x)   { m_layerSetLayerIdList[set][layerId] = x;    }
@@ -928 +923 @@
   Void   setProfilePresentFlag(Int id, Bool x)                  { m_profilePresentFlag[id] = x;    }
 
-#if !MULTIPLE_PTL_SUPPORT
-  std::vector<TComPTL>* getPTLForExtnPtr()                      { return &m_pcPTLForExtn;          }
-  TComPTL* getPTLForExtn(Int id)                                { return &m_pcPTLForExtn[id];      }
-#endif
   // Target output layer signalling related
   UInt   getNumOutputLayerSets()                                { return m_numOutputLayerSets;     } 
@@ -976 +967 @@
   Int    getProfileLevelTierIdx(Int const olsIdx, Int const layerIdx)                   { return m_profileLevelTierIdx[olsIdx][layerIdx]; }
   Void   setProfileLevelTierIdx(Int const olsIdx, Int const layerIdx, Int const ptlIdx) { m_profileLevelTierIdx[olsIdx][layerIdx] = ptlIdx; }
-#if MULTIPLE_PTL_SUPPORT
   Void   addProfileLevelTierIdx(Int const olsIdx, Int const ptlIdx)             { m_profileLevelTierIdx[olsIdx].push_back(ptlIdx); }
-#endif
   Int    calculateLenOfSyntaxElement( Int const numVal );