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

Timestamp:

1 Sep 2013, 22:47:26 (12 years ago)

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

File:

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

trunk/source/Lib/TLibCommon/NAL.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -46 +46 @@
 {
   NalUnitType m_nalUnitType; ///< nal_unit_type
-  Bool        m_nalRefFlag;  ///< nal_ref_flag
-#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
-  unsigned    m_layerId;
-  unsigned    m_temporalId;  ///< temporal_id
+  UInt        m_temporalId;  ///< temporal_id
+#if H_MV
+  Int         m_layerId;     ///< layer id
 #else
-  Int         m_viewId;      ///< view_id
-  Bool        m_isDepth;     ///< is_depth
-  unsigned    m_temporalId;  ///< temporal_id
+  UInt        m_reservedZero6Bits; ///< reserved_zero_6bits
 #endif
 
@@ -59 +56 @@
   NALUnit(
     NalUnitType nalUnitType,
-    Bool        nalRefFlag,
-#if !VIDYO_VPS_INTEGRATION & !QC_MVHEVC_B0046    
-    Int         viewId,
-    Bool        isDepth,
+    Int         temporalId = 0,
+#if H_MV
+    Int         layerId = 0)
 #else
-    unsigned    layerId,
+    Int         reservedZero6Bits = 0)
 #endif
-    unsigned       temporalId = 0)
     :m_nalUnitType (nalUnitType)
-    ,m_nalRefFlag  (nalRefFlag)
-#if !VIDYO_VPS_INTEGRATION & !QC_MVHEVC_B0046
-    ,m_viewId      (viewId)
-    ,m_isDepth     (isDepth)
+    ,m_temporalId  (temporalId)
+#if H_MV
+    ,m_layerId     (layerId)
 #else
-    ,m_layerId     (layerId)
+    ,m_reservedZero6Bits(reservedZero6Bits)
 #endif
-    ,m_temporalId  (temporalId)
   {}
 
@@ -82 +75 @@
 
   /** returns true if the NALunit is a slice NALunit */
-  bool isSlice()
+  Bool isSlice()
   {
-    return m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR
-#if !QC_REM_IDV_B0046    
-        || m_nalUnitType == NAL_UNIT_CODED_SLICE_IDV
-#endif
+    return m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_R
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_N
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA_R
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_N
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_R
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_N
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_RADL
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_N_LP
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA
-        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA
-        || m_nalUnitType == NAL_UNIT_CODED_SLICE;
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_RADL_N
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_RADL_R
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_RASL_N
+        || m_nalUnitType == NAL_UNIT_CODED_SLICE_RASL_R;
+  }
+  Bool isSei()
+  {
+    return m_nalUnitType == NAL_UNIT_PREFIX_SEI 
+        || m_nalUnitType == NAL_UNIT_SUFFIX_SEI;
+  }
+
+  Bool isVcl()
+  {
+    return ( (UInt)m_nalUnitType < 32 );
   }
 };