Changeset 1179 in SHVCSoftware

Timestamp:

8 Jul 2015, 02:47:00 (9 years ago)

Author:

seregin

Message:

macro cleanup: O0137_MAX_LAYERID

Location:

branches/SHM-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-dev/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -164 +164 @@
 
   assert( targetLayerId >= 0 );
-#if O0137_MAX_LAYERID
   assert( targetLayerId < MAX_NUM_LAYER_IDS );
-#endif
+
 #if CONFORMANCE_BITSTREAM_MODE
   if( m_confModeFlag )

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

@@ -55 +55 @@
 #define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
 #define VPS_VUI_BSP_HRD_PARAMS           1      ///< JCTVC-R0231: Define the VPS VUI BSP hrd_params() as a separate function, and apply changes adopted.
-#define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
 
 #define R0226_CONSTRAINT_TMVP_SEI        1      ///< JCTVC-R0226, Modification to semantics in temporal motion vector prediction constraints SEI message
@@ -265 +264 @@
 #define MAX_CPB_CNT                                      32 ///< Upper bound of (cpb_cnt_minus1 + 1)
 
-#if O0137_MAX_LAYERID
+#if SVC_EXTENSION
 #define MAX_NUM_LAYER_IDS                                63
 #else

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

@@ -1008 +1008 @@
 #endif
 #if SVC_EXTENSION
-#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
   assert( pcVPS->getBaseLayerInternalFlag() || pcVPS->getMaxLayers() > 1 );
 #else

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

@@ -2072 +2072 @@
   m_cEntropyDecoder.setBitstream      (nalu.m_Bitstream);
 
-#if O0137_MAX_LAYERID
+#if SVC_EXTENSION
   // ignore any NAL units with nuh_layer_id == 63
-  if (nalu.m_layerId == 63 )
+  if( nalu.m_layerId == 63 )
   {  
     return false;