From f2ba2fb3693d43149d1fbbd5e7ddff84be6e4c76 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Fri, 15 Jan 2021 11:11:22 -0500
Subject: [PATCH] remove macro JVET_T0053_ANNOTATED_REGIONS_SEI
---
source/App/DecoderApp/DecApp.cpp | 10 ----------
source/App/DecoderApp/DecApp.h | 4 ----
source/App/DecoderApp/DecAppCfg.cpp | 4 ----
source/App/DecoderApp/DecAppCfg.h | 2 --
source/App/EncoderApp/EncApp.cpp | 2 --
source/App/EncoderApp/EncAppCfg.cpp | 2 --
source/App/EncoderApp/EncAppCfg.h | 2 --
source/Lib/CommonLib/SEI.cpp | 2 --
source/Lib/CommonLib/SEI.h | 4 ----
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/SEIread.cpp | 4 ----
source/Lib/DecoderLib/SEIread.h | 2 --
source/Lib/EncoderLib/EncCfg.h | 6 ------
source/Lib/EncoderLib/EncGOP.cpp | 2 --
source/Lib/EncoderLib/SEIEncoder.cpp | 2 --
source/Lib/EncoderLib/SEIEncoder.h | 2 --
source/Lib/EncoderLib/SEIwrite.cpp | 4 ----
source/Lib/EncoderLib/SEIwrite.h | 2 --
18 files changed, 57 deletions(-)
diff --git a/source/App/DecoderApp/DecApp.cpp b/source/App/DecoderApp/DecApp.cpp
index 600438cc9b..227f27c983 100644
--- a/source/App/DecoderApp/DecApp.cpp
+++ b/source/App/DecoderApp/DecApp.cpp
@@ -123,7 +123,6 @@ uint32_t DecApp::decode()
}
}
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
// clear contents of annotated-Regions-SEI output file
if (!m_annotatedRegionsSEIFileName.empty())
{
@@ -134,7 +133,6 @@ uint32_t DecApp::decode()
exit(EXIT_FAILURE);
}
}
-#endif
// main decoder loop
bool loopFiltered[MAX_VPS_LAYERS] = { false };
@@ -349,12 +347,10 @@ uint32_t DecApp::decode()
m_cVideoIOYuvReconFile[nalu.m_nuhLayerId].setBitdepthShift(channelType, reconBitdepth - fileBitdepth);
}
}
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
if (!m_annotatedRegionsSEIFileName.empty())
{
xOutputAnnotatedRegions(pcListPic);
}
-#endif
// write reconstruction to file
if( bNewPicture )
{
@@ -363,12 +359,10 @@ uint32_t DecApp::decode()
}
if (nalu.m_nalUnitType == NAL_UNIT_EOS)
{
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
if (!m_annotatedRegionsSEIFileName.empty() && bNewPicture)
{
xOutputAnnotatedRegions(pcListPic);
}
-#endif
setOutputPicturePresentInStream();
xWriteOutput( pcListPic, nalu.m_temporalId );
m_cDecLib.setFirstSliceInPicture (false);
@@ -454,12 +448,10 @@ uint32_t DecApp::decode()
#endif
}
}
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
if (!m_annotatedRegionsSEIFileName.empty())
{
xOutputAnnotatedRegions(pcListPic);
}
-#endif
// May need to check again one more time as in case one the bitstream has only one picture, the first check may miss it
setOutputPicturePresentInStream();
CHECK(!outputPicturePresentInBitstream, "It is required that there shall be at least one picture with PictureOutputFlag equal to 1 in the bitstream")
@@ -892,7 +884,6 @@ void DecApp::xFlushOutput( PicList* pcListPic, const int layerId )
m_iPOCLastDisplay = -MAX_INT;
}
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
/** \param pcListPic list of pictures to be written to file
*/
void DecApp::xOutputAnnotatedRegions(PicList* pcListPic)
@@ -1039,7 +1030,6 @@ void DecApp::xOutputAnnotatedRegions(PicList* pcListPic)
iterPic++;
}
}
-#endif
/** \param nalu Input nalu to check whether its LayerId is within targetDecLayerIdSet
*/
diff --git a/source/App/DecoderApp/DecApp.h b/source/App/DecoderApp/DecApp.h
index 2bb6ac44e6..d3573294b6 100644
--- a/source/App/DecoderApp/DecApp.h
+++ b/source/App/DecoderApp/DecApp.h
@@ -70,11 +70,9 @@ private:
bool m_newCLVS[MAX_NUM_LAYER_IDS]; ///< used to record a new CLVSS
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
SEIAnnotatedRegions::AnnotatedRegionHeader m_arHeader; ///< AR header
std::map<uint32_t, SEIAnnotatedRegions::AnnotatedRegionObject> m_arObjects; ///< AR object pool
std::map<uint32_t, std::string> m_arLabels; ///< AR label pool
-#endif
private:
bool xIsNaluWithinTargetDecLayerIdSet( const InputNALUnit* nalu ) const; ///< check whether given Nalu is within targetDecLayerIdSet
@@ -99,9 +97,7 @@ private:
bool isNewAccessUnit(bool newPicture, ifstream *bitstreamFile, class InputByteStream *bytestream); ///< check if next NAL unit will be the first NAL unit from a new access unit
void writeLineToOutputLog(Picture * pcPic);
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
void xOutputAnnotatedRegions(PicList* pcListPic);
-#endif
};
diff --git a/source/App/DecoderApp/DecAppCfg.cpp b/source/App/DecoderApp/DecAppCfg.cpp
index 14277e1804..036d7f54b9 100644
--- a/source/App/DecoderApp/DecAppCfg.cpp
+++ b/source/App/DecoderApp/DecAppCfg.cpp
@@ -96,9 +96,7 @@ bool DecAppCfg::parseCfg( int argc, char* argv[] )
("SEINoDisplay", m_decodedNoDisplaySEIEnabled, true, "Control handling of decoded no display SEI messages")
("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.")
("SEIColourRemappingInfoFilename", m_colourRemapSEIFileName, string(""), "Colour Remapping YUV output file name. If empty, no remapping is applied (ignore SEI message)\n")
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
("SEIAnnotatedRegionsInfoFilename", m_annotatedRegionsSEIFileName, string(""), "Annotated regions output file name. If empty, no object information will be saved (ignore SEI message)\n")
-#endif
("OutputDecodedSEIMessagesFilename", m_outputDecodedSEIMessagesFilename, string(""), "When non empty, output decoded SEI messages to the indicated file. If file is '-', then output to stdout\n")
#if JVET_S0257_DUMP_360SEI_MESSAGE
("360DumpFile", m_outputDecoded360SEIMessagesFilename, string(""), "When non empty, output decoded 360 SEI messages to the indicated file.\n")
@@ -257,9 +255,7 @@ DecAppCfg::DecAppCfg()
, m_decodedPictureHashSEIEnabled(0)
, m_decodedNoDisplaySEIEnabled(false)
, m_colourRemapSEIFileName()
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
, m_annotatedRegionsSEIFileName()
-#endif
, m_targetDecLayerIdSet()
, m_outputDecodedSEIMessagesFilename()
#if JVET_S0257_DUMP_360SEI_MESSAGE
diff --git a/source/App/DecoderApp/DecAppCfg.h b/source/App/DecoderApp/DecAppCfg.h
index d7dedd27da..36b4699d73 100644
--- a/source/App/DecoderApp/DecAppCfg.h
+++ b/source/App/DecoderApp/DecAppCfg.h
@@ -72,9 +72,7 @@ protected:
int m_decodedPictureHashSEIEnabled; ///< Checksum(3)/CRC(2)/MD5(1)/disable(0) acting on decoded picture hash SEI message
bool m_decodedNoDisplaySEIEnabled; ///< Enable(true)/disable(false) writing only pictures that get displayed based on the no display SEI message
std::string m_colourRemapSEIFileName; ///< output Colour Remapping file name
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
std::string m_annotatedRegionsSEIFileName; ///< annotated regions file name
-#endif
std::vector<int> m_targetDecLayerIdSet; ///< set of LayerIds to be included in the sub-bitstream extraction process.
std::string m_outputDecodedSEIMessagesFilename; ///< filename to output decoded SEI messages to. If '-', then use stdout. If empty, do not output details.
#if JVET_S0257_DUMP_360SEI_MESSAGE
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 66c4056ea9..2755f729d3 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -871,9 +871,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setOmniViewportSEITiltCentre ( m_omniViewportSEITiltCentre );
m_cEncLib.setOmniViewportSEIHorRange ( m_omniViewportSEIHorRange );
m_cEncLib.setOmniViewportSEIVerRange ( m_omniViewportSEIVerRange );
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
m_cEncLib.setAnnotatedRegionSEIFileRoot (m_arSEIFileRoot);
-#endif
m_cEncLib.setRwpSEIEnabled (m_rwpSEIEnabled);
m_cEncLib.setRwpSEIRwpCancelFlag (m_rwpSEIRwpCancelFlag);
m_cEncLib.setRwpSEIRwpPersistenceFlag (m_rwpSEIRwpPersistenceFlag);
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index a94560d715..7094cf7ed3 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1310,9 +1310,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("SEISubpicLevelInfoRefLevels", cfg_sliRefLevels, cfg_sliRefLevels, "List of reference levels for Subpicture Level Information SEI messages")
("SEISubpicLevelInfoExplicitFraction", m_cfgSubpictureLevelInfoSEI.m_explicitFraction, false, "Enable sending of explicit fractions in Subpicture Level Information SEI messages")
("SEISubpicLevelInfoNumSubpics", m_cfgSubpictureLevelInfoSEI.m_numSubpictures, 1, "Number of subpictures for Subpicture Level Information SEI messages")
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
("SEIAnnotatedRegionsFileRoot,-ar", m_arSEIFileRoot, string(""), "Annotated region SEI parameters root file name (wo num ext); only the file name base is to be added. Underscore and POC would be automatically addded to . E.g. \"-ar ar\" will search for files ar_0.txt, ar_1.txt, ...")
-#endif
("SEISubpicLevelInfoMaxSublayers", m_cfgSubpictureLevelInfoSEI.m_sliMaxSublayers, 1, "Number of sublayers for Subpicture Level Information SEI messages")
("SEISubpicLevelInfoSublayerInfoPresentFlag", m_cfgSubpictureLevelInfoSEI.m_sliSublayerInfoPresentFlag, false, "Enable sending of level information for all sublayers in Subpicture Level Information SEI messages")
("SEISubpicLevelInfoRefLevelFractions", cfg_sliFractions, cfg_sliFractions, "List of subpicture level fractions for Subpicture Level Information SEI messages")
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index a12bcae6c4..c3a7898478 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -558,9 +558,7 @@ protected:
std::vector<int> m_omniViewportSEITiltCentre;
std::vector<uint32_t> m_omniViewportSEIHorRange;
std::vector<uint32_t> m_omniViewportSEIVerRange;
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
std::string m_arSEIFileRoot; // Annotated region SEI - initialized from external file
-#endif
bool m_rwpSEIEnabled;
bool m_rwpSEIRwpCancelFlag;
bool m_rwpSEIRwpPersistenceFlag;
diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp
index 362711a09e..ef10af904e 100644
--- a/source/Lib/CommonLib/SEI.cpp
+++ b/source/Lib/CommonLib/SEI.cpp
@@ -180,9 +180,7 @@ const char *SEI::getSEIMessageString(SEI::PayloadType payloadType)
case SEI::GENERALIZED_CUBEMAP_PROJECTION: return "Generalized cubemap projection";
case SEI::SAMPLE_ASPECT_RATIO_INFO: return "Sample aspect ratio information";
case SEI::SUBPICTURE_LEVEL_INFO: return "Subpicture level information";
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
case SEI::ANNOTATED_REGIONS: return "Annotated Region";
-#endif
default: return "Unknown";
}
}
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index 441daf9072..30f51acbab 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -79,9 +79,7 @@ public:
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
AMBIENT_VIEWING_ENVIRONMENT = 148,
CONTENT_COLOUR_VOLUME = 149,
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
ANNOTATED_REGIONS = 202,
-#endif
};
SEI() {}
@@ -670,7 +668,6 @@ public:
std::vector<std::vector<std::vector<int>>> m_refLevelFraction;
};
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
class SEIAnnotatedRegions : public SEI
{
public:
@@ -734,7 +731,6 @@ public:
std::vector<std::pair<AnnotatedRegionObjectIndex, AnnotatedRegionObject> > m_annotatedRegions;
std::vector<std::pair<AnnotatedRegionLabelIndex, AnnotatedRegionLabel> > m_annotatedLabels;
};
-#endif
//! \}
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 5b78c6f816..2ac5a41a5b 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -58,7 +58,6 @@
#define JVET_S0078_NOOUTPUTPRIORPICFLAG 0 // JVET-S0078: Handling of NoOutputOfPriorPicsFlag in output process
#define FIX_TICKET_1405 1 // Add dph_sei_single_component_flag and dph_sei_reserved_zero_7bits syntax to decoded picture hash SEI message
#define FIX_SUBPICS_W_RPR 1 // Fix handling of RPR with subpictures (via scaling windows with no resolution change)
-#define JVET_T0053_ANNOTATED_REGIONS_SEI 1 //Enable/disable the annotated regions SEI
//########### place macros to be be kept below this line ###############
#define JVET_S0257_DUMP_360SEI_MESSAGE 1 // Software support of 360 SEI messages
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index ae297bbd37..d85c53be51 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -234,12 +234,10 @@ void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType
sei = new SEIFramePacking;
xParseSEIFramePacking((SEIFramePacking&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
case SEI::ANNOTATED_REGIONS:
sei = new SEIAnnotatedRegions;
xParseSEIAnnotatedRegions((SEIAnnotatedRegions&)*sei, payloadSize, pDecodedMessageOutputStream);
break;
-#endif
case SEI::PARAMETER_SETS_INCLUSION_INDICATION:
sei = new SEIParameterSetsInclusionIndication;
xParseSEIParameterSetsInclusionIndication((SEIParameterSetsInclusionIndication&)*sei, payloadSize, pDecodedMessageOutputStream);
@@ -990,7 +988,6 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi
sei.m_ptDisplayElementalPeriodsMinus1 = symbol;
}
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
void SEIReader::xParseSEIAnnotatedRegions(SEIAnnotatedRegions& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream)
{
output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
@@ -1111,7 +1108,6 @@ void SEIReader::xParseSEIAnnotatedRegions(SEIAnnotatedRegions& sei, uint32_t pay
}
}
}
-#endif
void SEIReader::xParseSEIFrameFieldinfo(SEIFrameFieldInfo& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream)
{
output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
diff --git a/source/Lib/DecoderLib/SEIread.h b/source/Lib/DecoderLib/SEIread.h
index 0a7529a450..94cbd7f666 100644
--- a/source/Lib/DecoderLib/SEIread.h
+++ b/source/Lib/DecoderLib/SEIread.h
@@ -71,9 +71,7 @@ protected:
void xParseSEIFramePacking (SEIFramePacking& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIParameterSetsInclusionIndication(SEIParameterSetsInclusionIndication& sei, uint32_t payloadSize, std::ostream* pDecodedMessageOutputStream);
void xParseSEIMasteringDisplayColourVolume (SEIMasteringDisplayColourVolume& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
void xParseSEIAnnotatedRegions (SEIAnnotatedRegions& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
-#endif
#if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
void xParseSEIAlternativeTransferCharacteristics(SEIAlternativeTransferCharacteristics& sei, uint32_t payLoadSize, std::ostream *pDecodedMessageOutputStream);
#endif
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index f6a0c287cf..45ffac06c3 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -637,9 +637,7 @@ protected:
double m_ccvSEIMinLuminanceValue;
double m_ccvSEIMaxLuminanceValue;
double m_ccvSEIAvgLuminanceValue;
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
std::string m_arSEIFileRoot; // Annotated region SEI - initialized from external file
-#endif
//====== Weighted Prediction ========
bool m_useWeightedPred; //< Use of Weighting Prediction (P_SLICE)
bool m_useWeightedBiPred; //< Use of Bi-directional Weighting Prediction (B_SLICE)
@@ -774,9 +772,7 @@ public:
virtual ~EncCfg()
{}
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
std::map<uint32_t, SEIAnnotatedRegions::AnnotatedRegionObject> m_arObjects;
-#endif
void setProfile(Profile::Name profile) { m_profile = profile; }
void setLevel(Level::Tier tier, Level::Name level) { m_levelTier = tier; m_level = level; }
bool getFrameOnlyConstraintFlag() const { return m_frameOnlyConstraintFlag; }
@@ -1558,10 +1554,8 @@ public:
uint32_t getOmniViewportSEIHorRange(int idx) { return m_omniViewportSEIHorRange[idx]; }
void setOmniViewportSEIVerRange(const std::vector<uint32_t>& vi) { m_omniViewportSEIVerRange = vi; }
uint32_t getOmniViewportSEIVerRange(int idx) { return m_omniViewportSEIVerRange[idx]; }
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
void setAnnotatedRegionSEIFileRoot(const std::string &s) { m_arSEIFileRoot = s; m_arObjects.clear();}
const std::string &getAnnotatedRegionSEIFileRoot() const { return m_arSEIFileRoot; }
-#endif
void setRwpSEIEnabled(bool b) { m_rwpSEIEnabled = b; }
bool getRwpSEIEnabled() { return m_rwpSEIEnabled; }
void setRwpSEIRwpCancelFlag(bool b) { m_rwpSEIRwpCancelFlag = b; }
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index dc5f530eb8..6c754a2531 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -787,7 +787,6 @@ void EncGOP::xCreatePerPictureSEIMessages (int picInGOP, SEIMessages& seiMessage
seiMessages.push_back(dependentRAPIndicationSEI);
}
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
// insert one Annotated Region SEI for the picture (if the file exists)
if (!m_pcCfg->getAnnotatedRegionSEIFileRoot().empty())
{
@@ -803,7 +802,6 @@ void EncGOP::xCreatePerPictureSEIMessages (int picInGOP, SEIMessages& seiMessage
delete seiAnnotatedRegions;
}
}
-#endif
}
void EncGOP::xCreateScalableNestingSEI(SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, const std::vector<int> &targetOLSs, const std::vector<int> &targetLayers, const std::vector<uint16_t>& subpicIDs)
diff --git a/source/Lib/EncoderLib/SEIEncoder.cpp b/source/Lib/EncoderLib/SEIEncoder.cpp
index 030d5e97c2..9257aaacea 100644
--- a/source/Lib/EncoderLib/SEIEncoder.cpp
+++ b/source/Lib/EncoderLib/SEIEncoder.cpp
@@ -563,7 +563,6 @@ static void readTokenValueAndValidate(T &returnedValue, /// value ret
}
}
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
void SEIEncoder::readAnnotatedRegionSEI(std::istream &fic, SEIAnnotatedRegions *seiAnnoRegion, bool &failed)
{
readTokenValue(seiAnnoRegion->m_hdr.m_cancelFlag, failed, fic, "SEIArCancelFlag");
@@ -699,7 +698,6 @@ bool SEIEncoder::initSEIAnnotatedRegions(SEIAnnotatedRegions* SEIAnnoReg, int cu
}
return true;
}
-#endif
#if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
diff --git a/source/Lib/EncoderLib/SEIEncoder.h b/source/Lib/EncoderLib/SEIEncoder.h
index 9dc7adb18a..c6cebbb1a0 100644
--- a/source/Lib/EncoderLib/SEIEncoder.h
+++ b/source/Lib/EncoderLib/SEIEncoder.h
@@ -86,10 +86,8 @@ public:
void initSEIContentLightLevel(SEIContentLightLevelInfo *sei);
void initSEIAmbientViewingEnvironment(SEIAmbientViewingEnvironment *sei);
void initSEIContentColourVolume(SEIContentColourVolume *sei);
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
bool initSEIAnnotatedRegions(SEIAnnotatedRegions *sei, int currPOC);
void readAnnotatedRegionSEI(std::istream &fic, SEIAnnotatedRegions *seiAnnoRegion, bool &failed);
-#endif
private:
EncCfg* m_pcCfg;
EncLib* m_pcEncLib;
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 27b2bb65b9..d1c4892e2c 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -127,11 +127,9 @@ void SEIWriter::xWriteSEIpayloadData(OutputBitstream &bs, const SEI& sei, HRD &h
case SEI::SAMPLE_ASPECT_RATIO_INFO:
xWriteSEISampleAspectRatioInfo(*static_cast<const SEISampleAspectRatioInfo*>(&sei));
break;
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
case SEI::ANNOTATED_REGIONS:
xWriteSEIAnnotatedRegions(*static_cast<const SEIAnnotatedRegions*>(&sei));
break;
-#endif
default:
THROW("Trying to write unhandled SEI message");
break;
@@ -605,7 +603,6 @@ void SEIWriter::xWriteSEIMasteringDisplayColourVolume(const SEIMasteringDisplayC
WRITE_CODE( sei.values.minLuminance, 32, "mdcv_min_display_mastering_luminance" );
}
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
void SEIWriter::xWriteSEIAnnotatedRegions(const SEIAnnotatedRegions &sei)
{
WRITE_FLAG(sei.m_hdr.m_cancelFlag, "ar_cancel_flag");
@@ -696,7 +693,6 @@ void SEIWriter::xWriteSEIAnnotatedRegions(const SEIAnnotatedRegions &sei)
}
}
}
-#endif
void SEIWriter::xWriteByteAlign()
{
if( m_pcBitIf->getNumberOfWrittenBits() % 8 != 0)
diff --git a/source/Lib/EncoderLib/SEIwrite.h b/source/Lib/EncoderLib/SEIwrite.h
index 956bc7ed03..ef3f9b4adb 100644
--- a/source/Lib/EncoderLib/SEIwrite.h
+++ b/source/Lib/EncoderLib/SEIwrite.h
@@ -79,9 +79,7 @@ protected:
void xWriteSEIContentLightLevelInfo(const SEIContentLightLevelInfo& sei);
void xWriteSEIAmbientViewingEnvironment(const SEIAmbientViewingEnvironment& sei);
void xWriteSEIContentColourVolume(const SEIContentColourVolume &sei);
-#if JVET_T0053_ANNOTATED_REGIONS_SEI
void xWriteSEIAnnotatedRegions (const SEIAnnotatedRegions& sei);
-#endif
void xWriteSEIpayloadData(OutputBitstream &bs, const SEI& sei, HRD &hrd, const uint32_t temporalId);
void xWriteByteAlign();
protected:
--
GitLab