diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index f784b2d525faf057b7c7dd6591e17114bdf6312e..9d96c5caaffeb7a0ae4e0e5fd276c0e25f819b3e 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -56,7 +56,6 @@ #define FIX_TICKET_1442_PTL_IN_VPS 1 // Fix PTL signalling in VPS such that also the sublayer with the second highest TemporalID is signalled #define JVET_S0078_NOOUTPUTPRIORPICFLAG 0 // JVET-S0078: Handling of NoOutputOfPriorPicsFlag in output process -#define JVET_R0266_GCI 1 // JVET-R0266 #5: Specify that no_gdr_constraint_flag equal to 1 specifies that sps_gdr_enabled_flag shall be equal to 0 #define JVET_S0084_S0110_RADL 1 // When the current picture is a RADL picture, allow RASL pictures with pps_mixed_nalu_types_in_pic_flag is equal to 1 in active entries in RefPicList[ 0 ] or RefPicList[ 1 ] #define FIX_TICKET_1405 1 // Add dph_sei_single_component_flag and dph_sei_reserved_zero_7bits syntax to decoded picture hash SEI message #define FIX_SUBPICS_W_RPR 1 // Fix handling of RPR with subpictures (via scaling windows with no resolution change) diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp index cbf747772bd0b46d225d5957f1eb05927b7cfff3..4fb63aec6c04edc976d2bc9d31eaa3352e143908 100644 --- a/source/Lib/DecoderLib/DecLib.cpp +++ b/source/Lib/DecoderLib/DecLib.cpp @@ -1865,12 +1865,10 @@ void DecLib::xCheckParameterSetConstraints(const int layerId) CHECK(pps->getMixedNaluTypesInPicFlag(), "When gci_no_mixed_nalu_types_in_pic_constraint_flag equal to 1, the value of pps_mixed_nalu_types_in_pic_flag shall be equal to 0") } -#if JVET_R0266_GCI if (sps->getProfileTierLevel()->getConstraintInfo()->getNoGdrConstraintFlag()) { CHECK(sps->getGDREnabledFlag(), "gci_no_gdr_constraint_flag equal to 1 specifies that sps_gdr_enabled_flag for all pictures in OlsInScope shall be equal to 0"); } -#endif if (sps->getProfileTierLevel()->getConstraintInfo()->getNoRectSliceConstraintFlag()) { diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index f1b1622f3bf4cb8ca44cc6382eebbe6ab4fde656..82d1a62dcb753cc178499505d9ad1fa2e995da6b 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -1367,12 +1367,10 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS) READ_FLAG(uiCode, "sps_gdr_enabled_flag"); pcSPS->setGDREnabledFlag(uiCode); -#if JVET_R0266_GCI if (pcSPS->getProfileTierLevel()->getConstraintInfo()->getNoGdrConstraintFlag()) { CHECK(uiCode != 0, "When gci_no_gdr_constraint_flag equal to 1 , the value of sps_gdr_enabled_flag shall be equal to 0"); } -#endif READ_FLAG(uiCode, "sps_ref_pic_resampling_enabled_flag"); pcSPS->setRprEnabledFlag(uiCode); if (pcSPS->getProfileTierLevel()->getConstraintInfo()->getNoRprConstraintFlag())