diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 15df7b0d56bb6fb57b40601184ab52881feec3b2..42daa8a53e21c300d5243d63a523b6b33f25ba50 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -1401,9 +1401,7 @@ void EncApp::xInitLibCfg( int layerIdx )
m_cEncLib.setCalculateHdrMetrics (m_calculateHdrMetrics);
#endif
-#if JVET_T0056_SEI_MANIFEST
m_cEncLib.setSEIManifestSEIEnabled(m_SEIManifestSEIEnabled);
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
m_cEncLib.setSEIPrefixIndicationSEIEnabled(m_SEIPrefixIndicationSEIEnabled);
#endif
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 87c44db7b62d68dbf8a973fec069c9be438c938e..75ddd244865a994ead91b6c65fea13a9e0da24db 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1611,10 +1611,8 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("SEIPostFilterHintValue", cfg_postFilterHintSEIValues, cfg_postFilterHintSEIValues, "Specifies post-filter coefficients or elements of a cross-correlation matrix")
#endif
-#if JVET_T0056_SEI_MANIFEST
//SEI manifest
("SEISEIManifestEnabled", m_SEIManifestSEIEnabled, false, "Controls if SEI Manifest SEI messages enabled")
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
//SEI prefix indication
("SEISEIPrefixIndicationEnabled", m_SEIPrefixIndicationSEIEnabled, false, "Controls if SEI Prefix Indications SEI messages enabled")
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index edb5925ad523ad24a3b5780e17d1b78627b9cec3..6d100b090c4863ed7f09ca525bbe408c225b59bc 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -807,9 +807,7 @@ protected:
int m_sariSarWidth;
int m_sariSarHeight;
-#if JVET_T0056_SEI_MANIFEST
bool m_SEIManifestSEIEnabled;
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
bool m_SEIPrefixIndicationSEIEnabled;
#endif
diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp
index bf5fac1e57384bb218944fd1043f32d309a79190..9412bc77fe4feff4c8589142ac680e1f134ee12e 100644
--- a/source/Lib/CommonLib/SEI.cpp
+++ b/source/Lib/CommonLib/SEI.cpp
@@ -415,7 +415,6 @@ bool SEIMultiviewAcquisitionInfo::isMAISameContent(SEIMultiviewAcquisitionInfo *
return true;
}
-#if JVET_T0056_SEI_MANIFEST
SEIManifest::SEIManifestDescription SEIManifest::getSEIMessageDescription(const PayloadType payloadType)
{
std::vector<PayloadType> necessary = { PayloadType::FRAME_PACKING, PayloadType::EQUIRECTANGULAR_PROJECTION,
@@ -441,7 +440,6 @@ SEIManifest::SEIManifestDescription SEIManifest::getSEIMessageDescription(const
}
return UNNECESSARY_SEI_MESSAGE;
}
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
uint8_t SEIPrefixIndication::getNumsOfSeiPrefixIndications(const SEI *sei)
@@ -529,9 +527,7 @@ static const std::map<SEI::PayloadType, const char *> payloadTypeStrings = {
{ SEI::PayloadType::ANNOTATED_REGIONS, "Annotated Region" },
{ SEI::PayloadType::SCALABILITY_DIMENSION_INFO, "Scalability dimension information" },
{ SEI::PayloadType::EXTENDED_DRAP_INDICATION, "Extended DRAP indication" },
-#if JVET_T0056_SEI_MANIFEST
{ SEI::PayloadType::SEI_MANIFEST, "SEI manifest" },
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
{ SEI::PayloadType::SEI_PREFIX_INDICATION, "SEI prefix indication" },
#endif
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index 51c12ad398d5508d41216a12abb5fa268eca2281..a713923ad2c460aa23237272df25f676e345e238 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -87,9 +87,7 @@ public:
DEPTH_REPRESENTATION_INFO = 177,
MULTIVIEW_ACQUISITION_INFO = 179,
MULTIVIEW_VIEW_POSITION = 180,
-#if JVET_T0056_SEI_MANIFEST
SEI_MANIFEST = 200,
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
SEI_PREFIX_INDICATION = 201,
#endif
@@ -1025,7 +1023,6 @@ public:
std::vector<std::vector<std::vector<int>>> m_refLevelFraction;
};
-#if JVET_T0056_SEI_MANIFEST
class SEIManifest : public SEI
{
public:
@@ -1047,7 +1044,6 @@ public:
SEIManifestDescription getSEIMessageDescription(const PayloadType payloadType);
};
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
class SEIPrefixIndication : public SEI
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 140985393708a52148e63cf75c91d0954a1e1109..ecceebf1e8a2d8fb945ed90f696c062de0b9b9ce 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -55,7 +55,6 @@
// clang-format off
//########### place macros to be removed in next cycle below this line ###############
-#define JVET_T0056_SEI_MANIFEST 1 // JVET-T0056: SEI manifest SEI message
#define JVET_T0056_SEI_PREFIX_INDICATION 1 // JVET-T0056: SEI prefix indication SEI message
#define JVET_AB0069_SEI_PROCESSING_ORDER 1 // JVET-AB0069: SEI processing order SEI message update
#define JVET_AB0135_NN_SEI_COMPLEXITY_MOD 1 // JVET-AB0135: Modification of comlexity parameters in NN characteristics SEI message
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index d67ef5571afa4748153fda4ccf9284ae1e40d8a1..b58f0647faff8fcafecd7178f5a27e2c5586e9b6 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -414,12 +414,10 @@ void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType
sei = new SEIColourTransformInfo;
xParseSEIColourTransformInfo((SEIColourTransformInfo &) *sei, payloadSize, pDecodedMessageOutputStream);
break;
-#if JVET_T0056_SEI_MANIFEST
case SEI::PayloadType::SEI_MANIFEST:
sei = new SEIManifest;
xParseSEISEIManifest((SEIManifest&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
case SEI::PayloadType::SEI_PREFIX_INDICATION:
sei = new SEIPrefixIndication;
@@ -3129,7 +3127,6 @@ void SeiCfgFileDump::xDumpSEIGeneralizedCubemapProjection (SEIGeneralizedCubema
#endif
-#if JVET_T0056_SEI_MANIFEST
void SEIReader::xParseSEISEIManifest(SEIManifest &sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream)
{
output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
@@ -3149,7 +3146,6 @@ void SEIReader::xParseSEISEIManifest(SEIManifest &sei, uint32_t payloadSize, std
}
}
}
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
void SEIReader::xParseSEISEIPrefixIndication(SEIPrefixIndication &sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream)
diff --git a/source/Lib/DecoderLib/SEIread.h b/source/Lib/DecoderLib/SEIread.h
index 6435ba264a75ca3c5954d664bc00bbd00d5d3a75..3ad31f83ce41dd38d473d8a3e7d4ed91838311be 100644
--- a/source/Lib/DecoderLib/SEIread.h
+++ b/source/Lib/DecoderLib/SEIread.h
@@ -106,9 +106,7 @@ protected:
void xParseSEIContentColourVolume (SEIContentColourVolume& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIExtendedDrapIndication (SEIExtendedDrapIndication& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIColourTransformInfo (SEIColourTransformInfo& sei, uint32_t payloadSize, std::ostream* pDecodedMessageOutputStream);
- #if JVET_T0056_SEI_MANIFEST
void xParseSEISEIManifest (SEIManifest& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
void xParseSEISEIPrefixIndication (SEIPrefixIndication& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
#endif
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 5e2ec86c3888baa448693904b580a5fc04b7000b..dec92bc700b14b24b519d29519a27460d2272382 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -862,9 +862,7 @@ protected:
std::vector<uint32_t> m_driSEINonlinearModel;
std::string m_arSEIFileRoot; // Annotated region SEI - initialized from external file
-#if JVET_T0056_SEI_MANIFEST
bool m_SEIManifestSEIEnabled;
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
bool m_SEIPrefixIndicationSEIEnabled;
#endif
@@ -2473,11 +2471,9 @@ public:
void setDriSEINonlinearModel(const std::vector<uint32_t>& driSEINonLinearModel) { m_driSEINonlinearModel = driSEINonLinearModel; }
uint32_t getDriSEINonlinearModel(int idx) const { return m_driSEINonlinearModel[idx]; }
-#if JVET_T0056_SEI_MANIFEST
//SEI manifest
void setSEIManifestSEIEnabled(bool b) { m_SEIManifestSEIEnabled = b; }
bool getSEIManifestSEIEnabled() { return m_SEIManifestSEIEnabled; }
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
//SEI prefix indication
void setSEIPrefixIndicationSEIEnabled(bool b) { m_SEIPrefixIndicationSEIEnabled = b; }
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index cd0bb6581110921479913057b1f6577b1100e0f1..d1c8af99b6d0d3b649811391da75cdbd43d7bc5d 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -551,7 +551,6 @@ uint32_t EncGOP::xWriteLeadingSEIOrdered (SEIMessages& seiMessages, SEIMessages&
#endif
// The case that a specific SEI is not present is handled in xWriteSEI (empty list)
-#if JVET_T0056_SEI_MANIFEST
// When SEI Manifest SEI message is present in an SEI NAL unit, the SEI Manifest SEI message shall be the first SEI
// message in the SEI NAL unit (D3.45 in ISO/IEC 23008-2).
if (m_pcCfg->getSEIManifestSEIEnabled())
@@ -561,7 +560,6 @@ uint32_t EncGOP::xWriteLeadingSEIOrdered (SEIMessages& seiMessages, SEIMessages&
xWriteSEI(NAL_UNIT_PREFIX_SEI, currentMessages, accessUnit, itNalu, temporalId);
xClearSEIs(currentMessages, !testWrite);
}
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
if (m_pcCfg->getSEIPrefixIndicationSEIEnabled())
{
@@ -846,7 +844,6 @@ void EncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const SPS
seiMessages.push_back(seiCTI);
}
-#if JVET_T0056_SEI_MANIFEST
// Make sure that sei_manifest and sei_prefix are the last two initialized sei_msg, otherwise it will cause these two
// Sei messages to not be able to enter all SEI messages
if (m_pcCfg->getSEIManifestSEIEnabled())
@@ -855,7 +852,6 @@ void EncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const SPS
m_seiEncoder.initSEISEIManifest(seiSEIManifest, seiMessages);
seiMessages.push_back(seiSEIManifest);
}
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
if (m_pcCfg->getSEIPrefixIndicationSEIEnabled())
{
diff --git a/source/Lib/EncoderLib/SEIEncoder.cpp b/source/Lib/EncoderLib/SEIEncoder.cpp
index a30d1b40413026994a65bd2355e8f7240c7887c0..166b68c849462862f1b189043fae418652c2ad3e 100644
--- a/source/Lib/EncoderLib/SEIEncoder.cpp
+++ b/source/Lib/EncoderLib/SEIEncoder.cpp
@@ -1263,7 +1263,6 @@ void SEIEncoder::initSEISubpictureLevelInfo(SEISubpicureLevelInfo *sei, const SP
}
}
-#if JVET_T0056_SEI_MANIFEST
void SEIEncoder::initSEISEIManifest(SEIManifest *seiSeiManifest, const SEIMessages &seiMessages)
{
assert(m_isInitialized);
@@ -1279,7 +1278,6 @@ void SEIEncoder::initSEISEIManifest(SEIManifest *seiSeiManifest, const SEIMessag
}
CHECK(seiSeiManifest->m_manifestNumSeiMsgTypes == 0, "No SEI messages available");
}
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
void SEIEncoder::initSEISEIPrefixIndication(SEIPrefixIndication *seiSeiPrefixIndications, const SEI *sei)
diff --git a/source/Lib/EncoderLib/SEIEncoder.h b/source/Lib/EncoderLib/SEIEncoder.h
index a0b4317ddbb3ea6306251bc9279ccb3f25662382..517d167ce7ce1f8e91c649a3fc7a97548d115bbc 100644
--- a/source/Lib/EncoderLib/SEIEncoder.h
+++ b/source/Lib/EncoderLib/SEIEncoder.h
@@ -88,9 +88,7 @@ public:
bool initSEIAnnotatedRegions(SEIAnnotatedRegions *sei, int currPOC);
void initSEIColourTransformInfo(SEIColourTransformInfo* sei);
void readAnnotatedRegionSEI(std::istream &fic, SEIAnnotatedRegions *seiAnnoRegion, bool &failed);
-#if JVET_T0056_SEI_MANIFEST
void initSEISEIManifest(SEIManifest *seiSeiManifest, const SEIMessages &seiMessage);
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
void initSEISEIPrefixIndication(SEIPrefixIndication *seiSeiPrefixIndications, const SEI *sei);
#endif
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index f9fcf7a3e0411d1496b2741d22579f074e832e20..74796f79f82c19d72d6f5c2bc7372f102a842da1 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -185,12 +185,10 @@ void SEIWriter::xWriteSEIpayloadData(OutputBitstream &bs, const SEI &sei, HRD &h
case SEI::PayloadType::ANNOTATED_REGIONS:
xWriteSEIAnnotatedRegions(*static_cast<const SEIAnnotatedRegions *>(&sei));
break;
-#if JVET_T0056_SEI_MANIFEST
case SEI::PayloadType::SEI_MANIFEST:
CHECK((SEIPrefixIndicationIdx), "wrong SEI prefix indication message");
xWriteSEISEIManifest(*static_cast<const SEIManifest *>(&sei));
break;
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
case SEI::PayloadType::SEI_PREFIX_INDICATION:
CHECK((SEIPrefixIndicationIdx), "wrong SEI prefix indication message");
@@ -770,7 +768,6 @@ void SEIWriter::xWriteSEIMasteringDisplayColourVolume(const SEIMasteringDisplayC
xWriteCode( sei.values.minLuminance, 32, "mdcv_min_display_mastering_luminance" );
}
-#if JVET_T0056_SEI_MANIFEST
void SEIWriter::xWriteSEISEIManifest(const SEIManifest &sei)
{
xWriteCode(sei.m_manifestNumSeiMsgTypes, 16, "manifest_num_sei_msg_types");
@@ -780,7 +777,6 @@ void SEIWriter::xWriteSEISEIManifest(const SEIManifest &sei)
xWriteCode(sei.m_manifestSeiDescription[i], 8, "manifest_sei_description");
}
}
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
//SEI prefix indication
diff --git a/source/Lib/EncoderLib/SEIwrite.h b/source/Lib/EncoderLib/SEIwrite.h
index 9d65505b414809608802ce4ac521f3a4eb1051eb..8ff33cea913c86799f8a58300fd5213378a3607f 100644
--- a/source/Lib/EncoderLib/SEIwrite.h
+++ b/source/Lib/EncoderLib/SEIwrite.h
@@ -112,10 +112,8 @@ protected:
void xWriteSEIAmbientViewingEnvironment(const SEIAmbientViewingEnvironment& sei);
void xWriteSEIContentColourVolume(const SEIContentColourVolume &sei);
-#if JVET_T0056_SEI_MANIFEST
//SEI manifest
void xWriteSEISEIManifest(const SEIManifest &sei);
-#endif
#if JVET_T0056_SEI_PREFIX_INDICATION
//SEI prefix indication
void xWriteSEISEIPrefixIndication(OutputBitstream &bs, const SEIPrefixIndication &sei, HRD &hrd,