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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0137_MAX_LAYERID

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

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

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;