From 93129e12dcbc4d11deefcc83f07b1f0ddb8f219e Mon Sep 17 00:00:00 2001
From: biaowang <biao.wang@huawei.com>
Date: Fri, 7 Feb 2020 19:01:30 +0100
Subject: [PATCH] also fix bug from Q0119
---
.../subpicture_4Slice2HorSubPic.cfg | 6 +++---
.../subpicture_4Slice2VerSubPic.cfg | 12 ++++++------
source/Lib/CommonLib/TypeDef.h | 2 +-
source/Lib/DecoderLib/VLCReader.cpp | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/cfg/nonCTC-SliceConfigExamples/subpicture_4Slice2HorSubPic.cfg b/cfg/nonCTC-SliceConfigExamples/subpicture_4Slice2HorSubPic.cfg
index 84d34aba4..8accaf292 100644
--- a/cfg/nonCTC-SliceConfigExamples/subpicture_4Slice2HorSubPic.cfg
+++ b/cfg/nonCTC-SliceConfigExamples/subpicture_4Slice2HorSubPic.cfg
@@ -8,7 +8,7 @@
#| | |
#----------
-SubPicPresentFlag : 1 # subpicture enabling flag(0: OFF, 1: ON)
+SubPicInfoPresentFlag : 1 # subpicture enabling flag(0: OFF, 1: ON)
NumSubPics : 2 # number of subpictures in a picture
SubPicCtuTopLeftX : 0 0 # specifies horizontal position of top left CTU of i-th subpicture in unit of CtbSizeY
SubPicCtuTopLeftY : 0 2 # specifies vertical position of top left CTU of i-th subpicture in unit of CtbSizeY
@@ -16,8 +16,8 @@ SubPicWidth : 7 7 # specifies the width of
SubPicHeight : 2 2 # specifies the height of the i-th subpicture in units of CtbSizeY
SubPicTreatedAsPicFlag : 1 1 # equal to 1 specifies that the i-th subpicture of each coded picture in the CLVS is treated as a picture in the decoding process excluding in-loop filtering operations
LoopFilterAcrossSubpicEnabledFlag : 0 0 # equal to 1 specifies that in-loop filtering operations may be performed across the boundaries of the i-th subpicture in each coded picture in the CLVS
-SubPicIdPresentFlag : 0 # equal to 1 specifies that the subpicture ID mapping is explicitly signalled, either in the SPS or in the PPSs
-SubPicIdSignallingPresentFlag : 0 # specifies that subpicture ID mapping is signalled in the SPS(0: OFF, 1: ON)
+SubPicIdMappingExplicitlySignalledFlag : 0 # equal to 1 specifies that the subpicture ID mapping is explicitly signalled, either in the SPS or in the PPSs
+SubPicIdMappingInSpsFlag : 0 # specifies that subpicture ID mapping is signalled in the SPS(0: OFF, 1: ON)
SubPicIdLen : 0 # the number of bits used to represent the syntax element sps_subpic_id[ i ]
SubPicId : 0 # subpicture ID of the i-th subpicture
diff --git a/cfg/nonCTC-SliceConfigExamples/subpicture_4Slice2VerSubPic.cfg b/cfg/nonCTC-SliceConfigExamples/subpicture_4Slice2VerSubPic.cfg
index e022ae23f..01f8fcac1 100644
--- a/cfg/nonCTC-SliceConfigExamples/subpicture_4Slice2VerSubPic.cfg
+++ b/cfg/nonCTC-SliceConfigExamples/subpicture_4Slice2VerSubPic.cfg
@@ -11,16 +11,16 @@
# v
# vertically divided into 2 subpicture, each subpicture contains two slices
-SubPicPresentFlag : 1 # subpicture enabling flag(0: OFF, 1: ON)
-NumSubPics : 2 # number of subpictures in a picture
-SubPicCtuTopLeftX : 0 4 # specifies horizontal position of top left CTU of i-th subpicture in unit of CtbSizeY
+SubPicInfoPresentFlag : 1 # subpicture enabling flag(0: OFF, 1: ON)
+NumSubPics : 2 # number of subpictures in a picture
+SubPicCtuTopLeftX : 0 4 # specifies horizontal position of top left CTU of i-th subpicture in unit of CtbSizeY
SubPicCtuTopLeftY : 0 0 # specifies vertical position of top left CTU of i-th subpicture in unit of CtbSizeY
SubPicWidth : 4 3 # specifies the width of the i-th subpicture in units of CtbSizeY
-SubPicHeight : 4 4 # specifies the height of the i-th subpicture in units of CtbSizeY
+SubPicHeight : 4 4 # specifies the height of the i-th subpicture in units of CtbSizeY
SubPicTreatedAsPicFlag : 1 1 # equal to 1 specifies that the i-th subpicture of each coded picture in the CLVS is treated as a picture in the decoding process excluding in-loop filtering operations
LoopFilterAcrossSubpicEnabledFlag : 0 0 # equal to 1 specifies that in-loop filtering operations may be performed across the boundaries of the i-th subpicture in each coded picture in the CLVS
-SubPicIdPresentFlag : 0 # equal to 1 specifies that the subpicture ID mapping is explicitly signalled, either in the SPS or in the PPSs
-SubPicIdSignallingPresentFlag : 0 # specifies that subpicture ID mapping is signalled in the SPS(0: OFF, 1: ON)
+SubPicIdMappingExplicitlySignalledFlag : 0 # equal to 1 specifies that the subpicture ID mapping is explicitly signalled, either in the SPS or in the PPSs
+SubPicIdMappingInSpsFlag : 0 # specifies that subpicture ID mapping is signalled in the SPS(0: OFF, 1: ON)
SubPicIdLen : 0 # the number of bits used to represent the syntax element sps_subpic_id[ i ]
SubPicId : 0 # subpicture ID of the i-th subpicture
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 0b3da9236..3bf620123 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -106,7 +106,7 @@
#define JVET_Q0447_WP_PARAM_ESTIM 1 // JVET-Q0447: Add search iterations for method 2,3 and 4
-#define JVET_Q0119_CLEANUPS 0 // JVET-Q0119: AHG12: Cleanups on signalling of subpictures, tiles, and rectangular slices
+#define JVET_Q0119_CLEANUPS 1 // JVET-Q0119: AHG12: Cleanups on signalling of subpictures, tiles, and rectangular slices
#define JVET_Q0114_CONSTRAINT_FLAGS 1 // JVET-Q0114: AHG9: A few more general constraints flags
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 55355251e..bb72bac6e 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -3267,7 +3267,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
{
uint32_t bitsSubPicId;
#if JVET_Q0119_CLEANUPS
- if (pcSlice->getSPS()->getSubPicIdMappingExplicitlySignalledFlag())
+ if (sps->getSubPicIdMappingExplicitlySignalledFlag())
#else
if (sps->getSubPicIdSignallingPresentFlag())
#endif
@@ -3281,7 +3281,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
}
#endif
#if JVET_Q0119_CLEANUPS
- else if (pcSlice->getPPS()->getSubPicIdMappingInPpsFlag())
+ else if (pps->getSubPicIdMappingInPpsFlag())
#else
else if (pps->getSubPicIdSignallingPresentFlag())
#endif
--
GitLab