Changeset 408 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib

Timestamp:

4 Oct 2013, 02:16:14 (11 years ago)

Author:

qualcomm

Message:

N0085: nuh_layer_id value of VPS NALU (MACRO: VPS_NUH_LAYER_ID)

Added assert statement in the decoder to ensure that the value of nuh_layer_id of VPS NAL unit shall be equal to 0. In the encoder, the value of nuh_layer_id of VPS would always be 0.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-3.1-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -47 +47 @@
 #define HM12_RANDOM_ACCESS               1
 #define RANDOM_ACCESS_SEI_FIX            1
-
+#define VPS_NUH_LAYER_ID                 1      ///< N0085: Assert that the nuh_layer_id of VPS NAL unit should be 0
 #if SVC_EXTENSION
 #define MAX_LAYERS                       2      ///< max number of layers the codec is supposed to handle

branches/SHM-3.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1315 +1315 @@
   {
     case NAL_UNIT_VPS:
+#if VPS_NUH_LAYER_ID
+      assert( nalu.m_layerId == 0 ); // Non-conforming bitstream. The value of nuh_layer_id of VPS NAL unit shall be equal to 0.
+#endif
       xDecodeVPS();
 #if AVC_BASE

branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1343 +1343 @@
     {
 #if SVC_EXTENSION
+#if VPS_NUH_LAYER_ID
+      OutputNALUnit nalu(NAL_UNIT_VPS, 0, 0        ); // The value of nuh_layer_id of VPS NAL unit shall be equal to 0.
+#else
       OutputNALUnit nalu(NAL_UNIT_VPS, 0, m_layerId);
+#endif
 #if AVC_BASE
       if( ( m_layerId == 1 && m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) )