diff --git a/source/Lib/CommonLib/ParameterSetManager.cpp b/source/Lib/CommonLib/ParameterSetManager.cpp
index e1760f7dec2964fc160f556e327d7888e2784a75..5edb19b0271eed95d2182fe65d56f9273b4c6769 100644
--- a/source/Lib/CommonLib/ParameterSetManager.cpp
+++ b/source/Lib/CommonLib/ParameterSetManager.cpp
@@ -63,13 +63,6 @@ bool ParameterSetManager::activatePPS(int ppsId, bool isIRAP)
if (pps)
{
int spsId = pps->getSPSId();
-#if !ENABLING_MULTI_SPS
- if (!isIRAP && (spsId != m_activeSPSId ))
- {
- msg( WARNING, "Warning: tried to activate a PPS referring to an inactive SPS at non-IDR.");
- }
- else
-#endif
{
SPS *sps = m_spsMap.getPS(spsId);
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 4b66773d820b2578ebb704d7e9e74d4034de7478..cc3448524254faf8c2ce46e41d2811d12f1c3084 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -118,7 +118,6 @@
-#define ENABLING_MULTI_SPS 1 // Bug fix to enable multiple SPS
#define SPS_ID_CHECK 1 // add SPS id check to be the same within CLVS, related to mixed_nalu_types_in_pic_flag
#define JVET_P0124_MIXED_NALU 1 // JVET-P0124/P0095/P0222: MIxed IRAP/non-IRAP VCL NAL units within a picture
#define JVET_Q0117_PARAMETER_SETS_CLEANUP 1 // JVET-Q0117: cleanups on parameter sets
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 0c16e8be3296915af1be162a7e4a1091ae07c35b..7e524e33d243d61a0bc45697c9fc00c0ddacfef1 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -382,17 +382,12 @@ int EncGOP::xWriteAPS( AccessUnit &accessUnit, APS *aps, const int layerId, cons
return (int)(accessUnit.back()->m_nalUnitData.str().size()) * 8;
}
-#if ENABLING_MULTI_SPS
int EncGOP::xWriteParameterSets(AccessUnit &accessUnit, Slice *slice, const bool bSeqFirst, const int layerIdx)
-#else
-int EncGOP::xWriteParameterSets(AccessUnit &accessUnit, Slice *slice, const bool bSeqFirst)
-#endif
{
int actualTotalBits = 0;
if( bSeqFirst )
{
-#if ENABLING_MULTI_SPS
if (layerIdx == 0)
{
#if JVET_Q0117_PARAMETER_SETS_CLEANUP
@@ -408,17 +403,6 @@ int EncGOP::xWriteParameterSets(AccessUnit &accessUnit, Slice *slice, const bool
actualTotalBits += xWriteVPS(accessUnit, m_pcEncLib->getVPS());
}
}
-#else
- if (slice->getSPS()->getVPSId() != 0)
- {
- actualTotalBits += xWriteVPS(accessUnit, m_pcEncLib->getVPS());
- }
-#if JVET_Q0117_PARAMETER_SETS_CLEANUP
- actualTotalBits += xWriteDCI( accessUnit, m_pcEncLib->getDCI() );
-#else
- actualTotalBits += xWriteDPS( accessUnit, m_pcEncLib->getDPS() );
-#endif
-#endif
if( m_pcEncLib->SPSNeedsWriting( slice->getSPS()->getSPSId() ) ) // Note this assumes that all changes to the SPS are made at the EncLib level prior to picture creation (EncLib::xGetNewPicBuffer).
{
CHECK( !( bSeqFirst ), "Unspecified error" ); // Implementations that use more than 1 SPS need to be aware of activation issues.
@@ -3081,11 +3065,7 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
int layerIdx = m_pcEncLib->getVPS() == nullptr ? 0 : m_pcEncLib->getVPS()->getGeneralLayerIdx( m_pcEncLib->getLayerId() );
// it is assumed that layerIdx equal to 0 is always present
-#if ENABLING_MULTI_SPS
actualTotalBits += xWriteParameterSets(accessUnit, pcSlice, writePS, layerIdx);
-#else
- actualTotalBits += xWriteParameterSets(accessUnit, pcSlice, writePS && !layerIdx);
-#endif
if (writePS)
{
// create prefix SEI messages at the beginning of the sequence
diff --git a/source/Lib/EncoderLib/EncGOP.h b/source/Lib/EncoderLib/EncGOP.h
index 7c3d28d5cdcb03ade8249aaa49ef74d9568992a4..8d6926f8eb8bbb003308cad5536fbe36eb564efb 100644
--- a/source/Lib/EncoderLib/EncGOP.h
+++ b/source/Lib/EncoderLib/EncGOP.h
@@ -326,11 +326,7 @@ protected:
int xWriteSPS( AccessUnit &accessUnit, const SPS *sps, const int layerId = 0 );
int xWritePPS( AccessUnit &accessUnit, const PPS *pps, const int layerId = 0 );
int xWriteAPS( AccessUnit &accessUnit, APS *aps, const int layerId, const bool isPrefixNUT );
-#if ENABLING_MULTI_SPS
int xWriteParameterSets(AccessUnit &accessUnit, Slice *slice, const bool bSeqFirst, const int layerIdx);
-#else
- int xWriteParameterSets(AccessUnit &accessUnit, Slice *slice, const bool bSeqFirst);
-#endif
int xWritePicHeader( AccessUnit &accessUnit, PicHeader *picHeader );
void applyDeblockingFilterMetric( Picture* pcPic, uint32_t uiNumSlices );
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 6dc1b726ef91bd09ddc3671dcfceb281c8c06e3c..79e92c78c4d2faf7b23100f60a5d8dd91e34475d 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -213,11 +213,7 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
{
m_AUWriterIf = auWriterIf;
-#if ENABLING_MULTI_SPS
SPS &sps0 = *(m_spsMap.allocatePS( m_vps->getGeneralLayerIdx( m_layerId ) )); // NOTE: implementations that use more than 1 SPS need to be aware of activation issues.
-#else
- SPS &sps0 = *(m_spsMap.allocatePS(0)); // NOTE: implementations that use more than 1 SPS need to be aware of activation issues.
-#endif
PPS &pps0 = *( m_ppsMap.allocatePS( m_vps->getGeneralLayerIdx( m_layerId ) ) );
APS &aps0 = *( m_apsMap.allocatePS( SCALING_LIST_APS ) );
aps0.setAPSId( 0 );
@@ -1423,20 +1419,8 @@ void EncLib::xInitSPS( SPS& sps )
}
}
-#if ENABLING_MULTI_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." );
-#else
- sps.setInterLayerPresentFlag( m_vps->getMaxLayers() > 1 && !m_vps->getAllIndependentLayersFlag() );
-
- for( int i = 0; i < m_vps->getMaxLayers(); ++i )
- {
- //Bug fix to make the decoder run with configfile layers.cfg
- if(m_vps->getIndependentLayerFlag(i) == 1)
- sps.setInterLayerPresentFlag(0);
- CHECK((m_vps->getIndependentLayerFlag(i) == 1) && (sps.getInterLayerPresentFlag() != 0), " 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.");
- }
-#endif
sps.setRprEnabledFlag( m_rprEnabled || sps.getInterLayerPresentFlag() );