Changeset 302 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibDecoder/SEIread.h

Timestamp:

28 Jun 2013, 00:40:00 (11 years ago)

Author:

seregin

Message:

update to HM11.0

File:

• branches/SHM-2.1-dev/source/Lib/TLibDecoder/SEIread.h (modified) (1 diff)

branches/SHM-2.1-dev/source/Lib/TLibDecoder/SEIread.h

@@ -78 +78 @@
   Void xParseSEITemporalLevel0Index   (SEITemporalLevel0Index &sei, UInt payloadSize);
   Void xParseSEIGradualDecodingRefreshInfo (SEIGradualDecodingRefreshInfo &sei, UInt payloadSize);
-#if J0149_TONE_MAPPING_SEI
   Void xParseSEIToneMappingInfo       (SEIToneMappingInfo& sei, UInt payloadSize);
-#endif
+  Void xParseSEISOPDescription        (SEISOPDescription &sei, UInt payloadSize);
 #if M0043_LAYERS_PRESENT_SEI
   Void xParseSEILayersPresent         (SEILayersPresent &sei, UInt payloadSize, TComVPS *vps);
-#endif
-#if L0208_SOP_DESCRIPTION_SEI
-  Void xParseSEISOPDescription        (SEISOPDescription &sei, UInt payloadSize);
-#endif
-#if K0180_SCALABLE_NESTING_SEI
-#if M0043_LAYERS_PRESENT_SEI
   Void xParseSEIScalableNesting       (SEIScalableNesting& sei, const NalUnitType nalUnitType, UInt payloadSize, TComVPS *vps, TComSPS *sps);
 #else
   Void xParseSEIScalableNesting       (SEIScalableNesting& sei, const NalUnitType nalUnitType, UInt payloadSize, TComSPS *sps);
-#endif
 #endif
   Void xParseByteAlign();