From cc2550e0daf28a2f96cb75dd78b6d042b70044e5 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:10:28 +0200
Subject: [PATCH] remove macro JVET_Q0043_RPR_and_Subpics
---
source/App/EncoderApp/EncAppCfg.cpp | 2 --
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/DecLib.cpp | 11 -----------
source/Lib/DecoderLib/VLCReader.cpp | 4 ----
source/Lib/EncoderLib/VLCWriter.cpp | 4 ----
5 files changed, 22 deletions(-)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index f286bc6eb1..317b910392 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1647,9 +1647,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
}
CHECK( m_subPicIdLen > 16, "SubPicIdLen must not exceed 16 bits" );
-#if JVET_Q0043_RPR_and_Subpics
CHECK( m_rprEnabled, "RPR and subpictures cannot be enabled together" );
-#endif
}
#if JVET_SUBPIC_LEVEL_CFG
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 9c2b144dc9..baa3fbc566 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -105,7 +105,6 @@
-#define JVET_Q0043_RPR_and_Subpics 1 // JVET-Q0043: Disallow for both RPR and subpics to be used together
#define JVET_Q0818_PT_SEI 1 // JVET-Q0818: add display_elemental_periods_minus1 to picture timing SEI message
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index b4b96d09d2..e2c5779ec9 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -1428,7 +1428,6 @@ void DecLib::xCheckParameterSetConstraints(const int layerId)
const int minCuSize = 1 << sps->getLog2MinCodingBlockSize();
CHECK( ( pps->getPicWidthInLumaSamples() % ( std::max( 8, minCuSize) ) ) != 0, "Coded frame width must be a multiple of Max(8, the minimum unit size)" );
CHECK( ( pps->getPicHeightInLumaSamples() % ( std::max( 8, minCuSize) ) ) != 0, "Coded frame height must be a multiple of Max(8, the minimum unit size)" );
-#if JVET_Q0043_RPR_and_Subpics
if( !sps->getRprEnabledFlag() )
{
CHECK( pps->getPicWidthInLumaSamples() != sps->getMaxPicWidthInLumaSamples(), "When res_change_in_clvs_allowed_flag equal to 0, the value of pic_width_in_luma_samples shall be equal to pic_width_max_in_luma_samples." );
@@ -1444,16 +1443,6 @@ void DecLib::xCheckParameterSetConstraints(const int layerId)
}
#if !JVET_Q0399_SCALING_INFERENCE
CHECK( !sps->getRprEnabledFlag() && pps->getScalingWindow().getWindowEnabledFlag(), "When res_change_in_clvs_allowed_flag is equal to 0, the value of scaling_window_flag shall be equal to 0." );
-#endif
-#else
- if( !sps->getRprEnabledFlag() && sps->getSubPicPresentFlag() )
- {
- CHECK( pps->getPicWidthInLumaSamples() != sps->getMaxPicWidthInLumaSamples(), "When subpics_present_flag is equal to 1 or ref_pic_resampling_enabled_flag equal to 0, the value of pic_width_in_luma_samples shall be equal to pic_width_max_in_luma_samples." );
- CHECK( pps->getPicHeightInLumaSamples() != sps->getMaxPicHeightInLumaSamples(), "When subpics_present_flag is equal to 1 or ref_pic_resampling_enabled_flag equal to 0, the value of pic_height_in_luma_samples shall be equal to pic_height_max_in_luma_samples." );
- }
-#if !JVET_Q0399_SCALING_INFERENCE
- CHECK( !sps->getRprEnabledFlag() && pps->getScalingWindow().getWindowEnabledFlag(), "When ref_pic_resampling_enabled_flag is equal to 0, the value of scaling_window_flag shall be equal to 0." );
-#endif
#endif
CHECK( sps->getRprEnabledFlag() && sps->getVirtualBoundariesEnabledFlag(), "when the value of res_change_in_clvs_allowed_flag is equal to 1, the value of sps_virtual_boundaries_present_flag shall be equal to 0" );
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index ebc368d793..42c2c9bace 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1418,11 +1418,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setSeparateColourPlaneFlag( uiCode != 0 );
}
-#if JVET_Q0043_RPR_and_Subpics
READ_FLAG( uiCode, "res_change_in_clvs_allowed_flag" ); pcSPS->setRprEnabledFlag( uiCode );
-#else
- READ_FLAG( uiCode, "ref_pic_resampling_enabled_flag" ); pcSPS->setRprEnabledFlag( uiCode );
-#endif
#if JVET_Q0114_CONSTRAINT_FLAGS
if (pcSPS->getProfileTierLevel()->getConstraintInfo()->getNoResChangeInClvsConstraintFlag())
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 09ba548f1e..44d044ec35 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -923,11 +923,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
}
#endif
-#if JVET_Q0043_RPR_and_Subpics
WRITE_FLAG( pcSPS->getRprEnabledFlag(), "res_change_in_clvs_allowed_flag" );
-#else
- WRITE_FLAG( pcSPS->getRprEnabledFlag(), "ref_pic_resampling_enabled_flag" );
-#endif
WRITE_UVLC( pcSPS->getMaxPicWidthInLumaSamples(), "pic_width_max_in_luma_samples" );
WRITE_UVLC( pcSPS->getMaxPicHeightInLumaSamples(), "pic_height_max_in_luma_samples" );
--
GitLab