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

Timestamp:

13 Nov 2013, 23:25:47 (11 years ago)

Author:

nokia

Message:

Integration of O0194: Support different bit-depth values for different layers, enable weighted prediction for ILR for color gamut scalability.

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 );
@@ -83 +82 @@
   Void  parseRepFormat      ( RepFormat *repFormat );
 #endif
+#if SPS_SUB_LAYER_INFO
   Void  parseSPS            ( TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager );
-  Void  parseSPSExtension    ( TComSPS* pcSPS );
-#else //SVC_EXTENSION
+#else
   Void  parseSPS            ( TComSPS* pcSPS );
-#endif //SVC_EXTENSION
+#endif
+#if SPS_EXTENSION
+  Void parseSPSExtension    ( TComSPS* pcSPS );
+#endif
   Void  parsePPS            ( TComPPS* pcPPS);
   Void  parseVUI            ( TComVUI* pcVUI, TComSPS* pcSPS );