Changeset 546 in SHVCSoftware

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

Files:

• App/TAppDecoder/TAppDecCfg.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (2 diffs)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)

branches/SHM-4.1-dev/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -144 +144 @@
   m_tgtLayerId = nLayerNum - 1;
   assert( m_tgtLayerId >= 0 );
+#if O0137_MAX_LAYERID
+  assert( m_tgtLayerId < MAX_NUM_LAYER_IDS );
+#endif
 #if OUTPUT_LAYER_SET_INDEX  
   this->getCommonDecoderParams()->setOutputLayerSetIdx( olsIdx       );

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

@@ -49 +49 @@
 #define MAX_LAYERS                       2      ///< max number of layers the codec is supposed to handle
 
+#define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
+
 #define O0109_O0199_FLAGS_TO_VUI         1      ///< JCTVC-O0109, O0199: move single_layer_for_non_irap_flag and higher_layer_flag to vps_vui
 #define O0109_VIEW_ID_LEN                1      ///< JCTVC-O0109: view_id_len_minus1 to view_id_len, and add constraint (1<<view_id_len) is greater than or equal to NumViews
@@ -253 +255 @@
 
 #define MAX_CPB_CNT                     32  ///< Upper bound of (cpb_cnt_minus1 + 1)
+#if O0137_MAX_LAYERID
+#define MAX_NUM_LAYER_IDS                63
+#else
 #define MAX_NUM_LAYER_IDS                64
-
+#endif
 #define COEF_REMAIN_BIN_REDUCTION        3 ///< indicates the level at which the VLC 
                                            ///< transitions from Golomb-Rice to TU+EG(k)

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)
   {