diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 70e980d7552a00d42905220cd94334a0bf5c2f4c..d5be62c2e01bd23065f63772c5c2fcdd3e035abe 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -1126,11 +1126,9 @@ void EncApp::xInitLibCfg()
{
m_cEncLib.setScalingMatrixDesignatedColourSpace(m_scalingMatrixDesignatedColourSpace);
}
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
m_cEncLib.setConstrainedRaslencoding ( m_constrainedRaslEncoding );
m_cEncLib.setCraAPSreset ( m_craAPSreset );
m_cEncLib.setRprRASLtoolSwitch ( m_rprRASLtoolSwitch );
-#endif
m_cEncLib.setDepQuantEnabledFlag ( m_depQuantEnabledFlag);
m_cEncLib.setSignDataHidingEnabledFlag ( m_signDataHidingEnabledFlag);
m_cEncLib.setUseRateCtrl ( m_RCEnableRateControl );
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index b7d50a7e5df9bfc0d5c6d1ece744deddd8fc7f7c..153e80e881adb4b1c7549815d9ff4afe4f931bb2 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1567,9 +1567,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("SEIDRIDisparityRefViewId", m_driSEIDisparityRefViewId, 0, "Specifies the ViewId value against which the disparity values are derived in the depth representation information SEI message")
("SEIDRINonlinearNumMinus1", m_driSEINonlinearNumMinus1, 0, "Specifies the number of piece-wise linear segments minus 2 for mapping of depth values to a scale that is uniformly quantized in terms of disparity in the depth representation information SEI message")
("SEIDRINonlinearModel", cfg_driSEINonlinearModel, cfg_driSEINonlinearModel, "List of the piece-wise linear segments for mapping of decoded luma sample values of an auxiliary picture to a scale that is uniformly quantized in terms of disparity in the depth representation information SEI message")
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
("SEIConstrainedRASL", m_constrainedRaslEncoding, false, "Control generation of constrained RASL encoding SEI message")
-#endif
("DebugBitstream", m_decodeBitstreams[0], string( "" ), "Assume the frames up to POC DebugPOC will be the same as in this bitstream. Load those frames from the bitstream instead of encoding them." )
("DebugPOC", m_switchPOC, -1, "If DebugBitstream is present, load frames up to this POC from this bitstream. Starting with DebugPOC, return to normal encoding." )
@@ -1663,7 +1661,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
m_resChangeInClvsEnabled = m_scalingRatioHor != 1.0 || m_scalingRatioVer != 1.0;
m_resChangeInClvsEnabled = m_resChangeInClvsEnabled && m_rprEnabledFlag;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
if( m_constrainedRaslEncoding )
{
m_craAPSreset = true;
@@ -1674,7 +1671,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
m_craAPSreset = false;
m_rprRASLtoolSwitch = false;
}
-#endif
if( m_fractionOfFrames != 1.0 )
{
@@ -4668,12 +4664,10 @@ void EncAppCfg::xPrintParameter()
m_ext360.outputConfigurationSummary();
#endif
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
if( m_constrainedRaslEncoding )
{
msg(VERBOSE, "\n\nWarning: with SEIConstrainedRASL enabled, LMChroma estimation is skipped in RASL frames" );
}
-#endif
msg( VERBOSE, "\n\n");
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index eb145e69ca3d7b965fa701159057f769a20aa8f0..956e4a797c65557c2b61a92054aa4085018ee235 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -719,9 +719,7 @@ protected:
CfgSEISubpictureLevel m_cfgSubpictureLevelInfoSEI;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
bool m_constrainedRaslEncoding;
-#endif
bool m_sampleAspectRatioInfoSEIEnabled;
bool m_sariCancelFlag;
@@ -837,10 +835,8 @@ protected:
double m_fractionOfFrames; ///< encode a fraction of the frames as specified in FramesToBeEncoded
int m_switchPocPeriod;
int m_upscaledOutput; ////< Output upscaled (2), decoded cropped but in full resolution buffer (1) or decoded cropped (0, default) picture for RPR.
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
bool m_craAPSreset;
bool m_rprRASLtoolSwitch;
-#endif
bool m_avoidIntraInDepLayer;
bool m_gopBasedTemporalFilterEnabled; ///< GOP-based Temporal Filter enable/disable
diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp
index 6650a1b921d9934ef2757542ef98cf7599902469..150f067fe48d533d83e34dce450cc004eee062f9 100644
--- a/source/Lib/CommonLib/SEI.cpp
+++ b/source/Lib/CommonLib/SEI.cpp
@@ -478,9 +478,7 @@ const char *SEI::getSEIMessageString(SEI::PayloadType payloadType)
case SEI::ANNOTATED_REGIONS: return "Annotated Region";
case SEI::SCALABILITY_DIMENSION_INFO: return "Scalability dimension information";
case SEI::EXTENDED_DRAP_INDICATION: return "Extended DRAP indication";
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
case SEI::CONSTRAINED_RASL_ENCODING: return "Constrained RASL encoding";
-#endif
default: return "Unknown";
}
}
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index 989745276832214d9f42c640feaced66919b233a..ceda39f8bb31ab6b2e75b36ee05cb954296d4d10 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -90,9 +90,7 @@ public:
ANNOTATED_REGIONS = 202,
SCALABILITY_DIMENSION_INFO = 205,
EXTENDED_DRAP_INDICATION = 206,
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
CONSTRAINED_RASL_ENCODING = 207,
-#endif
};
SEI() {}
@@ -988,7 +986,6 @@ public:
std::vector<int> m_edrapIndicationRefRapId;
};
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
class SEIConstrainedRaslIndication : public SEI
{
public:
@@ -997,7 +994,6 @@ public:
virtual ~SEIConstrainedRaslIndication() { }
};
-#endif
//! \}
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 55461434f20fda7a3ba60e7578d05ff6111d837f..869eab5772f9dab6e3bc9bd9fb90c57f16a3cfbf 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -82,9 +82,7 @@ Slice::Slice()
, m_pendingRasInit ( false )
, m_bCheckLDC ( false )
, m_biDirPred ( false )
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
, m_lmChromaCheckDisable ( false )
-#endif
, m_iSliceQpDelta ( 0 )
, m_iDepth ( 0 )
, m_pcSPS ( NULL )
@@ -187,9 +185,7 @@ void Slice::initSlice()
m_bCheckLDC = false;
m_biDirPred = false;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
m_lmChromaCheckDisable = false;
-#endif
m_symRefIdx[0] = -1;
m_symRefIdx[1] = -1;
@@ -947,9 +943,7 @@ void Slice::copySliceInfo(Slice *pSrc, bool cpyAlmostAll)
m_iSliceQpDelta = pSrc->m_iSliceQpDelta;
m_biDirPred = pSrc->m_biDirPred;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
m_lmChromaCheckDisable = pSrc->m_lmChromaCheckDisable;;
-#endif
m_symRefIdx[0] = pSrc->m_symRefIdx[0];
m_symRefIdx[1] = pSrc->m_symRefIdx[1];
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index f328bc56f2659c59185b758711724c06f1ae120d..2de5643423977555c08fc61c79f68eefd6b9df93 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -2685,9 +2685,7 @@ private:
bool m_bCheckLDC;
bool m_biDirPred;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
bool m_lmChromaCheckDisable;
-#endif
int m_symRefIdx[2];
// Data
@@ -2900,10 +2898,8 @@ public:
void setBiDirPred( bool b, int refIdx0, int refIdx1 ) { m_biDirPred = b; m_symRefIdx[0] = refIdx0; m_symRefIdx[1] = refIdx1; }
bool getBiDirPred() const { return m_biDirPred; }
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
void setDisableLmChromaCheck( bool b ) { m_lmChromaCheckDisable = b; }
bool getDisableLmChromaCheck() const { return m_lmChromaCheckDisable; }
-#endif
int getSymRefIdx( int refList ) const { return m_symRefIdx[refList]; }
bool isIntra() const { return m_eSliceType == I_SLICE; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 57ba502bfcacb724ffdc23b9bac954ce3d406c7e..df32665b8a4aa8b83c9ca5d751a2363df932c0fe 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -53,7 +53,6 @@
// clang-format off
//########### place macros to be removed in next cycle below this line ###############
-#define JVET_W0133_CONSTRAINED_RASL_ENCODING 1 // SEI message for Constrained RASL encoding for bitstream switching
#define JVET_T0055_ITEM2 1 // JVET-T0055 item 2: Remove the step 9 of the general sub-bitstream extraction process.
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index d6dd927c0b71d6996d230b1c761d92436ca49ff5..6a9a38c361b19f07a5e2a727b54b2674365afb8b 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -334,12 +334,10 @@ void SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType
sei = new SEIColourTransformInfo;
xParseSEIColourTransformInfo((SEIColourTransformInfo&)*sei, payloadSize, pDecodedMessageOutputStream);
break;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
case SEI::CONSTRAINED_RASL_ENCODING:
sei = new SEIConstrainedRaslIndication;
xParseSEIConstrainedRaslIndication((SEIConstrainedRaslIndication&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
-#endif
default:
for (uint32_t i = 0; i < payloadSize; i++)
{
@@ -2033,12 +2031,10 @@ void SEIReader::xParseSEIExtendedDrapIndication(SEIExtendedDrapIndication& sei,
}
}
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
void SEIReader::xParseSEIConstrainedRaslIndication( SEIConstrainedRaslIndication& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream )
{
output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
}
-#endif
#if JVET_S0257_DUMP_360SEI_MESSAGE
void SeiCfgFileDump::write360SeiDump (std::string decoded360MessageFileName, SEIMessages& seis, const SPS* sps)
diff --git a/source/Lib/DecoderLib/SEIread.h b/source/Lib/DecoderLib/SEIread.h
index 8a9f0aea74b5aa8521f88a3206de32f9ca82d78a..f6bfbbe67a5fd9310d2e71b29672e6b811cd542f 100644
--- a/source/Lib/DecoderLib/SEIread.h
+++ b/source/Lib/DecoderLib/SEIread.h
@@ -98,9 +98,7 @@ protected:
void xParseSEIContentColourVolume (SEIContentColourVolume& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIExtendedDrapIndication (SEIExtendedDrapIndication& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIColourTransformInfo (SEIColourTransformInfo& sei, uint32_t payloadSize, std::ostream* pDecodedMessageOutputStream);
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
void xParseSEIConstrainedRaslIndication (SEIConstrainedRaslIndication& sei, uint32_t payLoadSize, std::ostream *pDecodedMessageOutputStream);
-#endif
void sei_read_scode(std::ostream *pOS, uint32_t length, int& code, const char *pSymbolName);
void sei_read_code(std::ostream *pOS, uint32_t uiLength, uint32_t& ruiCode, const char *pSymbolName);
diff --git a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
index 60cfb552ce1f65b52f618086c3acbf7fe539f836..1534f4cb8a107b88f2b3469b72d4d39590eae045 100644
--- a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
+++ b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
@@ -881,11 +881,7 @@ void EncAdaptiveLoopFilter::ALFProcess(CodingStructure& cs, const double *lambda
int layerIdx = cs.vps == nullptr ? 0 : cs.vps->getGeneralLayerIdx( cs.slice->getPic()->layerId );
// IRAP AU is assumed
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
if( !layerIdx && ( cs.slice->getPendingRasInit() || cs.slice->isIDRorBLA() || ( cs.slice->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA && m_encCfg->getCraAPSreset() ) ) )
-#else
- if( !layerIdx && ( cs.slice->getPendingRasInit() || cs.slice->isIDRorBLA() ) )
-#endif
{
memset(cs.slice->getAlfAPSs(), 0, sizeof(*cs.slice->getAlfAPSs())*ALF_CTB_MAX_NUM_APS);
m_apsIdStart = ALF_CTB_MAX_NUM_APS;
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 2fdec7f1d61ff425c92fcf3d56c210c943775a12..3f96781368a4b8e7f850a96734c5bdfc98cdbb7e 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -762,9 +762,7 @@ protected:
int m_driSEINonlinearNumMinus1;
std::vector<uint32_t> m_driSEINonlinearModel;
std::string m_arSEIFileRoot; // Annotated region SEI - initialized from external file
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
bool m_constrainedRaslEncoding;
-#endif
//====== Weighted Prediction ========
bool m_useWeightedPred; //< Use of Weighting Prediction (P_SLICE)
@@ -897,10 +895,8 @@ protected:
int m_upscaledOutput;
int m_numRefLayers[MAX_VPS_LAYERS];
bool m_avoidIntraInDepLayer;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
bool m_craAPSreset;
bool m_rprRASLtoolSwitch;
-#endif
public:
EncCfg()
@@ -2082,14 +2078,12 @@ public:
int getDriSEINonlinearNumMinus1() const { return m_driSEINonlinearNumMinus1; }
void setDriSEINonlinearModel(const std::vector<uint32_t>& driSEINonLinearModel) { m_driSEINonlinearModel = driSEINonLinearModel; }
uint32_t getDriSEINonlinearModel(int idx) const { return m_driSEINonlinearModel[idx]; }
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
void setConstrainedRaslencoding(bool b) { m_constrainedRaslEncoding = b; }
bool getConstrainedRaslencoding() { return m_constrainedRaslEncoding; }
void setCraAPSreset(bool b) { m_craAPSreset = b; }
bool getCraAPSreset() const { return m_craAPSreset; }
void setRprRASLtoolSwitch(bool b) { m_rprRASLtoolSwitch = b; }
bool getRprRASLtoolSwitch() { return m_rprRASLtoolSwitch; }
-#endif
void setUseWP ( bool b ) { m_useWeightedPred = b; }
void setWPBiPred ( bool b ) { m_useWeightedBiPred = b; }
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index dc9b083f8dfbe94098cc7fde1f575df7d8f2b7fd..b4a20406cda5caf93cd644aa28fbfa9d3aac31bb 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -820,13 +820,11 @@ void EncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const SPS
m_seiEncoder.initSEIColourTransformInfo(seiCTI);
seiMessages.push_back(seiCTI);
}
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
if (m_pcCfg->getConstrainedRaslencoding())
{
SEIConstrainedRaslIndication* seiConstrainedRasl = new SEIConstrainedRaslIndication;
seiMessages.push_back(seiConstrainedRasl);
}
-#endif
}
void EncGOP::xCreatePerPictureSEIMessages (int picInGOP, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, Slice *slice)
@@ -2917,14 +2915,12 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
pcSlice->setBiDirPred( false, -1, -1 );
}
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
if( pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_RASL && m_pcCfg->getRprRASLtoolSwitch() )
{
pcSlice->setDisableLmChromaCheck( true );
picHeader->setDmvrDisabledFlag( true );
xUpdateRPRtmvp( picHeader, pcSlice );
}
-#endif
double lambda = 0.0;
int actualHeadBits = 0;
@@ -5516,7 +5512,6 @@ void EncGOP::xUpdateRasInit(Slice* slice)
}
}
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
void EncGOP::xUpdateRPRtmvp( PicHeader* pcPicHeader, Slice* pcSlice )
{
if( pcPicHeader->getEnableTMVPFlag() )
@@ -5577,7 +5572,6 @@ void EncGOP::xUpdateRPRtmvp( PicHeader* pcPicHeader, Slice* pcSlice )
}
}
}
-#endif
double EncGOP::xCalculateRVM()
{
diff --git a/source/Lib/EncoderLib/EncGOP.h b/source/Lib/EncoderLib/EncGOP.h
index bc7d2869aff9d9070f5b6bae19c0b106333d47d4..0671d8b76b53287376c73149b83b246720df227a 100644
--- a/source/Lib/EncoderLib/EncGOP.h
+++ b/source/Lib/EncoderLib/EncGOP.h
@@ -320,9 +320,7 @@ protected:
void xUpdateRasInit(Slice* slice);
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
void xUpdateRPRtmvp ( PicHeader* pcPicHeader, Slice* pcSlice );
-#endif
void xWriteAccessUnitDelimiter (AccessUnit &accessUnit, Slice *slice);
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index b3e46ff2977c94071c29d879097668fda2ae8e65..91049766a7ac9021196c732ddb5bd2a5796ef2db 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1435,11 +1435,7 @@ void EncLib::xInitSPS( SPS& sps )
sps.setInterLayerPresentFlag( m_layerId > 0 && m_vps->getMaxLayers() > 1 && !m_vps->getAllIndependentLayersFlag() && !m_vps->getIndependentLayerFlag( m_vps->getGeneralLayerIdx( m_layerId ) ) );
CHECK( m_vps->getIndependentLayerFlag( m_vps->getGeneralLayerIdx( m_layerId ) ) && sps.getInterLayerPresentFlag(), " When vps_independent_layer_flag[GeneralLayerIdx[nuh_layer_id ]] is equal to 1, the value of inter_layer_ref_pics_present_flag shall be equal to 0." );
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
sps.setResChangeInClvsEnabledFlag(m_resChangeInClvsEnabled || m_constrainedRaslEncoding);
-#else
- sps.setResChangeInClvsEnabledFlag(m_resChangeInClvsEnabled);
-#endif
sps.setRprEnabledFlag(m_rprEnabledFlag);
sps.setLog2ParallelMergeLevelMinus2( m_log2ParallelMergeLevelMinus2 );
diff --git a/source/Lib/EncoderLib/IntraSearch.cpp b/source/Lib/EncoderLib/IntraSearch.cpp
index 0bd6d5ee8ea83d77a3bc72c399a32c2ef59dc0c2..2bacff384fdc3d61ee3358f3f84ed5b0796c7b30 100644
--- a/source/Lib/EncoderLib/IntraSearch.cpp
+++ b/source/Lib/EncoderLib/IntraSearch.cpp
@@ -1630,11 +1630,7 @@ void IntraSearch::estIntraPredChromaQT( CodingUnit &cu, Partitioner &partitioner
{
int mode = chromaCandModes[idx];
satdModeList[idx] = mode;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
if (PU::isLMCMode(mode) && (!PU::isLMCModeEnabled(pu, mode) || cu.slice->getDisableLmChromaCheck()))
-#else
- if (PU::isLMCMode(mode) && !PU::isLMCModeEnabled(pu, mode))
-#endif
{
continue;
}
@@ -1735,11 +1731,7 @@ void IntraSearch::estIntraPredChromaQT( CodingUnit &cu, Partitioner &partitioner
chromaIntraMode = chromaCandModes[mode];
cu.bdpcmModeChroma = 0;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
if( PU::isLMCMode( chromaIntraMode ) && ( !PU::isLMCModeEnabled( pu, chromaIntraMode ) || cu.slice->getDisableLmChromaCheck() ) )
-#else
- if( PU::isLMCMode( chromaIntraMode ) && ! PU::isLMCModeEnabled( pu, chromaIntraMode ) )
-#endif
{
continue;
}
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 9719068e0ca0e26cde175cc377dd2b5658e85edd..14da39a7e8a05d1dfa838752dc665b2e67daa445 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -156,11 +156,9 @@ void SEIWriter::xWriteSEIpayloadData(OutputBitstream &bs, const SEI& sei, HRD &h
case SEI::ANNOTATED_REGIONS:
xWriteSEIAnnotatedRegions(*static_cast<const SEIAnnotatedRegions*>(&sei));
break;
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
case SEI::CONSTRAINED_RASL_ENCODING:
xWriteSEIConstrainedRaslIndication(*static_cast<const SEIConstrainedRaslIndication*>(&sei));
break;
-#endif
default:
THROW("Trying to write unhandled SEI message");
break;
@@ -1355,10 +1353,8 @@ void SEIWriter::xWriteSEIColourTransformInfo(const SEIColourTransformInfo& sei)
}
}
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
void SEIWriter::xWriteSEIConstrainedRaslIndication(const SEIConstrainedRaslIndication& /*sei*/)
{
// intentionally empty
}
-#endif
//! \}
diff --git a/source/Lib/EncoderLib/SEIwrite.h b/source/Lib/EncoderLib/SEIwrite.h
index 4145c03cf4adf0fd154f3b1d641c7517d920ef5c..9fb61329cef354b968903bf9df752035c7e8ebf2 100644
--- a/source/Lib/EncoderLib/SEIwrite.h
+++ b/source/Lib/EncoderLib/SEIwrite.h
@@ -83,9 +83,7 @@ protected:
void xWriteSEIDepthRepInfoElement (double f);
void xWriteSEISubpictureLevelInfo (const SEISubpicureLevelInfo &sei);
void xWriteSEISampleAspectRatioInfo (const SEISampleAspectRatioInfo &sei);
-#if JVET_W0133_CONSTRAINED_RASL_ENCODING
void xWriteSEIConstrainedRaslIndication (const SEIConstrainedRaslIndication &sei);
-#endif
void xWriteSEIUserDataRegistered(const SEIUserDataRegistered& sei);
void xWriteSEIFilmGrainCharacteristics(const SEIFilmGrainCharacteristics& sei);
void xWriteSEIContentLightLevelInfo(const SEIContentLightLevelInfo& sei);