diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index b62daf9ea53ab538ff752837a4fb0f2bfd60282e..f4d44e78b157751758d302f9728086cc751025de 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -171,6 +171,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 81c41b921f15a6cc8240ceebc1310955dd00e582..3a1de564e6ef32a953be986a952d02d81040621f 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -2491,6 +2491,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()) {