From 333b4cf84fa18492da515127f19c2cd4696adfe4 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Fri, 16 Jul 2021 18:10:22 -0400
Subject: [PATCH] remove macro JVET_V0061_SEI
---
source/App/EncoderApp/EncApp.cpp | 2 --
source/App/EncoderApp/EncAppCfg.cpp | 4 ----
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 | 4 ----
source/Lib/EncoderLib/SEIwrite.cpp | 4 ----
source/Lib/EncoderLib/SEIwrite.h | 2 --
11 files changed, 31 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index a32550289..2c97d5808 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -867,12 +867,10 @@ void EncApp::xInitLibCfg()
m_cEncLib.setFramePackingArrangementSEIId ( m_framePackingSEIId );
m_cEncLib.setFramePackingArrangementSEIQuincunx ( m_framePackingSEIQuincunx );
m_cEncLib.setFramePackingArrangementSEIInterpretation ( m_framePackingSEIInterpretation );
-#if JVET_V0061_SEI
m_cEncLib.setDoSEIEnabled ( m_doSEIEnabled );
m_cEncLib.setDoSEICancelFlag ( m_doSEICancelFlag );
m_cEncLib.setDoSEIPersistenceFlag ( m_doSEIPersistenceFlag);
m_cEncLib.setDoSEITransformType ( m_doSEITransformType);
-#endif
m_cEncLib.setParameterSetsInclusionIndicationSEIEnabled (m_parameterSetsInclusionIndicationSEIEnabled);
m_cEncLib.setSelfContainedClvsFlag (m_selfContainedClvsFlag);
m_cEncLib.setErpSEIEnabled ( m_erpSEIEnabled );
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 489fa99a6..034cb3215 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1282,12 +1282,10 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
"\t0: unspecified\n"
"\t1: stereo pair, frame0 represents left view\n"
"\t2: stereo pair, frame0 represents right view")
-#if JVET_V0061_SEI
("SEIDisplayOrientationEnabled", m_doSEIEnabled, false, "Controls if display orientation packing SEI message enabled")
("SEIDisplayOrientationCancelFlag", m_doSEICancelFlag, true, "Specifies the persistence of any previous display orientation SEI message in output order.")
("SEIDisplayOrientationPersistenceFlag", m_doSEIPersistenceFlag, false, "Specifies the persistence of the display orientation packing SEI message for the current layer.")
("SEIDisplayOrientationTransformType", m_doSEITransformType, 0, "specifies the rotation and mirroring to be applied to the picture.")
-#endif
("SEIParameterSetsInclusionIndication", m_parameterSetsInclusionIndicationSEIEnabled, false, "Control generation of Parameter sets inclusion indication SEI messages")
("SEISelfContainedClvsFlag", m_selfContainedClvsFlag, 0, "Self contained CLVS indication flag value")
("SEIMasteringDisplayColourVolume", m_masteringDisplay.colourVolumeSEIEnabled, false, "Control generation of mastering display colour volume SEI messages")
@@ -3988,12 +3986,10 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara(m_framePackingSEIType < 3 || m_framePackingSEIType > 5 , "SEIFramePackingType must be in rage 3 to 5");
}
-#if JVET_V0061_SEI
if (m_doSEIEnabled)
{
xConfirmPara(m_doSEITransformType < 0 || m_doSEITransformType > 7, "SEIDisplayOrientationTransformType must be in rage 0 to 7");
}
-#endif
if( m_erpSEIEnabled && !m_erpSEICancelFlag )
{
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index f2323fc2f..9c0582158 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -508,12 +508,10 @@ protected:
int m_framePackingSEIId;
int m_framePackingSEIQuincunx;
int m_framePackingSEIInterpretation;
-#if JVET_V0061_SEI
bool m_doSEIEnabled;
bool m_doSEICancelFlag;
bool m_doSEIPersistenceFlag;
int m_doSEITransformType;
-#endif
bool m_parameterSetsInclusionIndicationSEIEnabled;
int m_selfContainedClvsFlag;
#if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp
index 5cc15da4e..f762fe458 100644
--- a/source/Lib/CommonLib/SEI.cpp
+++ b/source/Lib/CommonLib/SEI.cpp
@@ -426,9 +426,7 @@ const char *SEI::getSEIMessageString(SEI::PayloadType payloadType)
case SEI::USER_DATA_UNREGISTERED: return "User data unregistered";
case SEI::FILM_GRAIN_CHARACTERISTICS: return "Film grain characteristics"; // not currently decoded
case SEI::FRAME_PACKING: return "Frame packing arrangement";
-#if JVET_V0061_SEI
case SEI::DISPLAY_ORIENTATION: return "Display orientation";
-#endif
case SEI::PARAMETER_SETS_INCLUSION_INDICATION: return "Parameter sets inclusion indication";
case SEI::DECODING_UNIT_INFO: return "Decoding unit information";
case SEI::SCALABLE_NESTING: return "Scalable nesting";
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index 91b9ff0ac..7ee140c81 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -61,9 +61,7 @@ public:
USER_DATA_UNREGISTERED = 5,
FILM_GRAIN_CHARACTERISTICS = 19,
FRAME_PACKING = 45,
-#if JVET_V0061_SEI
DISPLAY_ORIENTATION = 47,
-#endif
PARAMETER_SETS_INCLUSION_INDICATION = 129,
DECODING_UNIT_INFO = 130,
DECODED_PICTURE_HASH = 132,
@@ -651,7 +649,6 @@ public:
bool m_upsampledAspectRatio;
};
-#if JVET_V0061_SEI
class SEIDisplayOrientation : public SEI
{
public:
@@ -664,7 +661,6 @@ public:
bool m_doPersistenceFlag;
int m_doTransformType;
};
-#endif
class SEIParameterSetsInclusionIndication : public SEI
{
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index abb8f3d65..7fa59d2f4 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -63,7 +63,6 @@
-#define JVET_V0061_SEI 1 // JVET-V0061 Display orientation SEI message
#define JVET_V0108 1 // JVET_V0108: Colour Transform Information SEI
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index 41243d74b..38211035b 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -238,12 +238,10 @@ void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType
sei = new SEIFramePacking;
xParseSEIFramePacking((SEIFramePacking&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
-#if JVET_V0061_SEI
case SEI::DISPLAY_ORIENTATION:
sei = new SEIDisplayOrientation;
xParseSEIDisplayOrientation((SEIDisplayOrientation&)*sei, payloadSize, pDecodedMessageOutputStream);
break;
-#endif
case SEI::ANNOTATED_REGIONS:
sei = new SEIAnnotatedRegions;
xParseSEIAnnotatedRegions((SEIAnnotatedRegions&)*sei, payloadSize, pDecodedMessageOutputStream);
@@ -1230,7 +1228,6 @@ void SEIReader::xParseSEIFramePacking(SEIFramePacking& sei, uint32_t payloadSize
sei_read_flag( pDecodedMessageOutputStream, val, "fp_upsampled_aspect_ratio_flag" ); sei.m_upsampledAspectRatio = val;
}
-#if JVET_V0061_SEI
void SEIReader::xParseSEIDisplayOrientation(SEIDisplayOrientation& sei, uint32_t payloadSize, std::ostream* pDecodedMessageOutputStream)
{
uint32_t val;
@@ -1244,7 +1241,6 @@ void SEIReader::xParseSEIDisplayOrientation(SEIDisplayOrientation& sei, uint32_t
CHECK((sei.m_doTransformType < 0) || (sei.m_doTransformType > 7), "Invalid transform type");
}
}
-#endif
void SEIReader::xParseSEIParameterSetsInclusionIndication(SEIParameterSetsInclusionIndication& sei, uint32_t payloadSize, std::ostream* pDecodedMessageOutputStream)
{
diff --git a/source/Lib/DecoderLib/SEIread.h b/source/Lib/DecoderLib/SEIread.h
index 5e3b0d18d..2be15557b 100644
--- a/source/Lib/DecoderLib/SEIread.h
+++ b/source/Lib/DecoderLib/SEIread.h
@@ -69,9 +69,7 @@ protected:
void xParseSEIFrameFieldinfo (SEIFrameFieldInfo& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIDependentRAPIndication (SEIDependentRAPIndication& sei, uint32_t payLoadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIFramePacking (SEIFramePacking& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
-#if JVET_V0061_SEI
void xParseSEIDisplayOrientation (SEIDisplayOrientation& sei, uint32_t payloadSize, std::ostream* pDecodedMessageOutputStream);
-#endif
void xParseSEIParameterSetsInclusionIndication(SEIParameterSetsInclusionIndication& sei, uint32_t payloadSize, std::ostream* pDecodedMessageOutputStream);
void xParseSEIMasteringDisplayColourVolume (SEIMasteringDisplayColourVolume& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIAnnotatedRegions (SEIAnnotatedRegions& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 19b087a11..1b9c10b23 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -543,12 +543,10 @@ protected:
int m_framePackingSEIId;
int m_framePackingSEIQuincunx;
int m_framePackingSEIInterpretation;
-#if JVET_V0061_SEI // Display orientation SEI message
bool m_doSEIEnabled;
bool m_doSEICancelFlag;
bool m_doSEIPersistenceFlag;
int m_doSEITransformType;
-#endif
bool m_parameterSetsInclusionIndicationSEIEnabled;
bool m_selfContainedClvsFlag;
bool m_bpDeltasGOPStructure;
@@ -1637,7 +1635,6 @@ public:
int getFramePackingArrangementSEIQuincunx() { return m_framePackingSEIQuincunx; }
void setFramePackingArrangementSEIInterpretation(int b) { m_framePackingSEIInterpretation = b; }
int getFramePackingArrangementSEIInterpretation() { return m_framePackingSEIInterpretation; }
-#if JVET_V0061_SEI
void setDoSEIEnabled(bool b) { m_doSEIEnabled = b; }
bool getDoSEIEnabled() const { return m_doSEIEnabled; }
void setDoSEICancelFlag(bool b) { m_doSEICancelFlag = b; }
@@ -1646,7 +1643,6 @@ public:
bool getDoSEIPersistenceFlag() { return m_doSEIPersistenceFlag; }
void setDoSEITransformType(const int type) { m_doSEITransformType = type; }
int getDOSEITransformType() const { return m_doSEITransformType; }
-#endif
void setParameterSetsInclusionIndicationSEIEnabled(bool b) { m_parameterSetsInclusionIndicationSEIEnabled = b; }
bool getParameterSetsInclusionIndicationSEIEnabled() const { return m_parameterSetsInclusionIndicationSEIEnabled; }
void setSelfContainedClvsFlag(bool b) { m_selfContainedClvsFlag = b; }
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 5e8f25ff0..f213b3f9b 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -83,11 +83,9 @@ void SEIWriter::xWriteSEIpayloadData(OutputBitstream &bs, const SEI& sei, HRD &h
case SEI::FRAME_PACKING:
xWriteSEIFramePacking(*static_cast<const SEIFramePacking*>(&sei));
break;
-#if JVET_V0061_SEI
case SEI::DISPLAY_ORIENTATION:
xWriteSEIDisplayOrientation(*static_cast<const SEIDisplayOrientation*>(&sei));
break;
-#endif
case SEI::PARAMETER_SETS_INCLUSION_INDICATION:
xWriteSEIParameterSetsInclusionIndication(*static_cast<const SEIParameterSetsInclusionIndication*>(&sei));
break;
@@ -620,7 +618,6 @@ void SEIWriter::xWriteSEIFramePacking(const SEIFramePacking& sei)
}
-#if JVET_V0061_SEI
void SEIWriter::xWriteSEIDisplayOrientation(const SEIDisplayOrientation& sei)
{
WRITE_FLAG(sei.m_doCancelFlag, "display_orientation_cancel_flag");
@@ -632,7 +629,6 @@ void SEIWriter::xWriteSEIDisplayOrientation(const SEIDisplayOrientation& sei)
WRITE_CODE(0, 3, "display_orientation_reserved_zero_3bits");
}
}
-#endif
void SEIWriter::xWriteSEIParameterSetsInclusionIndication(const SEIParameterSetsInclusionIndication& sei)
{
diff --git a/source/Lib/EncoderLib/SEIwrite.h b/source/Lib/EncoderLib/SEIwrite.h
index 10e9f5577..7053cf1be 100644
--- a/source/Lib/EncoderLib/SEIwrite.h
+++ b/source/Lib/EncoderLib/SEIwrite.h
@@ -62,9 +62,7 @@ protected:
void xWriteSEIEdrapIndication(const SEIExtendedDrapIndication& sei);
void xWriteSEIScalableNesting(OutputBitstream& bs, const SEIScalableNesting& sei);
void xWriteSEIFramePacking(const SEIFramePacking& sei);
-#if JVET_V0061_SEI
void xWriteSEIDisplayOrientation(const SEIDisplayOrientation& sei);
-#endif
void xWriteSEIParameterSetsInclusionIndication(const SEIParameterSetsInclusionIndication& sei);
void xWriteSEIMasteringDisplayColourVolume( const SEIMasteringDisplayColourVolume& sei);
#if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
--
GitLab