Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibCommon/NAL.h

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/Lib/TLibCommon/NAL.h (modified) (6 diffs)

trunk/source/Lib/TLibCommon/NAL.h

@@ -4 +4 @@
  * granted under this license.
  *
-* Copyright (c) 2010-2015, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -34 +34 @@
 #pragma once
 
-#include <vector>
+#ifndef __NAL__
+#define __NAL__
+
 #include <sstream>
 #include "CommonDef.h"
+#if NH_MV
+#include <vector>
+#endif
 
 class TComOutputBitstream;
@@ -47 +52 @@
   NalUnitType m_nalUnitType; ///< nal_unit_type
   UInt        m_temporalId;  ///< temporal_id
-#if H_MV
-  Int         m_layerId;     ///< layer id
+#if NH_MV
+  Int         m_nuhLayerId;     ///< layer id
 #else
-  UInt        m_reservedZero6Bits; ///< reserved_zero_6bits
+  UInt        m_nuhLayerId;  ///< nuh_layer_id
 #endif
 
+  NALUnit(const NALUnit &src)
+  :m_nalUnitType (src.m_nalUnitType)
+  ,m_temporalId  (src.m_temporalId)
+  ,m_nuhLayerId  (src.m_nuhLayerId)
+  { }
   /** construct an NALunit structure with given header values. */
   NALUnit(
     NalUnitType nalUnitType,
     Int         temporalId = 0,
-#if H_MV
-    Int         layerId = 0)
-#else
-    Int         reservedZero6Bits = 0)
-#endif
+    Int         nuhLayerId = 0)
     :m_nalUnitType (nalUnitType)
     ,m_temporalId  (temporalId)
-#if H_MV
-    ,m_layerId     (layerId)
-#else
-    ,m_reservedZero6Bits(reservedZero6Bits)
-#endif
+    ,m_nuhLayerId  (nuhLayerId)
   {}
 
-  /** default constructor - no initialization; must be perfomed by user */
+  /** default constructor - no initialization; must be performed by user */
   NALUnit() {}
+
+  virtual ~NALUnit() { }
 
   /** returns true if the NALunit is a slice NALunit */
@@ -96 +100 @@
   Bool isSei()
   {
-    return m_nalUnitType == NAL_UNIT_PREFIX_SEI 
+    return m_nalUnitType == NAL_UNIT_PREFIX_SEI
         || m_nalUnitType == NAL_UNIT_SUFFIX_SEI;
   }
@@ -116 +120 @@
 
   /**
-   * convert the OutputNALUnit #nalu# into EBSP format by writing out
+   * convert the OutputNALUnit nalu into EBSP format by writing out
    * the NALUnit header, then the rbsp_bytes including any
    * emulation_prevention_three_byte symbols.
@@ -124 +128 @@
 //! \}
 //! \}
+
+#endif