Changeset 108 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComSlice.h

Timestamp:

2 Apr 2013, 22:50:17 (12 years ago)

Author:

qualcomm

Message:

Rename VPS syntax elements (MACRO: VPS_RENAME)

Rename variables vps_max_nuh_reserved_zero_layer_id and vps_max_op_sets_minus1 to vps_max_layer_id and vps_num_layer_sets_minus1.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

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

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

@@ -484 +484 @@
 
   UInt        m_numHrdParameters;
+#if !VPS_RENAME
   UInt        m_maxNuhReservedZeroLayerId;
+#endif
   TComHRD*    m_hrdParameters;
   UInt*       m_hrdOpSetIdx;
   Bool*       m_cprmsPresentFlag;
+#if VPS_RENAME
+  UInt        m_maxLayerId;
+  UInt        m_numLayerSets;
+  Bool        m_layerIdIncludedFlag[MAX_VPS_LAYER_SETS_PLUS1][MAX_VPS_LAYER_ID_PLUS1];
+#else
   UInt        m_numOpSets;
   Bool        m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1];
+#endif
 
   TComPTL     m_pcPTL;
@@ -540 +548 @@
   Void    setNumHrdParameters(UInt v)                           { m_numHrdParameters = v;    }
 
+#if VPS_RENAME
+  UInt    getMaxLayerId()                                       { return m_maxLayerId; }
+  Void    setMaxLayerId(UInt v)                                 { m_maxLayerId = v;    }
+
+  UInt    getNumLayerSets()                                     { return m_numLayerSets; }
+  Void    setNumLayerSets(UInt v)                               { m_numLayerSets = v;    }
+#else
   UInt    getMaxNuhReservedZeroLayerId()                        { return m_maxNuhReservedZeroLayerId; }
   Void    setMaxNuhReservedZeroLayerId(UInt v)                  { m_maxNuhReservedZeroLayerId = v;    }
@@ -545 +560 @@
   UInt    getMaxOpSets()                                        { return m_numOpSets; }
   Void    setMaxOpSets(UInt v)                                  { m_numOpSets = v;    }
+#endif
   Bool    getLayerIdIncludedFlag(UInt opsIdx, UInt id)          { return m_layerIdIncludedFlag[opsIdx][id]; }
   Void    setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id)  { m_layerIdIncludedFlag[opsIdx][id] = v;    }