diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index c5da1286cff81865a28b7724fe86a164153f9698..15afd0d217c2c56eeed5d9b496ec4b69ea959f19 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -179,6 +179,8 @@ #define JVET_R0108_DCI_SIGNALING 1 // JVET-R0108 Proposal 1 DCI signaling changes +#define JVET_R0112_SEMANTICS_CLEANUP 1 // JVET-R0112: Picture header semantics cleanup for gdr_or_irap_flag + //########### place macros to be be kept below this line ############### #define JVET_R0164_MEAN_SCALED_SATD 1 // JVET-R0164: Use a mean scaled version of SATD in encoder decisions diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index cb49daf05dde67ca076c4adfe984b5f5fe4d0d71..9ebe07479e76af4d004df92b4b140259882a5bbe 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -2524,6 +2524,12 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag { READ_FLAG(uiCode, "gdr_pic_flag"); picHeader->setGdrPicFlag(uiCode != 0); } +#if JVET_R0112_SEMANTICS_CLEANUP + else + { + picHeader->setGdrPicFlag(false); + } +#endif READ_FLAG(uiCode, "ph_inter_slice_allowed_flag"); picHeader->setPicInterSliceAllowedFlag(uiCode != 0); if (picHeader->getPicInterSliceAllowedFlag()) {