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

Timestamp:

22 Sep 2015, 20:18:26 (10 years ago)

Author:

seregin

Message:

port rev 4600, remove macro Q0074_COLOUR_REMAPPING_SEI

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• SEIread.cpp (modified) (3 diffs)
• SEIread.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp ¶

@@ -308 +308 @@
       xParseSEIKneeFunctionInfo((SEIKneeFunctionInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
       break;
-#if Q0074_COLOUR_REMAPPING_SEI
     case SEI::COLOUR_REMAPPING_INFO:
       sei = new SEIColourRemappingInfo;
       xParseSEIColourRemappingInfo((SEIColourRemappingInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
       break;
-#endif
     case SEI::MASTERING_DISPLAY_COLOUR_VOLUME:
       sei = new SEIMasteringDisplayColourVolume;
@@ -1335 +1333 @@
 }
 
-#if Q0074_COLOUR_REMAPPING_SEI
 Void SEIReader::xParseSEIColourRemappingInfo(SEIColourRemappingInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
 {
@@ -1424 +1421 @@
   }
 }
-#endif
 
 Void SEIReader::xParseSEIMasteringDisplayColourVolume(SEIMasteringDisplayColourVolume& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)

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

@@ -108 +108 @@
   Void xParseSEIKneeFunctionInfo              (SEIKneeFunctionInfo& sei,              UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
   Void xParseSEIMasteringDisplayColourVolume  (SEIMasteringDisplayColourVolume& sei,  UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
-#if Q0074_COLOUR_REMAPPING_SEI
   Void xParseSEIColourRemappingInfo           (SEIColourRemappingInfo& sei,           UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
-#endif
 
   Void sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const TChar *pSymbolName);