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


Ignore:
Timestamp:
22 Sep 2015, 20:18:26 (9 years ago)
Author:
seregin
Message:

port rev 4600, remove macro Q0074_COLOUR_REMAPPING_SEI

Location:
branches/SHM-dev/source/Lib
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp

    r1460 r1475  
    149149    case SEI::TEMP_MOTION_CONSTRAINED_TILE_SETS:    return "Temporal motion constrained tile sets";
    150150    case SEI::CHROMA_RESAMPLING_FILTER_HINT:        return "Chroma sampling filter hint";
    151 #if Q0074_COLOUR_REMAPPING_SEI
    152151    case SEI::COLOUR_REMAPPING_INFO:                return "Colour remapping info";
    153 #endif
    154152#if SVC_EXTENSION
    155153#if LAYERS_NOT_PRESENT_SEI
    … …  
    183181}
    184182
    185 
    186183#if SUB_BITSTREAM_PROPERTY_SEI
    187184SEISubBitstreamProperty::SEISubBitstreamProperty()

  • branches/SHM-dev/source/Lib/TLibCommon/SEI.h

    r1460 r1475  
    9191    CHROMA_RESAMPLING_FILTER_HINT        = 140,
    9292    KNEE_FUNCTION_INFO                   = 141,
    93 #if Q0074_COLOUR_REMAPPING_SEI
    9493    COLOUR_REMAPPING_INFO                = 142,
    95 #endif
    9694#if LAYERS_NOT_PRESENT_SEI
    9795    LAYERS_NOT_PRESENT                   = 160,
    … …  
    459457};
    460458
    461 #if Q0074_COLOUR_REMAPPING_SEI
    462459class SEIColourRemappingInfo : public SEI
    463460{
    … …  
    501498  std::vector<CRIlut> m_postLut[3];
    502499};
    503 #endif
    504500
    505501class SEIChromaResamplingFilterHint : public SEI

  • branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

    r1460 r1475  
    165165#define T0196_SELECTIVE_RDOQ                              1 ///< selective RDOQ
    166166#define U0040_MODIFIED_WEIGHTEDPREDICTION_WITH_BIPRED_AND_CLIPPING 1
    167 #define Q0074_COLOUR_REMAPPING_SEI                        1      ///< JCTVC-Q0074, JCTVC-R0344: SEI Colour Remapping Information
    168167
    169168// ====================================================================================================================
    … …  
    378377};
    379378
    380 #if Q0074_COLOUR_REMAPPING_SEI
    381379enum MATRIX_COEFFICIENTS // Table E.5 (Matrix coefficients)
    382380{
    … …  
    393391  MATRIX_COEFFICIENTS_BT2020_CONSTANT_LUMINANCE     = 10,
    394392};
    395 #endif
    396393
    397394enum DeblockEdgeDir

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

    r1460 r1475  
    308308      xParseSEIKneeFunctionInfo((SEIKneeFunctionInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
    309309      break;
    310 #if Q0074_COLOUR_REMAPPING_SEI
    311310    case SEI::COLOUR_REMAPPING_INFO:
    312311      sei = new SEIColourRemappingInfo;
    313312      xParseSEIColourRemappingInfo((SEIColourRemappingInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
    314313      break;
    315 #endif
    316314    case SEI::MASTERING_DISPLAY_COLOUR_VOLUME:
    317315      sei = new SEIMasteringDisplayColourVolume;
    … …  
    13351333}
    13361334
    1337 #if Q0074_COLOUR_REMAPPING_SEI
    13381335Void SEIReader::xParseSEIColourRemappingInfo(SEIColourRemappingInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
    13391336{
    … …  
    14241421  }
    14251422}
    1426 #endif
    14271423
    14281424Void SEIReader::xParseSEIMasteringDisplayColourVolume(SEIMasteringDisplayColourVolume& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)

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

    r1460 r1475  
    108108  Void xParseSEIKneeFunctionInfo              (SEIKneeFunctionInfo& sei,              UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
    109109  Void xParseSEIMasteringDisplayColourVolume  (SEIMasteringDisplayColourVolume& sei,  UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
    110 #if Q0074_COLOUR_REMAPPING_SEI
    111110  Void xParseSEIColourRemappingInfo           (SEIColourRemappingInfo& sei,           UInt payloadSize,                     std::ostream *pDecodedMessageOutputStream);
    112 #endif
    113111
    114112  Void sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const TChar *pSymbolName);

  • branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.cpp

    r1460 r1475  
    421421}
    422422
    423 #if Q0074_COLOUR_REMAPPING_SEI
    424423template <typename T>
    425424static Void readTokenValue(T            &returnedValue, /// value returned
    … …  
    593592  return true;
    594593}
    595 #endif
    596594
    597595Void SEIEncoder::initSEIChromaResamplingFilterHint(SEIChromaResamplingFilterHint *seiChromaResamplingFilterHint, Int iHorFilterIndex, Int iVerFilterIndex)

  • branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.h

    r1460 r1475  
    8181  Void initSEIChromaResamplingFilterHint(SEIChromaResamplingFilterHint *sei, Int iHorFilterIndex, Int iVerFilterIndex);
    8282  Void initSEITimeCode(SEITimeCode *sei);
    83 #if Q0074_COLOUR_REMAPPING_SEI
    8483  Bool initSEIColourRemappingInfo(SEIColourRemappingInfo *sei, Int currPOC); // returns true on success, false on failure.
    85 #endif
    8684
    8785#if LAYERS_NOT_PRESENT_SEI

  • branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp

    r1460 r1475  
    152152    xWriteSEIKneeFunctionInfo(*static_cast<const SEIKneeFunctionInfo*>(&sei));
    153153    break;
    154 #if Q0074_COLOUR_REMAPPING_SEI
    155154  case SEI::COLOUR_REMAPPING_INFO:
    156155    xWriteSEIColourRemappingInfo(*static_cast<const SEIColourRemappingInfo*>(&sei));
    157156    break;
    158 #endif
    159157  case SEI::MASTERING_DISPLAY_COLOUR_VOLUME:
    160158    xWriteSEIMasteringDisplayColourVolume(*static_cast<const SEIMasteringDisplayColourVolume*>(&sei));
    … …  
    987985}
    988986
    989 #if Q0074_COLOUR_REMAPPING_SEI
    990987Void SEIWriter::xWriteSEIColourRemappingInfo(const SEIColourRemappingInfo& sei)
    991988{
    … …  
    10441041  }
    10451042}
    1046 #endif
    10471043
    10481044Void SEIWriter::xWriteSEIMasteringDisplayColourVolume(const SEIMasteringDisplayColourVolume& sei)

  • branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h

    r1460 r1475  
    8989  Void xWriteSEIChromaResamplingFilterHint(const SEIChromaResamplingFilterHint& sei);
    9090  Void xWriteSEIKneeFunctionInfo(const SEIKneeFunctionInfo &sei);
    91 #if Q0074_COLOUR_REMAPPING_SEI
    9291  Void xWriteSEIColourRemappingInfo(const SEIColourRemappingInfo& sei);
    93 #endif
    9492  Void xWriteSEIMasteringDisplayColourVolume( const SEIMasteringDisplayColourVolume& sei);
    9593

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

    r1460 r1475  
    321321  Int*      m_kneeSEIInputKneePoint;
    322322  Int*      m_kneeSEIOutputKneePoint;
    323 #if Q0074_COLOUR_REMAPPING_SEI
    324323  std::string m_colourRemapSEIFileRoot;          ///< SEI Colour Remapping File (initialized from external file)
    325 #endif
    326324  TComSEIMasteringDisplay m_masteringDisplay;
    327325  //====== Weighted Prediction ========
    … …  
    486484#endif
    487485#endif //SVC_EXTENSION
    488 #if Q0074_COLOUR_REMAPPING_SEI
    489   string                              m_colourRemapSEIFileName;          ///< SEI Colour Remapping File (initialized from external file)
    490 #endif
    491486
    492487public:
    … …  
    494489  : m_tileColumnWidth()
    495490  , m_tileRowHeight()
    496 #if Q0074_COLOUR_REMAPPING_SEI
    497   , m_colourRemapSEIFileName()
    498 #endif
    499491  {
    500492    m_PCMBitDepth[CHANNEL_TYPE_LUMA]=8;
    … …  
    910902  Void  setKneeSEIOutputKneePoint(Int *p)                            { m_kneeSEIOutputKneePoint = p; }
    911903  Int*  getKneeSEIOutputKneePoint()                                  { return m_kneeSEIOutputKneePoint; }
    912 #if Q0074_COLOUR_REMAPPING_SEI
    913904  Void  setColourRemapInfoSEIFileRoot( const std::string &s )        { m_colourRemapSEIFileRoot = s; }
    914905  const std::string &getColourRemapInfoSEIFileRoot() const           { return m_colourRemapSEIFileRoot; }
    915 #endif
    916906  Void  setMasteringDisplaySEI(const TComSEIMasteringDisplay &src)   { m_masteringDisplay = src; }
    917907  const TComSEIMasteringDisplay &getMasteringDisplaySEI() const      { return m_masteringDisplay; }

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r1460 r1475  
    750750  }
    751751
    752 #if Q0074_COLOUR_REMAPPING_SEI
    753752  // insert one Colour Remapping Info SEI for the picture (if the file exists)
    754753  if (!m_pcCfg->getColourRemapInfoSEIFileRoot().empty())
    … …  
    766765    }
    767766  }
    768 #endif
    769767
    770768#if Q0189_TMVP_CONSTRAINTS
Note: See TracChangeset for help on using the changeset viewer.