From c53a5ba1e86bf0dad26ee5c7680c2aee91b02ba8 Mon Sep 17 00:00:00 2001
From: spaluri <seethal.paluri@lge.com>
Date: Tue, 10 Mar 2020 14:58:39 -0700
Subject: [PATCH] Bug fix to change the signalling of the constraint from
xCheckParameterSetConstraints to the parsePictureHeader()
---
source/Lib/DecoderLib/DecLib.cpp | 5 -----
source/Lib/DecoderLib/VLCReader.cpp | 3 +++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index d09964afa..eec00c697 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -1497,11 +1497,6 @@ void DecLib::xCheckParameterSetConstraints(const int layerId)
#endif
#endif
-#if JVET_Q0210_SUBPIC_VIRTUAL_BOUNDARY_CONSTRAINT
- if( sps->getSubPicInfoPresentFlag() && sps->getVirtualBoundariesEnabledFlag() )
- CHECK( sps->getVirtualBoundariesPresentFlag() != 1, "When the subpicture info is present, the signalling of the virtual boundary position, if present, shall be in SPS" );
-#endif
-
if( sps->getCTUSize() + 2 * ( 1 << sps->getLog2MinCodingBlockSize() ) > pps->getPicWidthInLumaSamples() )
{
CHECK( sps->getWrapAroundEnabledFlag(), "Wraparound shall be disabled when the value of ( CtbSizeY / MinCbSizeY + 1) is less than or equal to ( pic_width_in_luma_samples / MinCbSizeY - 1 )" );
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 7fd2d37d2..e3655c9d2 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2944,6 +2944,9 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
{
READ_FLAG( uiCode, "ph_loop_filter_across_virtual_boundaries_present_flag" );
picHeader->setVirtualBoundariesPresentFlag( uiCode != 0 );
+#if JVET_Q0210_SUBPIC_VIRTUAL_BOUNDARY_CONSTRAINT
+ CHECK( sps->getSubPicInfoPresentFlag() && picHeader->getVirtualBoundariesPresentFlag(), "When the subpicture info is present, the signalling of the virtual boundary position, if present, shall be in SPS" );
+#endif
if( picHeader->getVirtualBoundariesPresentFlag() )
{
#else
--
GitLab