Changeset 1475 in SHVCSoftware for branches


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
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

    r1472 r1475  
    128128  ("TarDecLayerIdSetFile,l",    cfg_TargetDecLayerIdSetFile,           string(""), "targetDecLayerIdSet file name. The file should include white space separated LayerId values to be decoded. Omitting the option or a value of -1 in the file decodes all layers.")
    129129  ("RespectDefDispWindow,w",    m_respectDefDispWindow,                0,          "Only output content inside the default display window\n")
    130 #if Q0074_COLOUR_REMAPPING_SEI
    131130  ("SEIColourRemappingInfoFilename",  m_colourRemapSEIFileName,        string(""), "Colour Remapping YUV output file name. If empty, no remapping is applied (ignore SEI message)\n")
    132 #endif
    133131#if O0043_BEST_EFFORT_DECODING
    134132  ("ForceDecodeBitDepth",       m_forceDecodeBitDepth,                 0U,         "Force the decoder to operate at a particular bit-depth (best effort decoding)")

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h

    r1472 r1475  
    7474  Int           m_decodedPictureHashSEIEnabled;       ///< Checksum(3)/CRC(2)/MD5(1)/disable(0) acting on decoded picture hash SEI message
    7575  Bool          m_decodedNoDisplaySEIEnabled;         ///< Enable(true)/disable(false) writing only pictures that get displayed based on the no display SEI message
    76 #if Q0074_COLOUR_REMAPPING_SEI
    7776  std::string   m_colourRemapSEIFileName;             ///< output Colour Remapping file name
    78 #endif
    7977  std::vector<Int> m_targetDecLayerIdSet;             ///< set of LayerIds to be included in the sub-bitstream extraction process.
    8078  Int           m_respectDefDispWindow;               ///< Only output content inside the default display window
    … …  
    112110  , m_decodedPictureHashSEIEnabled(0)
    113111  , m_decodedNoDisplaySEIEnabled(false)
    114 #if Q0074_COLOUR_REMAPPING_SEI
    115112  , m_colourRemapSEIFileName()
    116 #endif
    117113  , m_targetDecLayerIdSet()
    118114  , m_respectDefDispWindow(0)

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r1472 r1475  
    6262#if SVC_EXTENSION
    6363TAppDecTop::TAppDecTop()
    64 #if Q0074_COLOUR_REMAPPING_SEI
    6564: m_pcSeiColourRemappingInfoPrevious(NULL)
    66 #endif
    6765{
    6866  memset( m_apcTDecTop, 0, sizeof(m_apcTDecTop) );
    … …  
    7775TAppDecTop::TAppDecTop()
    7876: m_iPOCLastDisplay(-MAX_INT)
    79 #if Q0074_COLOUR_REMAPPING_SEI
    8077 ,m_pcSeiColourRemappingInfoPrevious(NULL)
    81 #endif
    8278{
    8379}
    … …  
    163159#endif
    164160
    165 #if Q0074_COLOUR_REMAPPING_SEI
    166161  // clear contents of colour-remap-information-SEI output file
    167162  if (!m_colourRemapSEIFileName.empty())
    … …  
    174169    }
    175170  }
    176 #endif
    177171
    178172  // main decoder loop
    … …  
    629623  m_cTDecTop.destroy();
    630624#endif
    631 #if Q0074_COLOUR_REMAPPING_SEI
    632625  if (m_pcSeiColourRemappingInfoPrevious != NULL)
    633626  {
    … …  
    635628    m_pcSeiColourRemappingInfoPrevious = NULL;
    636629  }
    637 #endif
    638630}
    639631
    … …  
    656648  m_cTDecTop.setForceDecodeBitDepth(m_forceDecodeBitDepth);
    657649#endif
    658 
    659650  if (!m_outputDecodedSEIMessagesFilename.empty())
    660651  {
    … …  
    674665#endif
    675666
    676 #if Q0074_COLOUR_REMAPPING_SEI
    677667  if (m_pcSeiColourRemappingInfoPrevious != NULL)
    678668  {
    … …  
    680670    m_pcSeiColourRemappingInfoPrevious = NULL;
    681671  }
    682 #endif
    683672}
    684673
    … …  
    911900        }
    912901
    913 #if Q0074_COLOUR_REMAPPING_SEI
    914902        if (!m_colourRemapSEIFileName.empty())
    915903        {
    916904          xOutputColourRemapPic(pcPic);
    917905        }
    918 #endif
    919906
    920907        // update POC of display order
    … …  
    10831070        }
    10841071
    1085 #if Q0074_COLOUR_REMAPPING_SEI
    10861072        if (!m_colourRemapSEIFileName.empty())
    10871073        {
    10881074          xOutputColourRemapPic(pcPic);
    10891075        }
    1090 #endif
    10911076
    10921077        // update POC of display order
    … …  
    11461131  return false;
    11471132}
    1148 
    1149 #if Q0074_COLOUR_REMAPPING_SEI
    11501133
    11511134Void TAppDecTop::xOutputColourRemapPic(TComPic* pcPic)
    … …  
    14681451  }
    14691452}
    1470 #endif
    14711453
    14721454#if ALIGNED_BUMPING
    … …  
    14911473      conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
    14921474
    1493 #if Q0074_COLOUR_REMAPPING_SEI
    14941475    if( !m_colourRemapSEIFileName.empty() )
    14951476    {
    14961477      xOutputColourRemapPic(pic);
    14971478    }
    1498 #endif
    14991479  }
    15001480  // update POC of display order

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.h

    r1470 r1475  
    8181  std::ofstream                   m_seiMessageFileStream;         ///< Used for outputing SEI messages.
    8282
    83 #if Q0074_COLOUR_REMAPPING_SEI
    8483  SEIColourRemappingInfo*         m_pcSeiColourRemappingInfoPrevious;
    85 #endif
    8684
    8785public:
    … …  
    125123  Bool  isNaluWithinTargetDecLayerIdSet ( InputNALUnit* nalu ); ///< check whether given Nalu is within targetDecLayerIdSet
    126124
    127 #if Q0074_COLOUR_REMAPPING_SEI
    128125private:
    129126  Void applyColourRemapping(const TComPicYuv& pic, SEIColourRemappingInfo& pCriSEI, const TComSPS &activeSPS);
    130127  Void xOutputColourRemapPic(TComPic* pcPic);
    131 #endif
     128
    132129#if ALIGNED_BUMPING
    133130  Void checkOutputBeforeDecoding(Int layerIdx);

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r1463 r1475  
    773773
    774774  Int*    cfg_maxTidIlRefPicsPlus1[MAX_LAYERS];
    775 #if Q0074_COLOUR_REMAPPING_SEI
    776775  string* cfg_colourRemapSEIFileRoot[MAX_LAYERS];
    777 #endif
    778776  Bool*   cfg_entropyCodingSyncEnabledFlag[MAX_LAYERS];
    779777  Int*    cfg_layerSwitchOffBegin[MAX_LAYERS];
    … …  
    792790    cfg_dQPFileName[layer]  = &m_apcLayerCfg[layer]->m_dQPFileName;
    793791    cfg_fQP[layer]          = &m_apcLayerCfg[layer]->m_fQP;
    794 #if Q0074_COLOUR_REMAPPING_SEI
    795792    cfg_colourRemapSEIFileRoot[layer] = &m_apcLayerCfg[layer]->m_colourRemapSEIFileRoot;
    796 #endif
    797793    cfg_repFormatIdx[layer]         = &m_apcLayerCfg[layer]->m_repFormatIdx;
    798794    cfg_layerId[layer]              = &m_apcLayerCfg[layer]->m_layerId;
    … …  
    10721068  ("PhaseHorChroma%d",                              cfg_phaseHorChromaPtr,            string(""), m_numLayers, "chroma shift in the horizontal direction used in resampling proces")
    10731069  ("PhaseVerChroma%d",                              cfg_phaseVerChromaPtr,            string(""), m_numLayers, "chroma shift in the vertical   direction used in resampling proces")
    1074 #if Q0074_COLOUR_REMAPPING_SEI
    10751070  ("SEIColourRemappingInfoFileRoot%d,-cri",         cfg_colourRemapSEIFileRoot,       string(""), m_numLayers, "Colour Remapping Information SEI parameters root file name (wo num ext)")
    1076 #endif
    10771071  ("InputBitDepth%d",                                cfg_InputBitDepth[CHANNEL_TYPE_LUMA],     8, m_numLayers, "Bit-depth of input file for layer %d")
    10781072  ("InternalBitDepth%d",                             cfg_InternalBitDepth[CHANNEL_TYPE_LUMA],  0, m_numLayers, "Bit-depth the codec operates at. (default:InputBitDepth) for layer %d "
    … …  
    14601454  ("Log2MaxMvLengthVertical",                         m_log2MaxMvLengthVertical,                           15, "Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units")
    14611455#if !SVC_EXTENSION
    1462 #if Q0074_COLOUR_REMAPPING_SEI
    14631456  ("SEIColourRemappingInfoFileRoot,-cri",             m_colourRemapSEIFileRoot,                    string(""), "Colour Remapping Information SEI parameters root file name (wo num ext)")
    1464 #endif
    14651457#endif
    14661458  ("SEIRecoveryPoint",                                m_recoveryPointSEIEnabled,                        false, "Control generation of recovery point SEI messages")

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

    r1460 r1475  
    458458  Int       m_log2MaxMvLengthVertical;                        ///< Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units
    459459#if !SVC_EXTENSION
    460 #if Q0074_COLOUR_REMAPPING_SEI
    461460  std::string m_colourRemapSEIFileRoot;
    462 #endif
    463461#endif
    464462

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

    r1460 r1475  
    134134
    135135  Int       m_repFormatIdx;
    136 #if Q0074_COLOUR_REMAPPING_SEI
    137136  string    m_colourRemapSEIFileRoot;
    138 #endif
    139137
    140138  Int       m_layerSwitchOffBegin;

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r1460 r1475  
    509509    Int&           m_maxTempLayer                               = m_apcLayerCfg[layer]->m_maxTempLayer;
    510510
    511 #if Q0074_COLOUR_REMAPPING_SEI
    512511    string&        m_colourRemapSEIFileRoot                     = m_apcLayerCfg[layer]->m_colourRemapSEIFileRoot;
    513 #endif
    514512#endif
    515513
    … …  
    766764  m_cTEncTop.setKneeSEIInputKneePoint                             ( m_kneeSEIInputKneePoint );
    767765  m_cTEncTop.setKneeSEIOutputKneePoint                            ( m_kneeSEIOutputKneePoint );
    768 #if Q0074_COLOUR_REMAPPING_SEI
    769766  m_cTEncTop.setColourRemapInfoSEIFileRoot                        ( m_colourRemapSEIFileRoot );
    770 #endif
    771767  m_cTEncTop.setMasteringDisplaySEI                               ( m_masteringDisplay );
    772768

  • 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.