Commit b455071d authored by Karl Sharman's avatar Karl Sharman
Browse files

remove macro CCV_SEI_MESSAGE

parent aabc334f
......@@ -1196,7 +1196,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
("SEIPreferredTransferCharacterisics", m_preferredTransferCharacteristics, -1, "Value for the preferred_transfer_characteristics field of the Alternative transfer characteristics SEI which will override the corresponding entry in the VUI. If negative, do not produce the respective SEI message")
("SEIGreenMetadataType", m_greenMetadataType, 0u, "Value for the green_metadata_type specifies the type of metadata that is present in the SEI message. If green_metadata_type is 1, then metadata enabling quality recovery after low-power encoding is present")
("SEIXSDMetricType", m_xsdMetricType, 0u, "Value for the xsd_metric_type indicates the type of the objective quality metric. PSNR is the only type currently supported")
#if CCV_SEI_MESSAGE
("SEICCVEnabled", m_ccvSEIEnabled, false, "Enables the Content Colour Volume SEI message")
("SEICCVCancelFlag", m_ccvSEICancelFlag, true, "Specifies the persistence of any previous content colour volume SEI message in output order.")
("SEICCVPersistenceFlag", m_ccvSEIPersistenceFlag, false, "Specifies the persistence of the content colour volume SEI message for the current layer.")
......@@ -1213,7 +1212,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
("SEICCVMaxLuminanceValue", m_ccvSEIMaxLuminanceValue, 0.1, "specifies the CCV max luminance value in the content colour volume SEI message")
("SEICCVAvgLuminanceValuePresent", m_ccvSEIAvgLuminanceValuePresentFlag, true, "Specifies whether the CCV avg luminance value is present in the content colour volume SEI message")
("SEICCVAvgLuminanceValue", m_ccvSEIAvgLuminanceValue, 0.01, "specifies the CCV avg luminance value in the content colour volume SEI message")
#endif
#if SHUTTER_INTERVAL_SEI_MESSAGE
("SEIShutterIntervalEnabled", m_siiSEIEnabled, false, "Controls if shutter interval information SEI message is enabled")
("SEISiiTimeScale", m_siiSEITimeScale, 27000000u, "Specifies sii_time_scale")
......
......@@ -347,7 +347,6 @@ protected:
Int m_preferredTransferCharacteristics;
UInt m_greenMetadataType;
UInt m_xsdMetricType;
#if CCV_SEI_MESSAGE
Bool m_ccvSEIEnabled;
Bool m_ccvSEICancelFlag;
Bool m_ccvSEIPersistenceFlag;
......@@ -360,7 +359,6 @@ protected:
Double m_ccvSEIMinLuminanceValue; // UInt(32)
Double m_ccvSEIMaxLuminanceValue; // UInt(32)
Double m_ccvSEIAvgLuminanceValue; // UInt(32)
#endif
#if ERP_SR_OV_SEI_MESSAGE
Bool m_erpSEIEnabled;
Bool m_erpSEICancelFlag;
......
......@@ -356,7 +356,6 @@ Void TAppEncTop::xInitLibCfg()
}
m_cTEncTop.setKneeSEIEnabled ( m_kneeSEIEnabled );
m_cTEncTop.setKneeFunctionInformationSEI ( m_kneeFunctionInformationSEI );
#if CCV_SEI_MESSAGE
m_cTEncTop.setCcvSEIEnabled (m_ccvSEIEnabled);
m_cTEncTop.setCcvSEICancelFlag (m_ccvSEICancelFlag);
m_cTEncTop.setCcvSEIPersistenceFlag (m_ccvSEIPersistenceFlag);
......@@ -375,7 +374,6 @@ Void TAppEncTop::xInitLibCfg()
m_cTEncTop.setCcvSEIMinLuminanceValue (m_ccvSEIMinLuminanceValue);
m_cTEncTop.setCcvSEIMaxLuminanceValue (m_ccvSEIMaxLuminanceValue);
m_cTEncTop.setCcvSEIAvgLuminanceValue (m_ccvSEIAvgLuminanceValue);
#endif
#if ERP_SR_OV_SEI_MESSAGE
m_cTEncTop.setErpSEIEnabled ( m_erpSEIEnabled );
m_cTEncTop.setErpSEICancelFlag ( m_erpSEICancelFlag );
......
......@@ -77,9 +77,7 @@ const std::vector<SEI::PayloadType> SEI::prefix_sei_messages({
SEI::CODED_REGION_COMPLETION,
SEI::ALTERNATIVE_TRANSFER_CHARACTERISTICS,
SEI::AMBIENT_VIEWING_ENVIRONMENT
#if CCV_SEI_MESSAGE
, SEI::CONTENT_COLOUR_VOLUME
#endif
#if ERP_SR_OV_SEI_MESSAGE
, SEI::EQUIRECTANGULAR_PROJECTION
, SEI::SPHERE_ROTATION
......@@ -310,9 +308,7 @@ const TChar *SEI::getSEIMessageString(SEI::PayloadType payloadType)
case SEI::CODED_REGION_COMPLETION: return "Coded region completion";
case SEI::ALTERNATIVE_TRANSFER_CHARACTERISTICS: return "Alternative transfer characteristics";
case SEI::AMBIENT_VIEWING_ENVIRONMENT: return "Ambient viewing environment";
#if CCV_SEI_MESSAGE
case SEI::CONTENT_COLOUR_VOLUME: return "Content Colour Volume";
#endif
#if ERP_SR_OV_SEI_MESSAGE
case SEI::EQUIRECTANGULAR_PROJECTION: return "Equirectangular projection";
case SEI::SPHERE_ROTATION: return "Sphere rotation";
......
......@@ -93,9 +93,7 @@ public:
CODED_REGION_COMPLETION = 146, // TODO: add encoder command line control to create these messages
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
AMBIENT_VIEWING_ENVIRONMENT = 148, // TODO: add encoder command line control to create these messages
#if CCV_SEI_MESSAGE
CONTENT_COLOUR_VOLUME = 149,
#endif
#if ERP_SR_OV_SEI_MESSAGE
EQUIRECTANGULAR_PROJECTION = 150,
SPHERE_ROTATION = 154,
......@@ -776,7 +774,6 @@ public:
std::vector<Int> m_kneeOutputKneePoint;
};
#if CCV_SEI_MESSAGE
class SEIContentColourVolume : public SEI
{
public:
......@@ -796,7 +793,6 @@ public:
UInt m_ccvMaxLuminanceValue;
UInt m_ccvAvgLuminanceValue;
};
#endif
#if ERP_SR_OV_SEI_MESSAGE
class SEIEquirectangularProjection : public SEI
......
......@@ -97,7 +97,6 @@
#endif
#define MCTS_ENC_CHECK 1 ///< Temporal MCTS encoder constraint and decoder checks. Also requires SEITMCTSTileConstraint to be enabled to enforce constraint
#define CCV_SEI_MESSAGE 1 // Content Colour Volume SEI message
#define RWP_SEI_MESSAGE 1 // region-wise SEI message
#define CMP_SEI_MESSAGE 1 // cubemap projection SEI message
#define ERP_SR_OV_SEI_MESSAGE 1 // equirectangular projection, sphere rotation, and omni viewport SEI message
......
......@@ -346,12 +346,10 @@ Void SEIReader::xReadSEIPayloadData(Int const payloadType, Int const payloadSize
sei = new SEIAmbientViewingEnvironment;
xParseSEIAmbientViewingEnvironment((SEIAmbientViewingEnvironment&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
#if CCV_SEI_MESSAGE
case SEI::CONTENT_COLOUR_VOLUME:
sei = new SEIContentColourVolume;
xParseSEIContentColourVolume((SEIContentColourVolume&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
#endif
#if ERP_SR_OV_SEI_MESSAGE
case SEI::EQUIRECTANGULAR_PROJECTION:
sei = new SEIEquirectangularProjection;
......@@ -1538,7 +1536,6 @@ Void SEIReader::xParseSEIKneeFunctionInfo(SEIKneeFunctionInfo& sei, UInt payload
}
}
#if CCV_SEI_MESSAGE
Void SEIReader::xParseSEIContentColourVolume(SEIContentColourVolume& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
{
Int i;
......@@ -1577,7 +1574,6 @@ Void SEIReader::xParseSEIContentColourVolume(SEIContentColourVolume& sei, UInt p
}
}
}
#endif
#if SHUTTER_INTERVAL_SEI_MESSAGE
Void SEIReader::xParseSEIShutterInterval(SEIShutterIntervalInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
......
......@@ -94,9 +94,7 @@ protected:
#endif
Void xParseSEIChromaResamplingFilterHint (SEIChromaResamplingFilterHint& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
Void xParseSEIKneeFunctionInfo (SEIKneeFunctionInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#if CCV_SEI_MESSAGE
Void xParseSEIContentColourVolume (SEIContentColourVolume& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#endif
#if ERP_SR_OV_SEI_MESSAGE
Void xParseSEIEquirectangularProjection (SEIEquirectangularProjection &sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
Void xParseSEISphereRotation (SEISphereRotation &sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
......
......@@ -515,7 +515,6 @@ Void SEIEncoder::initSEIKneeFunctionInfo(SEIKneeFunctionInfo *seiKneeFunctionInf
}
}
}
#if CCV_SEI_MESSAGE
Void SEIEncoder::initSEIContentColourVolume(SEIContentColourVolume *seiContentColourVolume)
{
assert(m_isInitialized);
......@@ -552,7 +551,6 @@ Void SEIEncoder::initSEIContentColourVolume(SEIContentColourVolume *seiContentCo
seiContentColourVolume->m_ccvAvgLuminanceValue = (Int) (10000000 * m_pcCfg->getCcvSEIAvgLuminanceValue());
}
}
#endif
#if SHUTTER_INTERVAL_SEI_MESSAGE
Void SEIEncoder::initSEIShutterIntervalInfo(SEIShutterIntervalInfo *seiShutterIntervalInfo)
......
......@@ -81,9 +81,7 @@ public:
Void initSEIMCTSExtractionInfo(SEIMCTSExtractionInfoSet *sei, const TComVPS *vps, const TComSPS *sps, const TComPPS *pps);
#endif
Void initSEIKneeFunctionInfo(SEIKneeFunctionInfo *sei);
#if CCV_SEI_MESSAGE
Void initSEIContentColourVolume(SEIContentColourVolume *sei);
#endif
#if SHUTTER_INTERVAL_SEI_MESSAGE
Void initSEIShutterIntervalInfo(SEIShutterIntervalInfo *sei);
#endif
......
......@@ -176,11 +176,9 @@ Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComSP
case SEI::AMBIENT_VIEWING_ENVIRONMENT:
xWriteSEIAmbientViewingEnvironment(*static_cast<const SEIAmbientViewingEnvironment*>(&sei));
break;
#if CCV_SEI_MESSAGE
case SEI::CONTENT_COLOUR_VOLUME:
xWriteSEIContentColourVolume(*static_cast<const SEIContentColourVolume*>(&sei));
break;
#endif
#if ERP_SR_OV_SEI_MESSAGE
case SEI::EQUIRECTANGULAR_PROJECTION:
xWriteSEIEquirectangularProjection(*static_cast<const SEIEquirectangularProjection*>(&sei));
......@@ -1108,7 +1106,6 @@ Void SEIWriter::xWriteSEIKneeFunctionInfo(const SEIKneeFunctionInfo &sei)
}
}
#if CCV_SEI_MESSAGE
Void SEIWriter::xWriteSEIContentColourVolume(const SEIContentColourVolume &sei)
{
WRITE_FLAG(sei.m_ccvCancelFlag, "ccv_cancel_flag");
......@@ -1143,7 +1140,6 @@ Void SEIWriter::xWriteSEIContentColourVolume(const SEIContentColourVolume &sei)
}
}
}
#endif
#if SHUTTER_INTERVAL_SEI_MESSAGE
Void SEIWriter::xWriteSEIShutterInterval(const SEIShutterIntervalInfo &sei)
......
......@@ -88,9 +88,7 @@ protected:
#endif
Void xWriteSEIChromaResamplingFilterHint (const SEIChromaResamplingFilterHint& sei);
Void xWriteSEIKneeFunctionInfo (const SEIKneeFunctionInfo &sei);
#if CCV_SEI_MESSAGE
Void xWriteSEIContentColourVolume (const SEIContentColourVolume &sei);
#endif
#if ERP_SR_OV_SEI_MESSAGE
Void xWriteSEIEquirectangularProjection (const SEIEquirectangularProjection &sei);
Void xWriteSEISphereRotation (const SEISphereRotation &sei);
......
......@@ -373,7 +373,6 @@ protected:
Bool m_greenMetadataInfoSEIEnabled;
UChar m_greenMetadataType;
UChar m_xsdMetricType;
#if CCV_SEI_MESSAGE
Bool m_ccvSEIEnabled;
Bool m_ccvSEICancelFlag;
Bool m_ccvSEIPersistenceFlag;
......@@ -386,7 +385,6 @@ protected:
Double m_ccvSEIMinLuminanceValue;
Double m_ccvSEIMaxLuminanceValue;
Double m_ccvSEIAvgLuminanceValue;
#endif
#if ERP_SR_OV_SEI_MESSAGE
Bool m_erpSEIEnabled;
Bool m_erpSEICancelFlag;
......@@ -997,7 +995,6 @@ public:
Void setKneeFunctionInformationSEI(const TEncSEIKneeFunctionInformation &seiknee) { m_kneeFunctionInformationSEI = seiknee; }
const TEncSEIKneeFunctionInformation &getKneeFunctionInformationSEI() const { return m_kneeFunctionInformationSEI; }
#if CCV_SEI_MESSAGE
Void setCcvSEIEnabled(Bool b) { m_ccvSEIEnabled = b; }
Bool getCcvSEIEnabled() { return m_ccvSEIEnabled; }
Void setCcvSEICancelFlag(Bool b) { m_ccvSEICancelFlag = b; }
......@@ -1022,7 +1019,6 @@ public:
Double getCcvSEIMaxLuminanceValue () { return m_ccvSEIMaxLuminanceValue; }
Void setCcvSEIAvgLuminanceValue (Double dValue) { m_ccvSEIAvgLuminanceValue = dValue; }
Double getCcvSEIAvgLuminanceValue () { return m_ccvSEIAvgLuminanceValue; }
#endif
#if SHUTTER_INTERVAL_SEI_MESSAGE
Void setSiiSEIEnabled(Bool b) { m_siiSEIEnabled = b; }
......
......@@ -484,14 +484,12 @@ Void TEncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const TCo
seiMessages.push_back(sei);
}
#if CCV_SEI_MESSAGE
if (m_pcCfg->getCcvSEIEnabled())
{
SEIContentColourVolume *seiContentColourVolume = new SEIContentColourVolume;
m_seiEncoder.initSEIContentColourVolume(seiContentColourVolume);
seiMessages.push_back(seiContentColourVolume);
}
#endif
#if SHUTTER_INTERVAL_SEI_MESSAGE
if (m_pcCfg->getSiiSEIEnabled())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment