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

remove macro ERP_SR_OV_SEI_MESSAGE

parent 2bdbc9bb
......@@ -729,13 +729,11 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
SMultiValueInput<Bool> cfg_timeCodeSeiHoursFlag (0, 1, 0, MAX_TIMECODE_SEI_SETS);
SMultiValueInput<Int> cfg_timeCodeSeiTimeOffsetLength (0, 31, 0, MAX_TIMECODE_SEI_SETS);
SMultiValueInput<Int> cfg_timeCodeSeiTimeOffsetValue (std::numeric_limits<Int>::min(), std::numeric_limits<Int>::max(), 0, MAX_TIMECODE_SEI_SETS);
#if ERP_SR_OV_SEI_MESSAGE
SMultiValueInput<Int> cfg_omniViewportSEIAzimuthCentre (-11796480, 11796479, 0, 15);
SMultiValueInput<Int> cfg_omniViewportSEIElevationCentre ( -5898240, 5898240, 0, 15);
SMultiValueInput<Int> cfg_omniViewportSEITiltCentre (-11796480, 11796479, 0, 15);
SMultiValueInput<UInt> cfg_omniViewportSEIHorRange ( 1, 23592960, 0, 15);
SMultiValueInput<UInt> cfg_omniViewportSEIVerRange ( 1, 11796480, 0, 15);
#endif
SMultiValueInput<UInt> cfg_rwpSEIRwpTransformType (0, 7, 0, std::numeric_limits<UChar>::max());
SMultiValueInput<Bool> cfg_rwpSEIRwpGuardBandFlag (0, 1, 0, std::numeric_limits<UChar>::max());
SMultiValueInput<UInt> cfg_rwpSEIProjRegionWidth (0, std::numeric_limits<UInt>::max(), 0, std::numeric_limits<UChar>::max());
......@@ -1241,7 +1239,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
("SEIAVEAmbientLightX", m_aveSEIAmbientLightX, 15635u, "Specifies the normalized x chromaticity coordinate of the environmental ambient light in the nominal viewing enviornment according to the CIE 1931 defination in units of 1/50000 lux for the ambient viewing enviornment SEI message")
("SEIAVEAmbientLightY", m_aveSEIAmbientLightY, 16450u, "Specifies the normalized y chromaticity coordinate of the environmental ambient light in the nominal viewing enviornment according to the CIE 1931 defination in units of 1/50000 lux for the ambient viewing enviornment SEI message")
#endif
#if ERP_SR_OV_SEI_MESSAGE
("SEIErpEnabled", m_erpSEIEnabled, false, "Control generation of equirectangular projection SEI messages")
("SEIErpCancelFlag", m_erpSEICancelFlag, true, "Indicate that equirectangular projection SEI message cancels the persistence or follows")
("SEIErpPersistenceFlag", m_erpSEIPersistenceFlag, false, "Specifies the persistence of the equirectangular projection SEI messages")
......@@ -1265,7 +1262,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
("SEIOmniViewportTiltCentre", cfg_omniViewportSEITiltCentre, cfg_omniViewportSEITiltCentre, "Indicates the tilt angle of the i-th recommended viewport region")
("SEIOmniViewportHorRange", cfg_omniViewportSEIHorRange, cfg_omniViewportSEIHorRange, "Indicates the azimuth range of the i-th recommended viewport region")
("SEIOmniViewportVerRange", cfg_omniViewportSEIVerRange, cfg_omniViewportSEIVerRange, "Indicates the elevation range of the i-th recommended viewport region")
#endif
("SEICmpEnabled", m_cmpSEIEnabled, false, "Controls generation of cubemap projection SEI message")
("SEICmpCancelFlag", m_cmpSEICmpCancelFlag, true, "Specifies the persistence of any previous cubemap projection SEI message in output order.")
("SEICmpPersistenceFlag", m_cmpSEICmpPersistenceFlag, false, "Specifies the persistence of the cubemap projection SEI message for the current layer.")
......@@ -1892,7 +1888,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
}
}
#if ERP_SR_OV_SEI_MESSAGE
if ( m_omniViewportSEIEnabled && !m_omniViewportSEICancelFlag )
{
assert ( m_omniViewportSEICntMinus1 >= 0 && m_omniViewportSEICntMinus1 < 16 );
......@@ -1910,7 +1905,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
m_omniViewportSEIVerRange[i] = cfg_omniViewportSEIVerRange .values.size() > i ? cfg_omniViewportSEIVerRange .values[i] : 0;
}
}
#endif
if(!m_rwpSEIRwpCancelFlag && m_rwpSEIEnabled)
{
......@@ -2968,7 +2962,6 @@ Void TAppEncCfg::xCheckParameter()
xConfirmPara(m_preferredTransferCharacteristics > 255, "transfer_characteristics_idc should not be greater than 255.");
#if ERP_SR_OV_SEI_MESSAGE
if( m_erpSEIEnabled && !m_erpSEICancelFlag )
{
xConfirmPara( m_erpSEIGuardBandType < 0 || m_erpSEIGuardBandType > 8, "SEIEquirectangularprojectionGuardBandType must be in the range of 0 to 7");
......@@ -2997,7 +2990,6 @@ Void TAppEncCfg::xCheckParameter()
xConfirmPara( m_omniViewportSEIVerRange[i] < 1 || m_omniViewportSEIVerRange[i] > (180<<16), "SEIOmniViewportVerRange must be in the range of 1 to 180*2^16");
}
}
#endif
if (m_gopBasedTemporalFilterEnabled)
{
......
......@@ -359,7 +359,6 @@ protected:
Double m_ccvSEIMinLuminanceValue; // UInt(32)
Double m_ccvSEIMaxLuminanceValue; // UInt(32)
Double m_ccvSEIAvgLuminanceValue; // UInt(32)
#if ERP_SR_OV_SEI_MESSAGE
Bool m_erpSEIEnabled;
Bool m_erpSEICancelFlag;
Bool m_erpSEIPersistenceFlag;
......@@ -385,7 +384,6 @@ protected:
std::vector<Int> m_omniViewportSEITiltCentre;
std::vector<UInt> m_omniViewportSEIHorRange;
std::vector<UInt> m_omniViewportSEIVerRange;
#endif
Bool m_cmpSEIEnabled;
Bool m_cmpSEICmpCancelFlag;
Bool m_cmpSEICmpPersistenceFlag;
......
......@@ -374,7 +374,6 @@ Void TAppEncTop::xInitLibCfg()
m_cTEncTop.setCcvSEIMinLuminanceValue (m_ccvSEIMinLuminanceValue);
m_cTEncTop.setCcvSEIMaxLuminanceValue (m_ccvSEIMaxLuminanceValue);
m_cTEncTop.setCcvSEIAvgLuminanceValue (m_ccvSEIAvgLuminanceValue);
#if ERP_SR_OV_SEI_MESSAGE
m_cTEncTop.setErpSEIEnabled ( m_erpSEIEnabled );
m_cTEncTop.setErpSEICancelFlag ( m_erpSEICancelFlag );
m_cTEncTop.setErpSEIPersistenceFlag ( m_erpSEIPersistenceFlag );
......@@ -398,7 +397,6 @@ Void TAppEncTop::xInitLibCfg()
m_cTEncTop.setOmniViewportSEITiltCentre ( m_omniViewportSEITiltCentre );
m_cTEncTop.setOmniViewportSEIHorRange ( m_omniViewportSEIHorRange );
m_cTEncTop.setOmniViewportSEIVerRange ( m_omniViewportSEIVerRange );
#endif
m_cTEncTop.setGopBasedTemporalFilterEnabled ( m_gopBasedTemporalFilterEnabled );
m_cTEncTop.setCmpSEIEnabled (m_cmpSEIEnabled);
m_cTEncTop.setCmpSEICmpCancelFlag (m_cmpSEICmpCancelFlag);
......
......@@ -78,11 +78,9 @@ const std::vector<SEI::PayloadType> SEI::prefix_sei_messages({
SEI::ALTERNATIVE_TRANSFER_CHARACTERISTICS,
SEI::AMBIENT_VIEWING_ENVIRONMENT
, SEI::CONTENT_COLOUR_VOLUME
#if ERP_SR_OV_SEI_MESSAGE
, SEI::EQUIRECTANGULAR_PROJECTION
, SEI::SPHERE_ROTATION
, SEI::OMNI_VIEWPORT
#endif
, SEI::CUBEMAP_PROJECTION
, SEI::REGION_WISE_PACKING
#if FVI_SEI_MESSAGE
......@@ -305,11 +303,9 @@ const TChar *SEI::getSEIMessageString(SEI::PayloadType payloadType)
case SEI::ALTERNATIVE_TRANSFER_CHARACTERISTICS: return "Alternative transfer characteristics";
case SEI::AMBIENT_VIEWING_ENVIRONMENT: return "Ambient viewing environment";
case SEI::CONTENT_COLOUR_VOLUME: return "Content Colour Volume";
#if ERP_SR_OV_SEI_MESSAGE
case SEI::EQUIRECTANGULAR_PROJECTION: return "Equirectangular projection";
case SEI::SPHERE_ROTATION: return "Sphere rotation";
case SEI::OMNI_VIEWPORT: return "Omni viewport";
#endif
case SEI::CUBEMAP_PROJECTION: return "Cubemap projection";
case SEI::REGION_WISE_PACKING: return "Region wise packing information";
#if FVI_SEI_MESSAGE
......
......@@ -94,11 +94,9 @@ public:
ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
AMBIENT_VIEWING_ENVIRONMENT = 148, // TODO: add encoder command line control to create these messages
CONTENT_COLOUR_VOLUME = 149,
#if ERP_SR_OV_SEI_MESSAGE
EQUIRECTANGULAR_PROJECTION = 150,
SPHERE_ROTATION = 154,
OMNI_VIEWPORT = 156,
#endif
CUBEMAP_PROJECTION = 151,
#if FVI_SEI_MESSAGE
FISHEYE_VIDEO_INFO = 152,
......@@ -790,7 +788,6 @@ public:
UInt m_ccvAvgLuminanceValue;
};
#if ERP_SR_OV_SEI_MESSAGE
class SEIEquirectangularProjection : public SEI
{
public:
......@@ -845,7 +842,6 @@ public:
UChar m_omniViewportCntMinus1;
std::vector<OmniViewport> m_omniViewportRegions;
};
#endif
#if AR_SEI_MESSAGE
class SEIAnnotatedRegions : 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 ERP_SR_OV_SEI_MESSAGE 1 // equirectangular projection, sphere rotation, and omni viewport SEI message
#define FVI_SEI_MESSAGE 1 // Fisheye Video Information SEI message
......
......@@ -350,7 +350,6 @@ Void SEIReader::xReadSEIPayloadData(Int const payloadType, Int const payloadSize
sei = new SEIContentColourVolume;
xParseSEIContentColourVolume((SEIContentColourVolume&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
#if ERP_SR_OV_SEI_MESSAGE
case SEI::EQUIRECTANGULAR_PROJECTION:
sei = new SEIEquirectangularProjection;
xParseSEIEquirectangularProjection((SEIEquirectangularProjection&) *sei, payloadSize, pDecodedMessageOutputStream);
......@@ -363,7 +362,6 @@ Void SEIReader::xReadSEIPayloadData(Int const payloadType, Int const payloadSize
sei = new SEIOmniViewport;
xParseSEIOmniViewport((SEIOmniViewport&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
#endif
case SEI::CUBEMAP_PROJECTION:
sei = new SEICubemapProjection;
xParseSEICubemapProjection((SEICubemapProjection&)*sei, payloadSize, pDecodedMessageOutputStream);
......@@ -1596,7 +1594,6 @@ Void SEIReader::xParseSEIShutterInterval(SEIShutterIntervalInfo& sei, UInt paylo
}
#endif
#if ERP_SR_OV_SEI_MESSAGE
Void SEIReader::xParseSEIEquirectangularProjection(SEIEquirectangularProjection& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
{
UInt val;
......@@ -1662,7 +1659,6 @@ Void SEIReader::xParseSEIOmniViewport(SEIOmniViewport& sei, UInt payloadSize, st
sei.m_omniViewportPersistenceFlag=false;
}
}
#endif
#if AR_SEI_MESSAGE
Void SEIReader::xParseSEIAnnotatedRegions(SEIAnnotatedRegions& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
......
......@@ -95,11 +95,9 @@ protected:
Void xParseSEIChromaResamplingFilterHint (SEIChromaResamplingFilterHint& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
Void xParseSEIKneeFunctionInfo (SEIKneeFunctionInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
Void xParseSEIContentColourVolume (SEIContentColourVolume& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#if ERP_SR_OV_SEI_MESSAGE
Void xParseSEIEquirectangularProjection (SEIEquirectangularProjection &sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
Void xParseSEISphereRotation (SEISphereRotation &sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
Void xParseSEIOmniViewport (SEIOmniViewport& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#endif
Void xParseSEICubemapProjection (SEICubemapProjection& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#if AR_SEI_MESSAGE
Void xParseSEIAnnotatedRegions (SEIAnnotatedRegions& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
......
......@@ -613,7 +613,6 @@ Void SEIEncoder::initSEIAmbientViewingEnvironment(SEIAmbientViewingEnvironment *
}
#endif
#if ERP_SR_OV_SEI_MESSAGE
Void SEIEncoder::initSEIErp(SEIEquirectangularProjection* seiEquirectangularProjection)
{
assert (m_isInitialized);
......@@ -672,7 +671,6 @@ Void SEIEncoder::initSEIOmniViewport(SEIOmniViewport* seiOmniViewport)
}
}
}
#endif
Void SEIEncoder::initSEICubemapProjection(SEICubemapProjection *seiCubemapProjection)
{
......
......@@ -90,11 +90,9 @@ public:
Void initSEIContentLightLevel(SEIContentLightLevelInfo *sei);
Void initSEIAmbientViewingEnvironment(SEIAmbientViewingEnvironment *sei);
#endif
#if ERP_SR_OV_SEI_MESSAGE
Void initSEIErp(SEIEquirectangularProjection *sei);
Void initSEISphereRotation(SEISphereRotation *sei);
Void initSEIOmniViewport(SEIOmniViewport *sei);
#endif
Void initSEICubemapProjection(SEICubemapProjection *sei);
Void initSEIRegionWisePacking(SEIRegionWisePacking *sei);
#if FVI_SEI_MESSAGE
......
......@@ -179,7 +179,6 @@ Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComSP
case SEI::CONTENT_COLOUR_VOLUME:
xWriteSEIContentColourVolume(*static_cast<const SEIContentColourVolume*>(&sei));
break;
#if ERP_SR_OV_SEI_MESSAGE
case SEI::EQUIRECTANGULAR_PROJECTION:
xWriteSEIEquirectangularProjection(*static_cast<const SEIEquirectangularProjection*>(&sei));
break;
......@@ -189,7 +188,6 @@ Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComSP
case SEI::OMNI_VIEWPORT:
xWriteSEIOmniViewport(*static_cast<const SEIOmniViewport*>(&sei));
break;
#endif
case SEI::CUBEMAP_PROJECTION:
xWriteSEICubemapProjection(*static_cast<const SEICubemapProjection*>(&sei));
break;
......@@ -1157,7 +1155,6 @@ Void SEIWriter::xWriteSEIShutterInterval(const SEIShutterIntervalInfo &sei)
}
#endif
#if ERP_SR_OV_SEI_MESSAGE
Void SEIWriter::xWriteSEIEquirectangularProjection(const SEIEquirectangularProjection &sei)
{
WRITE_FLAG( sei.m_erpCancelFlag, "erp_cancel_flag" );
......@@ -1208,7 +1205,6 @@ Void SEIWriter::xWriteSEIOmniViewport(const SEIOmniViewport &sei)
}
}
}
#endif
Void SEIWriter::xWriteSEICubemapProjection(const SEICubemapProjection &sei)
{
WRITE_FLAG(sei.m_cmpCancelFlag, "cmp_cancel_flag");
......
......@@ -89,11 +89,9 @@ protected:
Void xWriteSEIChromaResamplingFilterHint (const SEIChromaResamplingFilterHint& sei);
Void xWriteSEIKneeFunctionInfo (const SEIKneeFunctionInfo &sei);
Void xWriteSEIContentColourVolume (const SEIContentColourVolume &sei);
#if ERP_SR_OV_SEI_MESSAGE
Void xWriteSEIEquirectangularProjection (const SEIEquirectangularProjection &sei);
Void xWriteSEISphereRotation (const SEISphereRotation &sei);
Void xWriteSEIOmniViewport (const SEIOmniViewport& sei);
#endif
Void xWriteSEICubemapProjection (const SEICubemapProjection &sei);
Void xWriteSEIRegionWisePacking (const SEIRegionWisePacking &sei);
#if FVI_SEI_MESSAGE
......
......@@ -385,7 +385,6 @@ protected:
Double m_ccvSEIMinLuminanceValue;
Double m_ccvSEIMaxLuminanceValue;
Double m_ccvSEIAvgLuminanceValue;
#if ERP_SR_OV_SEI_MESSAGE
Bool m_erpSEIEnabled;
Bool m_erpSEICancelFlag;
Bool m_erpSEIPersistenceFlag;
......@@ -409,7 +408,6 @@ protected:
std::vector<Int> m_omniViewportSEITiltCentre;
std::vector<UInt> m_omniViewportSEIHorRange;
std::vector<UInt> m_omniViewportSEIVerRange;
#endif
Bool m_gopBasedTemporalFilterEnabled;
Bool m_cmpSEIEnabled;
Bool m_cmpSEICmpCancelFlag;
......@@ -1063,7 +1061,6 @@ public:
Void setAmbientViewingEnvironmentSEIAmbientLightY(UShort v ) { m_aveSEIAmbientLightY = v; }
UShort getAmbientViewingEnvironmentSEIAmbientLightY() { return m_aveSEIAmbientLightY; }
#endif
#if ERP_SR_OV_SEI_MESSAGE
Void setErpSEIEnabled(Bool b) { m_erpSEIEnabled = b; }
Bool getErpSEIEnabled() { return m_erpSEIEnabled; }
Void setErpSEICancelFlag(Bool b) { m_erpSEICancelFlag = b; }
......@@ -1110,7 +1107,6 @@ public:
UInt getOmniViewportSEIHorRange(Int idx) { return m_omniViewportSEIHorRange[idx]; }
Void setOmniViewportSEIVerRange(const std::vector<UInt>& vi) { m_omniViewportSEIVerRange = vi; }
UInt getOmniViewportSEIVerRange(Int idx) { return m_omniViewportSEIVerRange[idx]; }
#endif
Void setGopBasedTemporalFilterEnabled(Bool flag) { m_gopBasedTemporalFilterEnabled = flag; }
Bool getGopBasedTemporalFilterEnabled() const { return m_gopBasedTemporalFilterEnabled; }
Void setCmpSEIEnabled(Bool b) { m_cmpSEIEnabled = b; }
......
......@@ -523,7 +523,6 @@ Void TEncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const TCo
seiMessages.push_back(seiAVE);
}
#endif
#if ERP_SR_OV_SEI_MESSAGE
if (m_pcCfg->getErpSEIEnabled())
{
SEIEquirectangularProjection *sei = new SEIEquirectangularProjection;
......@@ -544,7 +543,6 @@ Void TEncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const TCo
m_seiEncoder.initSEIOmniViewport(sei);
seiMessages.push_back(sei);
}
#endif
if (m_pcCfg->getCmpSEIEnabled())
{
SEICubemapProjection *seiCubemapProjection = new SEICubemapProjection;
......
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