Commit 958ffc17 authored by Karl Sharman's avatar Karl Sharman
Browse files

remove macro RWP_SEI_MESSAGE

parent b455071d
......@@ -736,7 +736,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
SMultiValueInput<UInt> cfg_omniViewportSEIHorRange ( 1, 23592960, 0, 15);
SMultiValueInput<UInt> cfg_omniViewportSEIVerRange ( 1, 11796480, 0, 15);
#endif
#if RWP_SEI_MESSAGE
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());
......@@ -753,7 +752,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
SMultiValueInput<UInt> cfg_rwpSEIRwpBottomGuardBandHeight (0, std::numeric_limits<UChar>::max(), 0, std::numeric_limits<UChar>::max());
SMultiValueInput<Bool> cfg_rwpSEIRwpGuardBandNotUsedForPredFlag (0, 1, 0, std::numeric_limits<UChar>::max());
SMultiValueInput<UInt> cfg_rwpSEIRwpGuardBandType (0, 7, 0, 4*std::numeric_limits<UChar>::max());
#endif
#if FVI_SEI_MESSAGE
SMultiValueInput<UInt> cfg_fviSEIFisheyeCircularRegionCentreX (0, std::numeric_limits<UInt>::max(), 0, 4); // CONFIRM: all the '3's have been changed to '4's since "The value of fisheye_num_active_areas_minus1 shall be in the range of 0 to 3, inclusive", so up to 4 entries.
SMultiValueInput<UInt> cfg_fviSEIFisheyeCircularRegionCentreY (0, std::numeric_limits<UInt>::max(), 0, 4);
......@@ -1273,7 +1271,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
("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
#if RWP_SEI_MESSAGE
("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.")
......@@ -1299,7 +1296,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
("SEIRwpBottomGuardBandHeight", cfg_rwpSEIRwpBottomGuardBandHeight, cfg_rwpSEIRwpBottomGuardBandHeight, "specifies the height of the guard band below the i-th packed region.")
("SEIRwpGuardBandNotUsedForPredFlag", cfg_rwpSEIRwpGuardBandNotUsedForPredFlag, cfg_rwpSEIRwpGuardBandNotUsedForPredFlag, "Specifies if the guard bands is used in the inter prediction process.")
("SEIRwpGuardBandType", cfg_rwpSEIRwpGuardBandType, cfg_rwpSEIRwpGuardBandType, "Specifies the type of the guard bands for the i-th packed region.")
#endif
#if FVI_SEI_MESSAGE
("SEIFviEnabled", m_fisheyeVIdeoInfoSEIEnabled, false, "Controls if fisheye video information SEI message enabled")
("SEIFviCancelFlag", m_fisheyeVideoInfoSEI.m_fisheyeCancelFlag, true, "Specifies the persistence of any previous fisheye video information SEI message in output order.")
......@@ -1918,7 +1914,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
}
#endif
#if RWP_SEI_MESSAGE
if(!m_rwpSEIRwpCancelFlag && m_rwpSEIEnabled)
{
assert ( m_rwpSEINumPackedRegions > 0 && m_rwpSEINumPackedRegions <= std::numeric_limits<UChar>::max() );
......@@ -1971,7 +1966,6 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
}
}
}
#endif
#if FVI_SEI_MESSAGE
if (!m_fisheyeVideoInfoSEI.m_fisheyeCancelFlag && m_fisheyeVIdeoInfoSEIEnabled)
{
......
......@@ -391,7 +391,6 @@ protected:
Bool m_cmpSEICmpCancelFlag;
Bool m_cmpSEICmpPersistenceFlag;
#endif
#if RWP_SEI_MESSAGE
Bool m_rwpSEIEnabled;
Bool m_rwpSEIRwpCancelFlag;
Bool m_rwpSEIRwpPersistenceFlag;
......@@ -417,7 +416,6 @@ protected:
std::vector<UChar> m_rwpSEIRwpBottomGuardBandHeight;
std::vector<Bool> m_rwpSEIRwpGuardBandNotUsedForPredFlag;
std::vector<UChar> m_rwpSEIRwpGuardBandType;
#endif
Bool m_gopBasedTemporalFilterEnabled; ///< GOP-based Temporal Filter enable/disable
Bool m_gopBasedTemporalFilterFutureReference; ///< Enable/disable future frame references in the GOP-based Temporal Filter
std::map<Int, Double> m_gopBasedTemporalFilterStrengths; ///< Filter strength per frame for the GOP-based Temporal Filter
......
......@@ -405,7 +405,6 @@ Void TAppEncTop::xInitLibCfg()
m_cTEncTop.setCmpSEICmpCancelFlag (m_cmpSEICmpCancelFlag);
m_cTEncTop.setCmpSEICmpPersistenceFlag (m_cmpSEICmpPersistenceFlag);
#endif
#if RWP_SEI_MESSAGE
m_cTEncTop.setRwpSEIEnabled (m_rwpSEIEnabled);
m_cTEncTop.setRwpSEIRwpCancelFlag (m_rwpSEIRwpCancelFlag);
m_cTEncTop.setRwpSEIRwpPersistenceFlag (m_rwpSEIRwpPersistenceFlag);
......@@ -431,7 +430,6 @@ Void TAppEncTop::xInitLibCfg()
m_cTEncTop.setRwpSEIRwpBottomGuardBandHeight (m_rwpSEIRwpBottomGuardBandHeight);
m_cTEncTop.setRwpSEIRwpGuardBandNotUsedForPredFlag (m_rwpSEIRwpGuardBandNotUsedForPredFlag);
m_cTEncTop.setRwpSEIRwpGuardBandType (m_rwpSEIRwpGuardBandType);
#endif
#if SHUTTER_INTERVAL_SEI_MESSAGE
m_cTEncTop.setSiiSEIEnabled (m_siiSEIEnabled);
m_cTEncTop.setSiiSEINumUnitsInShutterInterval (m_siiSEINumUnitsInShutterInterval);
......
......@@ -86,9 +86,7 @@ const std::vector<SEI::PayloadType> SEI::prefix_sei_messages({
#if CMP_SEI_MESSAGE
, SEI::CUBEMAP_PROJECTION
#endif
#if RWP_SEI_MESSAGE
, SEI::REGION_WISE_PACKING
#endif
#if FVI_SEI_MESSAGE
, SEI::FISHEYE_VIDEO_INFO
#endif
......@@ -317,9 +315,7 @@ const TChar *SEI::getSEIMessageString(SEI::PayloadType payloadType)
#if CMP_SEI_MESSAGE
case SEI::CUBEMAP_PROJECTION: return "Cubemap projection";
#endif
#if RWP_SEI_MESSAGE
case SEI::REGION_WISE_PACKING: return "Region wise packing information";
#endif
#if FVI_SEI_MESSAGE
case SEI::FISHEYE_VIDEO_INFO: return "Fisheye video information";
#endif
......
......@@ -105,9 +105,7 @@ public:
#if FVI_SEI_MESSAGE
FISHEYE_VIDEO_INFO = 152,
#endif
#if RWP_SEI_MESSAGE
REGION_WISE_PACKING = 155,
#endif
#if RNSEI
REGIONAL_NESTING = 157,
#endif
......@@ -929,7 +927,6 @@ public:
};
#endif
#if RWP_SEI_MESSAGE
class SEIRegionWisePacking : public SEI
{
public:
......@@ -961,7 +958,6 @@ public:
std::vector<Bool> m_rwpGuardBandNotUsedForPredFlag;
std::vector<UChar> m_rwpGuardBandType;
};
#endif
#if FVI_SEI_MESSAGE
class SEIFisheyeVideoInfo : 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 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
......
......@@ -370,12 +370,10 @@ Void SEIReader::xReadSEIPayloadData(Int const payloadType, Int const payloadSize
xParseSEICubemapProjection((SEICubemapProjection&)*sei, payloadSize, pDecodedMessageOutputStream);
break;
#endif
#if RWP_SEI_MESSAGE
case SEI::REGION_WISE_PACKING:
sei = new SEIRegionWisePacking;
xParseSEIRegionWisePacking((SEIRegionWisePacking&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
#endif
#if AR_SEI_MESSAGE
case SEI::ANNOTATED_REGIONS:
......@@ -1807,7 +1805,6 @@ Void SEIReader::xParseSEICubemapProjection(SEICubemapProjection& sei, UInt paylo
#if RWP_SEI_MESSAGE
Void SEIReader::xParseSEIRegionWisePacking(SEIRegionWisePacking& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
{
output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
......@@ -1871,7 +1868,6 @@ Void SEIReader::xParseSEIRegionWisePacking(SEIRegionWisePacking& sei, UInt paylo
}
}
}
#endif
#if FVI_SEI_MESSAGE
Void SEIReader::xParseSEIFisheyeVideoInfo(SEIFisheyeVideoInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
......
......@@ -106,9 +106,7 @@ protected:
#if AR_SEI_MESSAGE
Void xParseSEIAnnotatedRegions (SEIAnnotatedRegions& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#endif
#if RWP_SEI_MESSAGE
Void xParseSEIRegionWisePacking (SEIRegionWisePacking& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#endif
#if FVI_SEI_MESSAGE
Void xParseSEIFisheyeVideoInfo(SEIFisheyeVideoInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
#endif
......
......@@ -684,7 +684,6 @@ Void SEIEncoder::initSEICubemapProjection(SEICubemapProjection *seiCubemapProjec
}
#endif
#if RWP_SEI_MESSAGE
Void SEIEncoder::initSEIRegionWisePacking(SEIRegionWisePacking *seiRegionWisePacking)
{
assert (m_isInitialized);
......@@ -739,7 +738,6 @@ Void SEIEncoder::initSEIRegionWisePacking(SEIRegionWisePacking *seiRegionWisePac
}
}
}
#endif
#if FVI_SEI_MESSAGE
Void SEIEncoder::initSEIFisheyeVideoInfo(SEIFisheyeVideoInfo *seiFisheyeVideoInfo)
......
......@@ -98,9 +98,7 @@ public:
#if CMP_SEI_MESSAGE
Void initSEICubemapProjection(SEICubemapProjection *sei);
#endif
#if RWP_SEI_MESSAGE
Void initSEIRegionWisePacking(SEIRegionWisePacking *sei);
#endif
#if FVI_SEI_MESSAGE
Void initSEIFisheyeVideoInfo(SEIFisheyeVideoInfo *sei);
#endif
......
......@@ -195,11 +195,9 @@ Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, const TComSP
xWriteSEICubemapProjection(*static_cast<const SEICubemapProjection*>(&sei));
break;
#endif
#if RWP_SEI_MESSAGE
case SEI::REGION_WISE_PACKING:
xWriteSEIRegionWisePacking(*static_cast<const SEIRegionWisePacking*>(&sei));
break;
#endif
#if FVI_SEI_MESSAGE
case SEI::FISHEYE_VIDEO_INFO:
xWriteSEIFisheyeVideoInfo(*static_cast<const SEIFisheyeVideoInfo*>(&sei));
......@@ -1223,7 +1221,6 @@ Void SEIWriter::xWriteSEICubemapProjection(const SEICubemapProjection &sei)
}
}
#endif
#if RWP_SEI_MESSAGE
Void SEIWriter::xWriteSEIRegionWisePacking(const SEIRegionWisePacking &sei)
{
WRITE_FLAG( sei.m_rwpCancelFlag, "rwp_cancel_flag" );
......@@ -1266,7 +1263,6 @@ Void SEIWriter::xWriteSEIRegionWisePacking(const SEIRegionWisePacking &sei)
}
}
}
#endif
#if FVI_SEI_MESSAGE
Void SEIWriter::xWriteSEIFisheyeVideoInfo(const SEIFisheyeVideoInfo &sei)
......
......@@ -97,9 +97,7 @@ protected:
#if CMP_SEI_MESSAGE
Void xWriteSEICubemapProjection (const SEICubemapProjection &sei);
#endif
#if RWP_SEI_MESSAGE
Void xWriteSEIRegionWisePacking (const SEIRegionWisePacking &sei);
#endif
#if FVI_SEI_MESSAGE
Void xWriteSEIFisheyeVideoInfo (const SEIFisheyeVideoInfo &sei);
#endif
......
......@@ -416,7 +416,6 @@ protected:
Bool m_cmpSEICmpCancelFlag;
Bool m_cmpSEICmpPersistenceFlag;
#endif
#if RWP_SEI_MESSAGE
Bool m_rwpSEIEnabled;
Bool m_rwpSEIRwpCancelFlag;
Bool m_rwpSEIRwpPersistenceFlag;
......@@ -442,7 +441,6 @@ protected:
std::vector<UChar> m_rwpSEIRwpBottomGuardBandHeight;
std::vector<Bool> m_rwpSEIRwpGuardBandNotUsedForPredFlag;
std::vector<UChar> m_rwpSEIRwpGuardBandType;
#endif
#if AR_SEI_MESSAGE
std::string m_arSEIFileRoot; // Annotated region SEI - initialized from external file
#endif
......@@ -1125,7 +1123,6 @@ public:
Void setCmpSEICmpPersistenceFlag(Bool b) { m_cmpSEICmpPersistenceFlag = b; }
Bool getCmpSEICmpPersistenceFlag() { return m_cmpSEICmpPersistenceFlag; }
#endif
#if RWP_SEI_MESSAGE
Void setRwpSEIEnabled(Bool b) { m_rwpSEIEnabled = b; }
Bool getRwpSEIEnabled() { return m_rwpSEIEnabled; }
Void setRwpSEIRwpCancelFlag(Bool b) { m_rwpSEIRwpCancelFlag = b; }
......@@ -1176,7 +1173,6 @@ public:
Bool getRwpSEIRwpGuardBandNotUsedForPredFlag(UInt idx) const { return m_rwpSEIRwpGuardBandNotUsedForPredFlag[idx]; }
Void setRwpSEIRwpGuardBandType(const std::vector<UChar>& rwpGuardBandType) { m_rwpSEIRwpGuardBandType = rwpGuardBandType; }
UChar getRwpSEIRwpGuardBandType(UInt idx) const { return m_rwpSEIRwpGuardBandType[idx]; }
#endif
#if FVI_SEI_MESSAGE
Void setFviSEIDisabled() { m_fviSEIEnabled = false; }
Void setFviSEIEnabled(const TComSEIFisheyeVideoInfo& fvi) { m_fisheyeVideoInfo=fvi; m_fviSEIEnabled=true; }
......
......@@ -553,14 +553,12 @@ Void TEncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const TCo
seiMessages.push_back(seiCubemapProjection);
}
#endif
#if RWP_SEI_MESSAGE
if (m_pcCfg->getRwpSEIEnabled())
{
SEIRegionWisePacking *seiRegionWisePacking = new SEIRegionWisePacking;
m_seiEncoder.initSEIRegionWisePacking(seiRegionWisePacking);
seiMessages.push_back(seiRegionWisePacking);
}
#endif
#if FVI_SEI_MESSAGE
if (m_pcCfg->getFviSEIEnabled())
{
......
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