Changeset 452 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.h

Timestamp:

8 Nov 2013, 07:19:47 (11 years ago)

Author:

seregin

Message:

remove SPS_SUB_LAYER_INFO macro

File:

• branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.h (modified) (2 diffs)

branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -72 +72 @@
   Void  parseQtRootCbf      ( UInt uiAbsPartIdx, UInt& uiQtRootCbf );
   Void  parseVPS            ( TComVPS* pcVPS );
+#if SPS_EXTENSION
 #if VPS_EXTNS
   Void  parseVPSExtension   ( TComVPS* pcVPS );
@@ -82 +83 @@
   Void  parseRepFormat      ( RepFormat *repFormat );
 #endif
-#if SPS_SUB_LAYER_INFO
   Void  parseSPS            ( TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager );
-#else
+  Void  parseSPSExtension    ( TComSPS* pcSPS );
+#else //SVC_EXTENSION
   Void  parseSPS            ( TComSPS* pcSPS );
-#endif
-#if SPS_EXTENSION
-  Void parseSPSExtension    ( TComSPS* pcSPS );
-#endif
+#endif //SVC_EXTENSION
   Void  parsePPS            ( TComPPS* pcPPS);
   Void  parseVUI            ( TComVUI* pcVUI, TComSPS* pcSPS );