Changeset 546 in SHVCSoftware for branches/SHM-4.1-dev/source/Lib/TLibDecoder

Timestamp:

15 Jan 2014, 01:06:24 (11 years ago)

Author:

qualcomm

Message:

JCTVC-O0137: Reserve value 63 for vps_max_layers_minus1 (Macro: O0137_MAX_LAYERID)

Reserve the value of 63 for vps_max_layers_minus1, but allow bistreams to contain the value. Decoder ignore NUTs with layer ID equal to 63.

Patch from Karsten Suehring <karsten.suehring@…>

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-4.1-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (1 diff)

branches/SHM-4.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -866 +866 @@
   READ_CODE( 2,  uiCode,  "vps_reserved_three_2bits" );           assert(uiCode == 3);
 #if VPS_RENAME
-  READ_CODE( 6,  uiCode,  "vps_max_layers_minus1" );              pcVPS->setMaxLayers( uiCode + 1);
+#if O0137_MAX_LAYERID
+  READ_CODE( 6,  uiCode,  "vps_max_layers_minus1" );              pcVPS->setMaxLayers( min( 62u, uiCode) + 1 );
+#else
+  READ_CODE( 6,  uiCode,  "vps_max_layers_minus1" );              pcVPS->setMaxLayers( uiCode + 1 );
+#endif
 #else
   READ_CODE( 6,  uiCode,  "vps_reserved_zero_6bits" );            assert(uiCode == 0);

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

@@ -1734 +1734 @@
   m_cEntropyDecoder.setBitstream      (nalu.m_Bitstream);
 
+#if O0137_MAX_LAYERID
+  // ignore any NAL units with nuh_layer_id == 63
+  if (nalu.m_layerId == 63 )
+  {  
+    return false;
+  }
+#endif
   switch (nalu.m_nalUnitType)
   {