diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index ab881924d060910f386a093fac5f9f627d30b2cb..45028227b51075dde530caef5f4b0cc23ee2aeb9 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -710,7 +710,11 @@ class DPS
private:
int m_decodingParameterSetId;
int m_maxSubLayersMinus1;
+#if !JVET_P0478_PTL_DPS
ProfileTierLevel m_profileTierLevel;
+#else
+ std::vector<ProfileTierLevel> m_profileTierLevel;
+#endif
public:
DPS()
@@ -725,8 +729,14 @@ public:
int getMaxSubLayersMinus1() const { return m_maxSubLayersMinus1; }
void setMaxSubLayersMinus1(int val) { m_maxSubLayersMinus1 = val; }
+#if !JVET_P0478_PTL_DPS
void setProfileTierLevel(const ProfileTierLevel &val) { m_profileTierLevel = val; }
const ProfileTierLevel& getProfileTierLevel() const { return m_profileTierLevel; }
+#else
+ size_t getNumPTLs() const { return m_profileTierLevel.size(); }
+ void setProfileTierLevel(const std::vector<ProfileTierLevel> &val) { m_profileTierLevel = val; }
+ const ProfileTierLevel& getProfileTierLevel(int idx) const { return m_profileTierLevel[idx]; }
+#endif
};
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 815d77c8f30889611ae1a8bf059ad43c7e9e4b1b..1fd73f7a443cb43c98e5b3b82a1d758fd5b64a57 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -247,6 +247,8 @@
#define MRG_SHARELIST_SHARSIZE 32
#endif
+#define JVET_P0478_PTL_DPS 1 // JVET-P0478: allow multiple PTL in DPS
+
#define JVET_M0497_MATRIX_MULT 0 // 0: Fast method; 1: Matrix multiplication
#define JVET_P0181 1 // JVET-P0181 : Modifications to HRD information signalling
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 6b86d117576381a25bfc316d8bd631cc0bcededb..006550aeedd2b457ad4f078a6c7a6ef79ee1d30c 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -2213,6 +2213,7 @@ bool DecLib::isRandomAccessSkipPicture( int& iSkipFrame, int& iPOCLastDisplay )
return false;
}
+#if !JVET_P0478_PTL_DPS
#if JVET_P0366_NUT_CONSTRAINT_FLAGS
void DecLib::checkNalUnitConstraints( uint32_t naluType )
{
@@ -2255,5 +2256,58 @@ void DecLib::checkNalUnitConstraints( uint32_t naluType )
}
}
#endif
+#else
+#if JVET_P0366_NUT_CONSTRAINT_FLAGS
+void DecLib::checkNalUnitConstraints( uint32_t naluType )
+{
+ if (m_parameterSetManager.getActiveSPS() != NULL && m_parameterSetManager.getActiveSPS()->getProfileTierLevel() != NULL)
+ {
+ const ConstraintInfo *cInfo = m_parameterSetManager.getActiveSPS()->getProfileTierLevel()->getConstraintInfo();
+ xCheckNalUnitConstraintFlags( cInfo, naluType );
+ }
+ if (m_parameterSetManager.getActiveDPS() != NULL)
+ {
+ const DPS *dps = m_parameterSetManager.getActiveDPS();
+ for (int i=0; i< dps->getNumPTLs(); i++)
+ {
+ ProfileTierLevel ptl = dps->getProfileTierLevel(i);
+ const ConstraintInfo *cInfo = ptl.getConstraintInfo();
+ xCheckNalUnitConstraintFlags( cInfo, naluType );
+ }
+ }
+}
+void DecLib::xCheckNalUnitConstraintFlags( const ConstraintInfo *cInfo, uint32_t naluType )
+{
+ if (cInfo != NULL)
+ {
+ CHECK(cInfo->getNoTrailConstraintFlag() && naluType == NAL_UNIT_CODED_SLICE_TRAIL,
+ "Non-conforming bitstream. no_trail_constraint_flag is equal to 1 but bitstream contains NAL unit of type TRAIL_NUT.");
+ CHECK(cInfo->getNoStsaConstraintFlag() && naluType == NAL_UNIT_CODED_SLICE_STSA,
+ "Non-conforming bitstream. no_stsa_constraint_flag is equal to 1 but bitstream contains NAL unit of type STSA_NUT.");
+ CHECK(cInfo->getNoRaslConstraintFlag() && naluType == NAL_UNIT_CODED_SLICE_RASL,
+ "Non-conforming bitstream. no_rasl_constraint_flag is equal to 1 but bitstream contains NAL unit of type RASL_NUT.");
+ CHECK(cInfo->getNoRadlConstraintFlag() && naluType == NAL_UNIT_CODED_SLICE_RADL,
+ "Non-conforming bitstream. no_radl_constraint_flag is equal to 1 but bitstream contains NAL unit of type RADL_NUT.");
+ CHECK(cInfo->getNoIdrConstraintFlag() && (naluType == NAL_UNIT_CODED_SLICE_IDR_W_RADL),
+ "Non-conforming bitstream. no_idr_constraint_flag is equal to 1 but bitstream contains NAL unit of type IDR_W_RADL.");
+ CHECK(cInfo->getNoIdrConstraintFlag() && (naluType == NAL_UNIT_CODED_SLICE_IDR_N_LP),
+ "Non-conforming bitstream. no_idr_constraint_flag is equal to 1 but bitstream contains NAL unit of type IDR_N_LP.");
+ CHECK(cInfo->getNoCraConstraintFlag() && naluType == NAL_UNIT_CODED_SLICE_CRA,
+ "Non-conforming bitstream. no_cra_constraint_flag is equal to 1 but bitstream contains NAL unit of type CRA_NUT.");
+ CHECK(cInfo->getNoGdrConstraintFlag() && naluType == NAL_UNIT_CODED_SLICE_GDR,
+ "Non-conforming bitstream. no_gdr_constraint_flag is equal to 1 but bitstream contains NAL unit of type GDR_NUT.");
+#if !JVET_P0588_SUFFIX_APS
+ CHECK(cInfo->getNoApsConstraintFlag() && naluType == NAL_UNIT_APS,
+ "Non-conforming bitstream. no_aps_constraint_flag is equal to 1 but bitstream contains NAL unit of type APS_NUT.");
+#else
+ CHECK(cInfo->getNoApsConstraintFlag() && naluType == NAL_UNIT_PREFIX_APS,
+ "Non-conforming bitstream. no_aps_constraint_flag is equal to 1 but bitstream contains NAL unit of type APS_PREFIX_NUT.");
+ CHECK(cInfo->getNoApsConstraintFlag() && naluType == NAL_UNIT_SUFFIX_APS,
+ "Non-conforming bitstream. no_aps_constraint_flag is equal to 1 but bitstream contains NAL unit of type APS_SUFFIX_NUT.");
+#endif
+ }
+}
+#endif
+#endif
//! \}
diff --git a/source/Lib/DecoderLib/DecLib.h b/source/Lib/DecoderLib/DecLib.h
index 20c0eb0b41940eea150f570715c33fbaf7c0c42c..bf4c3f3ef97250efd0d407bc7df4c74fb5332110 100644
--- a/source/Lib/DecoderLib/DecLib.h
+++ b/source/Lib/DecoderLib/DecLib.h
@@ -236,6 +236,10 @@ protected:
void xParsePrefixSEImessages();
void xParsePrefixSEIsForUnknownVCLNal();
+#if JVET_P0366_NUT_CONSTRAINT_FLAGS && JVET_P0478_PTL_DPS
+ void xCheckNalUnitConstraintFlags( const ConstraintInfo *cInfo, uint32_t naluType );
+#endif
+
};// END CLASS DEFINITION DecLib
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 854387933845de7280285109f8ec2a687aa66e84..bd2185cd97110d3b163792ac3d92ecfcc4762881 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2083,11 +2083,27 @@ void HLSyntaxReader::parseDPS(DPS* dps)
dps->setDecodingParameterSetId( symbol );
READ_CODE( 3, symbol, "dps_max_sub_layers_minus1" ); dps->setMaxSubLayersMinus1( symbol );
+#if !JVET_P0478_PTL_DPS
READ_FLAG( symbol, "dps_reserved_zero_bit" ); CHECK(symbol != 0, "dps_reserved_zero_bit must be equal to zero");
ProfileTierLevel ptl;
parseProfileTierLevel(&ptl, dps->getMaxSubLayersMinus1());
dps->setProfileTierLevel(ptl);
+#else
+ READ_CODE( 5, symbol, "dps_reserved_zero_5bits" ); CHECK(symbol != 0, "dps_reserved_zero_5bits must be equal to zero");
+
+ uint32_t numPTLs;
+ READ_CODE( 4, numPTLs, "dps_num_ptls_minus1" );
+ numPTLs += 1;
+
+ std::vector<ProfileTierLevel> ptls;
+ ptls.resize(numPTLs);
+ for (int i=0; i<numPTLs; i++)
+ {
+ parseProfileTierLevel(&ptls[i], dps->getMaxSubLayersMinus1());
+ }
+ dps->setProfileTierLevel(ptls);
+#endif
READ_FLAG( symbol, "dps_extension_flag" );
if (symbol)
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index f05fa976b50be126f643b7cc2aafd54413b4ed6e..688055f81e10f1e8807dd85f33925aec24936a2a 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1354,7 +1354,14 @@ void EncLib::xInitDPS(DPS &dps, const SPS &sps, const int dpsId)
// set the DPS profile information.
dps.setDecodingParameterSetId(dpsId);
dps.setMaxSubLayersMinus1(sps.getMaxTLayers()-1);
- dps.setProfileTierLevel(*sps.getProfileTierLevel());
+#if JVET_P0478_PTL_DPS
+ std::vector<ProfileTierLevel> ptls;
+ ptls.resize(1);
+ ptls[0] = *sps.getProfileTierLevel();
+ dps.setProfileTierLevel(ptls);
+#else
+ dps.setProfileTierLevel(sps.getProfileTierLevel());
+#endif
}
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 8c5ed344a92642f21fed046e145cc538836c3a07..6168bd04273bd754d0ce1f016dab2c2c0d068ed1 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1406,11 +1406,24 @@ void HLSWriter::codeDPS( const DPS* dps )
#endif
WRITE_CODE( dps->getDecodingParameterSetId(), 4, "dps_decoding_parameter_set_id" );
WRITE_CODE( dps->getMaxSubLayersMinus1(), 3, "dps_max_sub_layers_minus1" );
+#if !JVET_P0478_PTL_DPS
WRITE_FLAG( 0, "dps_reserved_zero_bit" );
ProfileTierLevel ptl = dps->getProfileTierLevel();
codeProfileTierLevel( &ptl, dps->getMaxSubLayersMinus1() );
+#else
+ WRITE_CODE( 0, 5, "dps_reserved_zero_5bits" );
+ uint32_t numPTLs = (uint32_t) dps->getNumPTLs();
+ CHECK (numPTLs<1, "At least one PTL must be available in DPS");
+
+ WRITE_CODE( numPTLs - 1, 4, "dps_num_ptls_minus1" );
+ for (int i=0; i< numPTLs; i++)
+ {
+ ProfileTierLevel ptl = dps->getProfileTierLevel(i);
+ codeProfileTierLevel( &ptl, dps->getMaxSubLayersMinus1() );
+ }
+#endif
WRITE_FLAG( 0, "dps_extension_flag" );
xWriteRbspTrailingBits();
}