Commit 2bdbc9bb authored by Karl Sharman's avatar Karl Sharman
Browse files

remove macro CMP_SEI_MESSAGE

parent 958ffc17
......@@ -1266,11 +1266,9 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
("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
#if CMP_SEI_MESSAGE
("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.")
#endif
("SEIRwpEnabled", m_rwpSEIEnabled, false, "Controls if region-wise packing SEI message enabled")
("SEIRwpCancelFlag", m_rwpSEIRwpCancelFlag, true, "Specifies the persistence of any previous region-wise packing SEI message in output order.")
("SEIRwpPersistenceFlag", m_rwpSEIRwpPersistenceFlag, false, "Specifies the persistence of the region-wise packing SEI message for the current layer.")
......
......@@ -386,11 +386,9 @@ protected:
std::vector<UInt> m_omniViewportSEIHorRange;
std::vector<UInt> m_omniViewportSEIVerRange;
#endif
#if CMP_SEI_MESSAGE
Bool m_cmpSEIEnabled;
Bool m_cmpSEICmpCancelFlag;
Bool m_cmpSEICmpPersistenceFlag;
#endif
Bool m_rwpSEIEnabled;
Bool m_rwpSEIRwpCancelFlag;
Bool m_rwpSEIRwpPersistenceFlag;
......
......@@ -400,11 +400,9 @@ Void TAppEncTop::xInitLibCfg()
m_cTEncTop.setOmniViewportSEIVerRange ( m_omniViewportSEIVerRange );
#endif
m_cTEncTop.setGopBasedTemporalFilterEnabled ( m_gopBasedTemporalFilterEnabled );
#if CMP_SEI_MESSAGE
m_cTEncTop.setCmpSEIEnabled (m_cmpSEIEnabled);
m_cTEncTop.setCmpSEICmpCancelFlag (m_cmpSEICmpCancelFlag);
m_cTEncTop.setCmpSEICmpPersistenceFlag (m_cmpSEICmpPersistenceFlag);
#endif
m_cTEncTop.setRwpSEIEnabled (m_rwpSEIEnabled);
m_cTEncTop.setRwpSEIRwpCancelFlag (m_rwpSEIRwpCancelFlag);
m_cTEncTop.setRwpSEIRwpPersistenceFlag (m_rwpSEIRwpPersistenceFlag);
......
......@@ -83,9 +83,7 @@ const std::vector<SEI::PayloadType> SEI::prefix_sei_messages({
, SEI::SPHERE_ROTATION
, SEI::OMNI_VIEWPORT
#endif
#if CMP_SEI_MESSAGE
, SEI::CUBEMAP_PROJECTION
#endif
, SEI::REGION_WISE_PACKING
#if FVI_SEI_MESSAGE
, SEI::FISHEYE_VIDEO_INFO
......@@ -312,9 +310,7 @@ const TChar *SEI::getSEIMessageString(SEI::PayloadType payloadType)
case SEI::SPHERE_ROTATION: return "Sphere rotation";
case SEI::OMNI_VIEWPORT: return "Omni viewport";
#endif
#if CMP_SEI_MESSAGE
case SEI::CUBEMAP_PROJECTION: return "Cubemap projection";
#endif
case SEI::REGION_WISE_PACKING: return "Region wise packing information";
#if FVI_SEI_MESSAGE
case SEI::FISHEYE_VIDEO_INFO: return "Fisheye video information";
......
......@@ -99,9 +99,7 @@ public:
SPHERE_ROTATION = 154,
OMNI_VIEWPORT = 156,
#endif
#if CMP_SEI_MESSAGE
CUBEMAP_PROJECTION = 151,
#endif
#if FVI_SEI_MESSAGE
FISHEYE_VIDEO_INFO = 152,
#endif
......@@ -915,7 +913,6 @@ public:
};
#endif
#if CMP_SEI_MESSAGE
class SEICubemapProjection : public SEI
{
public:
......@@ -925,7 +922,6 @@ public:
Bool m_cmpCancelFlag;
Bool m_cmpPersistenceFlag;
};
#endif
class SEIRegionWisePacking : 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 CMP_SEI_MESSAGE 1 // cubemap projection SEI message
#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
......
......@@ -364,12 +364,10 @@ Void SEIReader::xReadSEIPayloadData(Int const payloadType, Int const payloadSize
xParseSEIOmniViewport((SEIOmniViewport&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
#endif
#if CMP_SEI_MESSAGE
case SEI::CUBEMAP_PROJECTION:
sei = new SEICubemapProjection;
xParseSEICubemapProjection((SEICubemapProjection&)*sei, payloadSize, pDecodedMessageOutputStream);
break;
#endif
case SEI::REGION_WISE_PACKING:
sei = new SEIRegionWisePacking;
xParseSEIRegionWisePacking((SEIRegionWisePacking&) *sei, payloadSize, pDecodedMessageOutputStream);
......@@ -1789,7 +1787,6 @@ Void SEIReader::xParseSEIAnnotatedRegions(SEIAnnotatedRegions& sei, UInt payload
}
#endif
#if CMP_SEI_MESSAGE
Void SEIReader::xParseSEICubemapProjection(SEICubemapProjection& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
{
output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
......@@ -1801,7 +1798,6 @@ Void SEIReader::xParseSEICubemapProjection(SEICubemapProjection& sei, UInt paylo
sei_read_flag(pDecodedMessageOutputStream, val, "cmp_persistence_flag"); sei.m_cmpPersistenceFlag = val;
}
}
#endif
......
......@@ -100,9 +100,7 @@ protected:
Void xParseSEISphereRotation (SEISphereRotation &sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
Void xParseSEIOmniViewport (SEIOmniViewport& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#endif
#if CMP_SEI_MESSAGE
Void xParseSEICubemapProjection (SEICubemapProjection& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#endif
#if AR_SEI_MESSAGE
Void xParseSEIAnnotatedRegions (SEIAnnotatedRegions& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#endif
......
......@@ -674,7 +674,6 @@ Void SEIEncoder::initSEIOmniViewport(SEIOmniViewport* seiOmniViewport)
}
#endif
#if CMP_SEI_MESSAGE
Void SEIEncoder::initSEICubemapProjection(SEICubemapProjection *seiCubemapProjection)
{
assert(m_isInitialized);
......@@ -682,7 +681,6 @@ Void SEIEncoder::initSEICubemapProjection(SEICubemapProjection *seiCubemapProjec
seiCubemapProjection->m_cmpCancelFlag = m_pcCfg->getCmpSEICmpCancelFlag();
seiCubemapProjection->m_cmpPersistenceFlag = m_pcCfg->getCmpSEICmpPersistenceFlag();
}
#endif
Void SEIEncoder::initSEIRegionWisePacking(SEIRegionWisePacking *seiRegionWisePacking)
{
......
......@@ -95,9 +95,7 @@ public:
Void initSEISphereRotation(SEISphereRotation *sei);
Void initSEIOmniViewport(SEIOmniViewport *sei);
#endif
#if CMP_SEI_MESSAGE
Void initSEICubemapProjection(SEICubemapProjection *sei);
#endif
Void initSEIRegionWisePacking(SEIRegionWisePacking *sei);
#if FVI_SEI_MESSAGE
Void initSEIFisheyeVideoInfo(SEIFisheyeVideoInfo *sei);
......
......@@ -190,11 +190,9 @@ Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComSP
xWriteSEIOmniViewport(*static_cast<const SEIOmniViewport*>(&sei));
break;
#endif
#if CMP_SEI_MESSAGE
case SEI::CUBEMAP_PROJECTION:
xWriteSEICubemapProjection(*static_cast<const SEICubemapProjection*>(&sei));
break;
#endif
case SEI::REGION_WISE_PACKING:
xWriteSEIRegionWisePacking(*static_cast<const SEIRegionWisePacking*>(&sei));
break;
......@@ -1211,7 +1209,6 @@ Void SEIWriter::xWriteSEIOmniViewport(const SEIOmniViewport &sei)
}
}
#endif
#if CMP_SEI_MESSAGE
Void SEIWriter::xWriteSEICubemapProjection(const SEICubemapProjection &sei)
{
WRITE_FLAG(sei.m_cmpCancelFlag, "cmp_cancel_flag");
......@@ -1220,7 +1217,6 @@ Void SEIWriter::xWriteSEICubemapProjection(const SEICubemapProjection &sei)
WRITE_FLAG(sei.m_cmpPersistenceFlag, "cmp_persistence_flag");
}
}
#endif
Void SEIWriter::xWriteSEIRegionWisePacking(const SEIRegionWisePacking &sei)
{
WRITE_FLAG( sei.m_rwpCancelFlag, "rwp_cancel_flag" );
......
......@@ -94,9 +94,7 @@ protected:
Void xWriteSEISphereRotation (const SEISphereRotation &sei);
Void xWriteSEIOmniViewport (const SEIOmniViewport& sei);
#endif
#if CMP_SEI_MESSAGE
Void xWriteSEICubemapProjection (const SEICubemapProjection &sei);
#endif
Void xWriteSEIRegionWisePacking (const SEIRegionWisePacking &sei);
#if FVI_SEI_MESSAGE
Void xWriteSEIFisheyeVideoInfo (const SEIFisheyeVideoInfo &sei);
......
......@@ -411,11 +411,9 @@ protected:
std::vector<UInt> m_omniViewportSEIVerRange;
#endif
Bool m_gopBasedTemporalFilterEnabled;
#if CMP_SEI_MESSAGE
Bool m_cmpSEIEnabled;
Bool m_cmpSEICmpCancelFlag;
Bool m_cmpSEICmpPersistenceFlag;
#endif
Bool m_rwpSEIEnabled;
Bool m_rwpSEIRwpCancelFlag;
Bool m_rwpSEIRwpPersistenceFlag;
......@@ -1115,14 +1113,12 @@ public:
#endif
Void setGopBasedTemporalFilterEnabled(Bool flag) { m_gopBasedTemporalFilterEnabled = flag; }
Bool getGopBasedTemporalFilterEnabled() const { return m_gopBasedTemporalFilterEnabled; }
#if CMP_SEI_MESSAGE
Void setCmpSEIEnabled(Bool b) { m_cmpSEIEnabled = b; }
Bool getCmpSEIEnabled() { return m_cmpSEIEnabled; }
Void setCmpSEICmpCancelFlag(Bool b) { m_cmpSEICmpCancelFlag = b; }
Bool getCmpSEICmpCancelFlag() { return m_cmpSEICmpCancelFlag; }
Void setCmpSEICmpPersistenceFlag(Bool b) { m_cmpSEICmpPersistenceFlag = b; }
Bool getCmpSEICmpPersistenceFlag() { return m_cmpSEICmpPersistenceFlag; }
#endif
Void setRwpSEIEnabled(Bool b) { m_rwpSEIEnabled = b; }
Bool getRwpSEIEnabled() { return m_rwpSEIEnabled; }
Void setRwpSEIRwpCancelFlag(Bool b) { m_rwpSEIRwpCancelFlag = b; }
......
......@@ -545,14 +545,12 @@ Void TEncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const TCo
seiMessages.push_back(sei);
}
#endif
#if CMP_SEI_MESSAGE
if (m_pcCfg->getCmpSEIEnabled())
{
SEICubemapProjection *seiCubemapProjection = new SEICubemapProjection;
m_seiEncoder.initSEICubemapProjection(seiCubemapProjection);
seiMessages.push_back(seiCubemapProjection);
}
#endif
if (m_pcCfg->getRwpSEIEnabled())
{
SEIRegionWisePacking *seiRegionWisePacking = new SEIRegionWisePacking;
......
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