diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 096e851337d0409dc954529524082db500dd5d37..a0c5ad62daf2eb12ba5b6c5984a393f4f321001d 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -1607,7 +1607,7 @@ VPS::VPS()
for (int i = 0; i < MAX_VPS_LAYERS; i++)
{
m_vpsLayerId[i] = 0;
- m_vpsIndependentLayerFlag[i] = 1;
+ m_vpsIndependentLayerFlag[i] = true;
#if JVET_Q0172_CHROMA_FORMAT_BITDEPTH_CONSTRAINT
m_vpsLayerChromaFormatIDC[i] = NOT_VALID;
m_vpsLayerBitDepth[i] = NOT_VALID;
@@ -2382,6 +2382,9 @@ PPS::PPS()
, m_wpInfoInPhFlag (1)
, m_qpDeltaInfoInPhFlag (1)
#endif
+#if SPS_ID_CHECK
+, m_mixedNaluTypesInPicFlag ( false )
+#endif
, m_picWidthInLumaSamples(352)
, m_picHeightInLumaSamples( 288 )
, m_ppsRangeExtension ()
@@ -3368,11 +3371,13 @@ 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 PPS referring to a inactive SPS at non-IDR.");
}
else
+#endif
{
SPS *sps = m_spsMap.getPS(spsId);
if (sps)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index a92fad795321a589da19f400173ddb657a92e0e0..374d6be31194e0e722cf7c020970470e1db8b7be 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -1831,6 +1831,9 @@ private:
bool m_wpInfoInPhFlag;
bool m_qpDeltaInfoInPhFlag;
#endif
+#if SPS_ID_CHECK
+ bool m_mixedNaluTypesInPicFlag;
+#endif
uint32_t m_picWidthInLumaSamples;
uint32_t m_picHeightInLumaSamples;
@@ -2104,6 +2107,11 @@ public:
Window& getScalingWindow() { return m_scalingWindow; }
const Window& getScalingWindow() const { return m_scalingWindow; }
void setScalingWindow( Window& scalingWindow ) { m_scalingWindow = scalingWindow; }
+
+#if SPS_ID_CHECK
+ int getMixedNaluTypesInPicFlag() const { return m_mixedNaluTypesInPicFlag; }
+ void setMixedNaluTypesInPicFlag( const bool flag ) { m_mixedNaluTypesInPicFlag = flag; }
+#endif
};
class APS
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 6135edf75b4c7cb0541a63ff3482965d4feb7882..209f4f6a4833c0f005e8d485ea2a239296c5e4db 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -111,6 +111,8 @@
#define JVET_Q0820_ACT 1 // JVET-Q0820: ACT bug fixes and reversible ACT transform
#define JVET_Q0814_DPB 1 // JVET-Q0814: DPB capacity is based on picture units regardless of the resoltuion
+#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_Q0353_ACT_SW_FIX 1 // JVET-Q0353: Bug fix of ACT
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 589dd5ab1a4e070731fe4339a481fcf311f0f35c..2fc546880a9fc272cd9bf47cd92eb6393d54c50b 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -1244,11 +1244,22 @@ void DecLib::xActivateParameterSets( const int layerId )
}
// Conformance checks
- Slice *pSlice = m_pcPic->slices[m_uiSliceSegmentIdx];
- const SPS *sps = pSlice->getSPS();
- const PPS *pps = pSlice->getPPS();
+ Slice *slice = m_pcPic->slices[m_uiSliceSegmentIdx];
+ const SPS *sps = slice->getSPS();
+ const PPS *pps = slice->getPPS();
#if JVET_Q0814_DPB
- const VPS *vps = pSlice->getVPS();
+ const VPS *vps = slice->getVPS();
+#endif
+
+#if SPS_ID_CHECK
+ static std::unordered_map<int, int> m_clvssSPSid;
+
+ if( slice->isIRAP() && m_bFirstSliceInPicture && !pps->getMixedNaluTypesInPicFlag() )
+ {
+ m_clvssSPSid[layerId] = pps->getSPSId();
+ }
+
+ CHECK( m_clvssSPSid[layerId] != pps->getSPSId(), "The value of pps_seq_parameter_set_id shall be the same in all PPSs that are referred to by coded pictures in a CLVS" );
#endif
#if JVET_Q414_CONSTRAINT_ON_GDR_PIC_FLAG
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 2fadd30ca620bafdb73f2f19574b248bac8f9f82..08ed54f5ebdff357c4b67a50ab8743532ebd1a5c 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -421,6 +421,10 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS, ParameterSetManager *parameterSetMana
READ_CODE(4, uiCode, "pps_seq_parameter_set_id");
pcPPS->setSPSId (uiCode);
+#if SPS_ID_CHECK
+ READ_FLAG( uiCode, "mixed_nalu_types_in_pic_flag" ); pcPPS->setMixedNaluTypesInPicFlag( uiCode == 1 );
+#endif
+
READ_UVLC( uiCode, "pic_width_in_luma_samples" ); pcPPS->setPicWidthInLumaSamples( uiCode );
READ_UVLC( uiCode, "pic_height_in_luma_samples" ); pcPPS->setPicHeightInLumaSamples( uiCode );
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 8a743fe3b98c628bd5873fb7a1390f13909883cb..e415c7d6a883945e4c164f9ad7bb0caef966e66b 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -371,17 +371,32 @@ int EncGOP::xWriteAPS( AccessUnit &accessUnit, APS *aps, const int layerId, cons
return (int)(accessUnit.back()->m_nalUnitData.str().size()) * 8;
}
-int EncGOP::xWriteParameterSets( AccessUnit &accessUnit, Slice *slice, const bool bSeqFirst )
+#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)
+ {
+ actualTotalBits += xWriteDPS(accessUnit, m_pcEncLib->getDPS());
+ if (slice->getSPS()->getVPSId() != 0)
+ {
+ actualTotalBits += xWriteVPS(accessUnit, m_pcEncLib->getVPS());
+ }
+ }
+#else
if (slice->getSPS()->getVPSId() != 0)
{
actualTotalBits += xWriteVPS(accessUnit, m_pcEncLib->getVPS());
}
actualTotalBits += xWriteDPS( accessUnit, m_pcEncLib->getDPS() );
+#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).
{
@@ -2988,8 +3003,11 @@ 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
- actualTotalBits += xWriteParameterSets( accessUnit, pcSlice, writePS && !layerIdx );
-
+#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 36d28e5145f3f48c470e2208b5905491ed4754ee..0561fadad96ef7ebc59a2dcf5ff5b76595db4321 100644
--- a/source/Lib/EncoderLib/EncGOP.h
+++ b/source/Lib/EncoderLib/EncGOP.h
@@ -323,7 +323,11 @@ protected:
int xWriteSPS( AccessUnit &accessUnit, const SPS *sps, const int layerId = 0 );
int xWritePPS( AccessUnit &accessUnit, const PPS *pps, const SPS *sps, const int layerId = 0 );
int xWriteAPS( AccessUnit &accessUnit, APS *aps, const int layerId, const bool isPrefixNUT );
- int xWriteParameterSets (AccessUnit &accessUnit, Slice *slice, const bool bSeqFirst);
+#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 0f32956dd353ef4662b460f1f4f31b207451568b..f5661cb03418b4d232f368e60bb9de417edb5245 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -241,7 +241,11 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
{
m_AUWriterIf = auWriterIf;
- SPS &sps0=*(m_spsMap.allocatePS(0)); // NOTE: implementations that use more than 1 SPS need to be aware of activation issues.
+#if ENABLING_MULTI_SPS
+ SPS &sps0 = *(m_spsMap.allocatePS(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_layerId ) );
APS &aps0 = *( m_apsMap.allocatePS( SCALING_LIST_APS ) );
aps0.setAPSId( 0 );
@@ -1496,18 +1500,28 @@ void EncLib::xInitSPS( SPS& sps, VPS& vps )
}
#if JVET_Q0814_DPB
+#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 )
{
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
+#else
+#if ENABLING_MULTI_SPS
+ sps.setInterLayerPresentFlag( m_layerId > 0 && vps.getMaxLayers() > 1 && !vps.getAllIndependentLayersFlag() && !vps.getIndependentLayerFlag( vps.getGeneralLayerIdx( m_layerId ) ) );
+ CHECK( vps.getIndependentLayerFlag( 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( vps.getMaxLayers() > 1 && !vps.getAllIndependentLayersFlag() );
for (unsigned int i = 0; i < vps.getMaxLayers(); ++i)
{
CHECK((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
#endif
sps.setRprEnabledFlag( m_rprEnabled || sps.getInterLayerPresentFlag() );
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 1add563e23b7e8c0cea88a5b4002b3d366718994..1f0f1b672f8f246bd7d4cd543f477c0374fc3d5f 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -251,6 +251,10 @@ void HLSWriter::codePPS( const PPS* pcPPS, const SPS* pcSPS )
WRITE_UVLC( pcPPS->getPPSId(), "pps_pic_parameter_set_id" );
WRITE_CODE( pcPPS->getSPSId(), 4, "pps_seq_parameter_set_id" );
+#if SPS_ID_CHECK
+ WRITE_FLAG( pcPPS->getMixedNaluTypesInPicFlag() ? 1 : 0, "mixed_nalu_types_in_pic_flag" );
+#endif
+
WRITE_UVLC( pcPPS->getPicWidthInLumaSamples(), "pic_width_in_luma_samples" );
WRITE_UVLC( pcPPS->getPicHeightInLumaSamples(), "pic_height_in_luma_samples" );
Window conf = pcPPS->getConformanceWindow();