Changeset 1475 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

Timestamp:

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

Author:

seregin

Message:

port rev 4600, remove macro Q0074_COLOUR_REMAPPING_SEI

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (modified) (4 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -321 +321 @@
   Int*      m_kneeSEIInputKneePoint;
   Int*      m_kneeSEIOutputKneePoint;
-#if Q0074_COLOUR_REMAPPING_SEI
   std::string m_colourRemapSEIFileRoot;          ///< SEI Colour Remapping File (initialized from external file)
-#endif
   TComSEIMasteringDisplay m_masteringDisplay;
   //====== Weighted Prediction ========
@@ -486 +484 @@
 #endif
 #endif //SVC_EXTENSION
-#if Q0074_COLOUR_REMAPPING_SEI
-  string                              m_colourRemapSEIFileName;          ///< SEI Colour Remapping File (initialized from external file)
-#endif
 
 public:
@@ -494 +489 @@
   : m_tileColumnWidth()
   , m_tileRowHeight()
-#if Q0074_COLOUR_REMAPPING_SEI
-  , m_colourRemapSEIFileName()
-#endif
   {
     m_PCMBitDepth[CHANNEL_TYPE_LUMA]=8;
@@ -910 +902 @@
   Void  setKneeSEIOutputKneePoint(Int *p)                            { m_kneeSEIOutputKneePoint = p; }
   Int*  getKneeSEIOutputKneePoint()                                  { return m_kneeSEIOutputKneePoint; }
-#if Q0074_COLOUR_REMAPPING_SEI
   Void  setColourRemapInfoSEIFileRoot( const std::string &s )        { m_colourRemapSEIFileRoot = s; }
   const std::string &getColourRemapInfoSEIFileRoot() const           { return m_colourRemapSEIFileRoot; }
-#endif
   Void  setMasteringDisplaySEI(const TComSEIMasteringDisplay &src)   { m_masteringDisplay = src; }
   const TComSEIMasteringDisplay &getMasteringDisplaySEI() const      { return m_masteringDisplay; }