From 26768d6f3841b172dc37665fce54c8df70988072 Mon Sep 17 00:00:00 2001
From: jiechen <jiechen.cj@alibaba-inc.com>
Date: Sun, 8 Nov 2020 19:15:34 +0800
Subject: [PATCH] S0096 aspect 1
---
source/Lib/CommonLib/TypeDef.h | 1 +
source/Lib/DecoderLib/VLCReader.cpp | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 6c7511491..48b8ba51c 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -54,6 +54,7 @@
//########### place macros to be removed in next cycle below this line ###############
+#define JVET_S0096_RPL_CONSTRAINT 1// JVET-S0096 aspect 1: When pps_rpl_info_in_ph_flag is equal to 1 and ph_inter_slice_allowed_flag is equal to 1, the value of num_ref_entries[ 0 ][ RplsIdx[ 0 ] ] shall be greater than 0.
#define JVET_S0078_NOOUTPUTPRIORPICFLAG 1 // JVET-S0078: Handling of NoOutputOfPriorPicsFlag in output process
#define JVET_S0219_ASPECT1 1 // JVET-S0219 aspect1 : removal non-referred APS parameter set in the non-output layer.
#define JVET_R0193 1 // JVET-R0193: signalling of the number of maximum sublayers used for inter-layer prediction for each layer
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 121809aa7..500357231 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2919,7 +2919,12 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
*rpl = *sps->getRPLList( listIdx )->getReferencePictureList(picHeader->getRPLIdx( listIdx ));
}
}
-
+#if JVET_S0096_RPL_CONSTRAINT
+ if (picHeader->getPicInterSliceAllowedFlag() && listIdx == 0)
+ {
+ CHECK(picHeader->getRPL(0)->getNumRefEntries() <= 0, "When pps_rpl_info_in_ph_flag is equal to 1 and ph_inter_slice_allowed_flag is equal to 1, the value of num_ref_entries[ 0 ][ RplsIdx[ 0 ] ] shall be greater than 0");
+ }
+#endif
// POC MSB cycle signalling for LTRP
for (int i = 0; i < rpl->getNumberOfLongtermPictures() + rpl->getNumberOfShorttermPictures(); i++)
{
--
GitLab