Changeset 1237 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

13 Jul 2015, 20:56:47 (10 years ago)

Author:

seregin

Message:

port rev 4221

File:

• branches/SHM-dev/source/Lib/TLibCommon/NAL.h (modified) (1 diff)

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

@@ -50 +50 @@
   NalUnitType m_nalUnitType; ///< nal_unit_type
   UInt        m_temporalId;  ///< temporal_id
-#if SVC_EXTENSION
-  UInt        m_layerId;   ///< layer id
-#endif
-  UInt        m_reservedZero6Bits; ///< reserved_zero_6bits
+  UInt        m_nuhLayerId;  ///< nuh_layer_id
 
   /** construct an NALunit structure with given header values. */
-  NALUnit(
+NALUnit(
     NalUnitType nalUnitType,
     Int         temporalId = 0,
-#if SVC_EXTENSION
-    UInt        layerId = 0,
-#endif
-    Int         reservedZero6Bits = 0)
+    Int         nuhLayerId = 0)
     :m_nalUnitType (nalUnitType)
     ,m_temporalId  (temporalId)
-#if SVC_EXTENSION
-    ,m_layerId   (layerId)
-#endif
-    ,m_reservedZero6Bits(reservedZero6Bits)
+    ,m_nuhLayerId  (nuhLayerId)
   {}