Ticket #750: TargetDecLayer_NALInit_fix.patch

source/App/TAppDecoder/TAppDecTop.cpp

@@ -373 +373 @@
   }
   for (std::vector<Int>::iterator it = m_targetDecLayerIdSet.begin(); it != m_targetDecLayerIdSet.end(); it++)
   {
-    if ( nalu->m_reserved_one_6bits == (*it) )
+    if ( nalu->m_reserved_zero_6bits == (*it) )
     {
       return true;
     }

source/Lib/TLibCommon/NAL.h

@@ -50 +50 @@
 #endif
   unsigned    m_temporalId;  ///< temporal_id
 #if TARGET_DECLAYERID_SET
-  unsigned    m_reserved_one_6bits; ///< reserved_one_6bits
+  unsigned    m_reserved_zero_6bits; ///< reserved_zero_6bits
 #endif
 
   /** construct an NALunit structure with given header values. */
@@ -60 +60 @@
     Bool        nalRefFlag,
 #endif
 #if TARGET_DECLAYERID_SET
-    Int         reserved_one_6bits = 0,
+    Int         temporalId = 0,
+    Int         reserved_zero_6bits = 0)
+#else
+    Int         temporalId = 0)
 #endif
-    Int         temporalId = 0)
     :m_nalUnitType (nalUnitType)
 #if !REMOVE_NAL_REF_FLAG
     ,m_nalRefFlag  (nalRefFlag)
 #endif
     ,m_temporalId  (temporalId)
 #if TARGET_DECLAYERID_SET
-    ,m_reserved_one_6bits(reserved_one_6bits)
+    ,m_reserved_zero_6bits(reserved_zero_6bits)
 #endif
   {}
 

source/Lib/TLibDecoder/NALread.cpp

@@ -71 +71 @@
   assert(forbidden_zero_bit == 0);
   nalu.m_nalUnitType = (NalUnitType) bs.read(6);  // nal_unit_type
 #if TARGET_DECLAYERID_SET
-  nalu.m_reserved_one_6bits = bs.read(6);       // nuh_reserved_zero_6bits
-  assert(nalu.m_reserved_one_6bits == 0);
+  nalu.m_reserved_zero_6bits = bs.read(6);       // nuh_reserved_zero_6bits
+  assert(nalu.m_reserved_zero_6bits == 0);
 #else
   unsigned reserved_one_6bits = bs.read(6);       // nuh_reserved_zero_6bits
   assert(reserved_one_6bits == 0);

source/Lib/TLibEncoder/NALwrite.cpp

@@ -53 +53 @@
 
   bsNALUHeader.write(0,1);                    // forbidden_zero_bit
   bsNALUHeader.write(nalu.m_nalUnitType, 6);  // nal_unit_type
+#if TARGET_DECLAYERID_SET
+  bsNALUHeader.write(nalu.m_reserved_zero_6bits, 6);                   // nuh_reserved_zero_6bits
+#else
   bsNALUHeader.write(0, 6);                   // nuh_reserved_zero_6bits
+#endif
   bsNALUHeader.write(nalu.m_temporalId+1, 3); // nuh_temporal_id_plus1
 
   out.write(bsNALUHeader.getByteStream(), bsNALUHeader.getByteStreamLength());
@@ -170 +174 @@
 #if !REMOVE_NAL_REF_FLAG
   naluDest.m_nalRefFlag  = naluSrc.m_nalRefFlag;
 #endif
+#if TARGET_DECLAYERID_SET
+  naluDest.m_reserved_zero_6bits  = naluSrc.m_reserved_zero_6bits;
+#endif
   naluDest.m_temporalId  = naluSrc.m_temporalId;
   naluDest.m_Bitstream   = naluSrc.m_Bitstream;
 }

source/Lib/TLibEncoder/NALwrite.h

@@ -58 +58 @@
 #if !REMOVE_NAL_REF_FLAG
     Bool nalRefFlag,
 #endif
+#if TARGET_DECLAYERID_SET
+    unsigned temporalID = 0,
+    unsigned reserved_zero_6bits = 0)
+#else
     unsigned temporalID = 0)
+#endif
 #if REMOVE_NAL_REF_FLAG
+#if TARGET_DECLAYERID_SET
+  : NALUnit(nalUnitType, temporalID, reserved_zero_6bits)
+#else
   : NALUnit(nalUnitType, temporalID)
+#endif
 #else
   : NALUnit(nalUnitType, nalRefFlag, temporalID)
 #endif