From b7f89bc19f33326a73405b871e86fddfc5e4f21f Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:08:47 +0200
Subject: [PATCH] remove macro JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
---
source/App/EncoderApp/EncApp.cpp | 6 -----
source/App/EncoderApp/EncAppCfg.cpp | 17 ------------
source/App/EncoderApp/EncAppCfg.h | 4 ---
source/Lib/CommonLib/AdaptiveLoopFilter.cpp | 5 ----
source/Lib/CommonLib/LoopFilter.cpp | 5 ----
source/Lib/CommonLib/SampleAdaptiveOffset.cpp | 5 ----
source/Lib/CommonLib/Slice.cpp | 12 ---------
source/Lib/CommonLib/Slice.h | 18 -------------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/DecLib.cpp | 4 ---
source/Lib/DecoderLib/VLCReader.cpp | 22 ----------------
source/Lib/EncoderLib/EncCfg.h | 9 -------
source/Lib/EncoderLib/EncLib.cpp | 16 ------------
source/Lib/EncoderLib/VLCWriter.cpp | 26 -------------------
14 files changed, 150 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 1f6e6862ab..fafa0d6d5a 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -521,14 +521,10 @@ void EncApp::xInitLibCfg()
m_cEncLib.setWrapAroundOffset ( m_wrapAroundOffset );
// ADD_NEW_TOOL : (encoder app) add setting of tool enabling flags and associated parameters here
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
m_cEncLib.setVirtualBoundariesEnabledFlag ( m_virtualBoundariesEnabledFlag );
if( m_cEncLib.getVirtualBoundariesEnabledFlag() )
{
m_cEncLib.setVirtualBoundariesPresentFlag ( m_virtualBoundariesPresentFlag );
-#else
- m_cEncLib.setLoopFilterAcrossVirtualBoundariesDisabledFlag ( m_loopFilterAcrossVirtualBoundariesDisabledFlag );
-#endif
m_cEncLib.setNumVerVirtualBoundaries ( m_numVerVirtualBoundaries );
m_cEncLib.setNumHorVirtualBoundaries ( m_numHorVirtualBoundaries );
for( unsigned i = 0; i < m_numVerVirtualBoundaries; i++ )
@@ -539,9 +535,7 @@ void EncApp::xInitLibCfg()
{
m_cEncLib.setVirtualBoundariesPosY ( m_virtualBoundariesPosY[ i ], i );
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
}
-#endif
m_cEncLib.setMaxCUWidth ( m_uiCTUSize );
m_cEncLib.setMaxCUHeight ( m_uiCTUSize );
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 5423f10879..455be0fcee 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -946,11 +946,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("WrapAroundOffset", m_wrapAroundOffset, 0u, "Offset in luma samples used for computing the horizontal wrap-around position")
// ADD_NEW_TOOL : (encoder app) add parsing parameters here
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
( "VirtualBoundariesPresentInSPSFlag", m_virtualBoundariesPresentFlag, true, "Virtual Boundary position information is signalled in SPS or PH (1:SPS, 0:PH) [default: on]" )
-#else
- ("LoopFilterAcrossVirtualBoundariesDisabledFlag", m_loopFilterAcrossVirtualBoundariesDisabledFlag, false, "Disable in-loop filtering operations across the virtual boundaries (0:off, 1:on) [default: off]")
-#endif
("NumVerVirtualBoundaries", m_numVerVirtualBoundaries, 0u, "Number of vertical virtual boundaries (0-3, inclusive)")
("NumHorVirtualBoundaries", m_numHorVirtualBoundaries, 0u, "Number of horizontal virtual boundaries (0-3, inclusive)")
("VirtualBoundariesPosX", cfg_virtualBoundariesPosX, cfg_virtualBoundariesPosX, "Locations of the vertical virtual boundaries in units of luma samples")
@@ -2106,7 +2102,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
}
#endif
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
m_virtualBoundariesEnabledFlag = 0;
if( m_numVerVirtualBoundaries > 0 || m_numHorVirtualBoundaries > 0 )
m_virtualBoundariesEnabledFlag = 1;
@@ -2117,10 +2112,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
if( m_virtualBoundariesPresentFlag )
{
-#else
- if ( m_loopFilterAcrossVirtualBoundariesDisabledFlag )
- {
-#endif
CHECK( m_numVerVirtualBoundaries > 3, "Number of vertical virtual boundaries must be comprised between 0 and 3 included" );
CHECK( m_numHorVirtualBoundaries > 3, "Number of horizontal virtual boundaries must be comprised between 0 and 3 included" );
CHECK( m_numVerVirtualBoundaries != cfg_virtualBoundariesPosX.values.size(), "Size of VirtualBoundariesPosX must be equal to NumVerVirtualBoundaries");
@@ -2154,9 +2145,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
}
}
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
}
-#endif
if ( m_alf )
{
@@ -4024,16 +4013,10 @@ void EncAppCfg::xPrintParameter()
msg( VERBOSE, "WrapAroundOffset:%d ", m_wrapAroundOffset );
}
// ADD_NEW_TOOL (add some output indicating the usage of tools)
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
msg( VERBOSE, "VirtualBoundariesEnabledFlag:%d ", m_virtualBoundariesEnabledFlag );
msg( VERBOSE, "VirtualBoundariesPresentInSPSFlag:%d ", m_virtualBoundariesPresentFlag );
if( m_virtualBoundariesPresentFlag )
{
-#else
- msg(VERBOSE, "LoopFilterAcrossVirtualBoundaries:%d ", m_loopFilterAcrossVirtualBoundariesDisabledFlag);
- if ( m_loopFilterAcrossVirtualBoundariesDisabledFlag )
- {
-#endif
msg(VERBOSE, "vertical virtual boundaries:[");
for (unsigned i = 0; i < m_numVerVirtualBoundaries; i++)
{
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 8527ce975c..05e264d300 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -373,12 +373,8 @@ protected:
unsigned m_wrapAroundOffset;
// ADD_NEW_TOOL : (encoder app) add tool enabling flags and associated parameters here
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
bool m_virtualBoundariesEnabledFlag;
bool m_virtualBoundariesPresentFlag;
-#else
- bool m_loopFilterAcrossVirtualBoundariesDisabledFlag;
-#endif
unsigned m_numVerVirtualBoundaries;
unsigned m_numHorVirtualBoundaries;
std::vector<unsigned> m_virtualBoundariesPosX;
diff --git a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp
index eb28dd449a..592c99f238 100644
--- a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp
+++ b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp
@@ -83,13 +83,8 @@ bool AdaptiveLoopFilter::isCrossedByVirtualBoundaries( const CodingStructure& cs
const PPS* pps = cs.pps;
const PicHeader* picHeader = cs.picHeader;
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
if( picHeader->getVirtualBoundariesPresentFlag() )
{
-#else
- if( picHeader->getLoopFilterAcrossVirtualBoundariesDisabledFlag() )
- {
-#endif
for( int i = 0; i < picHeader->getNumHorVirtualBoundaries(); i++ )
{
if( picHeader->getVirtualBoundariesPosY(i) == yPos )
diff --git a/source/Lib/CommonLib/LoopFilter.cpp b/source/Lib/CommonLib/LoopFilter.cpp
index 4524920b86..8d531e6e77 100644
--- a/source/Lib/CommonLib/LoopFilter.cpp
+++ b/source/Lib/CommonLib/LoopFilter.cpp
@@ -467,13 +467,8 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
inline bool LoopFilter::isCrossedByVirtualBoundaries(const int xPos, const int yPos, const int width, const int height, int& numHorVirBndry, int& numVerVirBndry, int horVirBndryPos[], int verVirBndryPos[], const PicHeader* picHeader )
{
numHorVirBndry = 0; numVerVirBndry = 0;
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
if( picHeader->getVirtualBoundariesPresentFlag() )
{
-#else
- if (picHeader->getLoopFilterAcrossVirtualBoundariesDisabledFlag())
- {
-#endif
for (int i = 0; i < picHeader->getNumHorVirtualBoundaries(); i++)
{
if (yPos <= picHeader->getVirtualBoundariesPosY(i) && picHeader->getVirtualBoundariesPosY(i) < yPos + height)
diff --git a/source/Lib/CommonLib/SampleAdaptiveOffset.cpp b/source/Lib/CommonLib/SampleAdaptiveOffset.cpp
index 5f72527565..1ced4238ed 100644
--- a/source/Lib/CommonLib/SampleAdaptiveOffset.cpp
+++ b/source/Lib/CommonLib/SampleAdaptiveOffset.cpp
@@ -747,13 +747,8 @@ void SampleAdaptiveOffset::deriveLoopFilterBoundaryAvailibility(CodingStructure&
bool SampleAdaptiveOffset::isCrossedByVirtualBoundaries(const int xPos, const int yPos, const int width, const int height, int& numHorVirBndry, int& numVerVirBndry, int horVirBndryPos[], int verVirBndryPos[], const PicHeader* picHeader )
{
numHorVirBndry = 0; numVerVirBndry = 0;
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
if( picHeader->getVirtualBoundariesPresentFlag() )
{
-#else
- if (picHeader->getLoopFilterAcrossVirtualBoundariesDisabledFlag())
- {
-#endif
for (int i = 0; i < picHeader->getNumHorVirtualBoundaries(); i++)
{
if (yPos <= picHeader->getVirtualBoundariesPosY(i) && picHeader->getVirtualBoundariesPosY(i) <= yPos + height)
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index d59c0417c6..2aacca129e 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -2295,12 +2295,8 @@ PicHeader::PicHeader()
, m_subPicIdSignallingPresentFlag ( 0 )
, m_subPicIdLen ( 0 )
#endif
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
, m_virtualBoundariesEnabledFlag ( 0 )
, m_virtualBoundariesPresentFlag ( 0 )
-#else
-, m_loopFilterAcrossVirtualBoundariesDisabledFlag ( 0 )
-#endif
, m_numVerVirtualBoundaries ( 0 )
, m_numHorVirtualBoundaries ( 0 )
#if !JVET_Q0155_COLOUR_ID
@@ -2426,12 +2422,8 @@ void PicHeader::initPicHeader()
m_subPicIdSignallingPresentFlag = 0;
m_subPicIdLen = 0;
#endif
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
m_virtualBoundariesEnabledFlag = 0;
m_virtualBoundariesPresentFlag = 0;
-#else
- m_loopFilterAcrossVirtualBoundariesDisabledFlag = 0;
-#endif
m_numVerVirtualBoundaries = 0;
m_numHorVirtualBoundaries = 0;
#if !JVET_Q0155_COLOUR_ID
@@ -2671,12 +2663,8 @@ SPS::SPS()
, m_saoEnabledFlag (false)
, m_bTemporalIdNestingFlag (false)
, m_scalingListEnabledFlag (false)
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
, m_virtualBoundariesEnabledFlag( 0 )
, m_virtualBoundariesPresentFlag( 0 )
-#else
-, m_loopFilterAcrossVirtualBoundariesDisabledFlag(0)
-#endif
, m_numVerVirtualBoundaries(0)
, m_numHorVirtualBoundaries(0)
, m_generalHrdParametersPresentFlag(false)
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 5d6a0954e6..c25dcaf42b 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -1430,12 +1430,8 @@ private:
bool m_scalingListEnabledFlag;
bool m_depQuantEnabledFlag; //!< dependent quantization enabled flag
bool m_signDataHidingEnabledFlag; //!< sign data hiding enabled flag
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
bool m_virtualBoundariesEnabledFlag; //!< Enable virtual boundaries tool
bool m_virtualBoundariesPresentFlag; //!< disable loop filtering across virtual boundaries
-#else
- bool m_loopFilterAcrossVirtualBoundariesDisabledFlag; //!< disable loop filtering across virtual boundaries
-#endif
unsigned m_numVerVirtualBoundaries; //!< number of vertical virtual boundaries
unsigned m_numHorVirtualBoundaries; //!< number of horizontal virtual boundaries
unsigned m_virtualBoundariesPosX[3]; //!< horizontal position of each vertical virtual boundary
@@ -1792,15 +1788,10 @@ void setCCALFEnabledFlag( bool b )
bool getDepQuantEnabledFlag() const { return m_depQuantEnabledFlag; }
void setSignDataHidingEnabledFlag(bool b) { m_signDataHidingEnabledFlag = b; }
bool getSignDataHidingEnabledFlag() const { return m_signDataHidingEnabledFlag; }
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
void setVirtualBoundariesEnabledFlag( bool b ) { m_virtualBoundariesEnabledFlag = b; }
bool getVirtualBoundariesEnabledFlag() const { return m_virtualBoundariesEnabledFlag; }
void setVirtualBoundariesPresentFlag( bool b ) { m_virtualBoundariesPresentFlag = b; }
bool getVirtualBoundariesPresentFlag() const { return m_virtualBoundariesPresentFlag; }
-#else
- void setLoopFilterAcrossVirtualBoundariesDisabledFlag(bool b) { m_loopFilterAcrossVirtualBoundariesDisabledFlag = b; }
- bool getLoopFilterAcrossVirtualBoundariesDisabledFlag() const { return m_loopFilterAcrossVirtualBoundariesDisabledFlag; }
-#endif
void setNumVerVirtualBoundaries(unsigned u) { m_numVerVirtualBoundaries = u; }
unsigned getNumVerVirtualBoundaries() const { return m_numVerVirtualBoundaries; }
void setNumHorVirtualBoundaries(unsigned u) { m_numHorVirtualBoundaries = u; }
@@ -2498,12 +2489,8 @@ private:
uint32_t m_subPicIdLen; //!< sub-picture ID length in bits
uint16_t m_subPicId[MAX_NUM_SUB_PICS]; //!< sub-picture ID for each sub-picture in the sequence
#endif
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
bool m_virtualBoundariesEnabledFlag; //!< loop filtering across virtual boundaries disabled
bool m_virtualBoundariesPresentFlag; //!< loop filtering across virtual boundaries disabled
-#else
- bool m_loopFilterAcrossVirtualBoundariesDisabledFlag; //!< loop filtering across virtual boundaries disabled
-#endif
unsigned m_numVerVirtualBoundaries; //!< number of vertical virtual boundaries
unsigned m_numHorVirtualBoundaries; //!< number of horizontal virtual boundaries
unsigned m_virtualBoundariesPosX[3]; //!< horizontal virtual boundary positions
@@ -2644,13 +2631,8 @@ public:
void setSubPicId( int i, uint16_t u ) { m_subPicId[i] = u; }
uint16_t getSubPicId( int i ) const { return m_subPicId[i]; }
#endif
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
void setVirtualBoundariesPresentFlag( bool b ) { m_virtualBoundariesPresentFlag = b; }
bool getVirtualBoundariesPresentFlag() const { return m_virtualBoundariesPresentFlag; }
-#else
- void setLoopFilterAcrossVirtualBoundariesDisabledFlag(bool b) { m_loopFilterAcrossVirtualBoundariesDisabledFlag = b; }
- bool getLoopFilterAcrossVirtualBoundariesDisabledFlag() const { return m_loopFilterAcrossVirtualBoundariesDisabledFlag; }
-#endif
void setNumVerVirtualBoundaries(unsigned u) { m_numVerVirtualBoundaries = u; }
unsigned getNumVerVirtualBoundaries() const { return m_numVerVirtualBoundaries; }
void setNumHorVirtualBoundaries(unsigned u) { m_numHorVirtualBoundaries = u; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 334f28df1f..38a96ef541 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -59,7 +59,6 @@
-#define JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG 1 // JVET-Q0246: virtual boundary enable flag in the SPS.
#define JVET_Q0244 1 // JVET-Q0244 Aspect 3: Signal the slice width(height) in tiles when the number of tile columns(rows) is greater than 1.
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index d9d69de425..a81847caed 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -1533,11 +1533,7 @@ void DecLib::xCheckParameterSetConstraints(const int layerId)
#endif
#if JVET_Q0417_CONSTRAINT_SPS_VB_PRESENT_FLAG
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
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" );
-#else
- CHECK(sps->getRprEnabledFlag() && sps->getLoopFilterAcrossVirtualBoundariesDisabledFlag(), "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");
-#endif
#endif
if( sps->getCTUSize() + 2 * ( 1 << sps->getLog2MinCodingBlockSize() ) > pps->getPicWidthInLumaSamples() )
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 322931ce2e..0f5bf5b163 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2266,18 +2266,12 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
{
pcSPS->setSignDataHidingEnabledFlag(false);
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
READ_FLAG( uiCode, "sps_virtual_boundaries_enabled_flag" ); pcSPS->setVirtualBoundariesEnabledFlag( uiCode != 0 );
if( pcSPS->getVirtualBoundariesEnabledFlag() )
{
READ_FLAG( uiCode, "sps_loop_filter_across_virtual_boundaries_present_flag" ); pcSPS->setVirtualBoundariesPresentFlag( uiCode != 0 );
if( pcSPS->getVirtualBoundariesPresentFlag() )
{
-#else
- READ_FLAG( uiCode, "sps_loop_filter_across_virtual_boundaries_disabled_present_flag" ); pcSPS->setLoopFilterAcrossVirtualBoundariesDisabledFlag( uiCode != 0 );
- if( pcSPS->getLoopFilterAcrossVirtualBoundariesDisabledFlag() )
- {
-#endif
READ_CODE( 2, uiCode, "sps_num_ver_virtual_boundaries"); pcSPS->setNumVerVirtualBoundaries( uiCode );
for( unsigned i = 0; i < pcSPS->getNumVerVirtualBoundaries(); i++ )
{
@@ -2294,9 +2288,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setNumVerVirtualBoundaries( 0 );
pcSPS->setNumHorVirtualBoundaries( 0 );
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
}
-#endif
#if JVET_P0117_PTL_SCALABILITY
if (pcSPS->getPtlDpbHrdParamsPresentFlag())
@@ -3086,7 +3078,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
#endif
// virtual boundaries
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
if( sps->getVirtualBoundariesEnabledFlag() && !sps->getVirtualBoundariesPresentFlag() )
{
READ_FLAG( uiCode, "ph_virtual_boundaries_present_flag" );
@@ -3094,13 +3085,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
CHECK( sps->getSubPicInfoPresentFlag() && picHeader->getVirtualBoundariesPresentFlag(), "When the subpicture info is present, the signalling of the virtual boundary position, if present, shall be in SPS" );
if( picHeader->getVirtualBoundariesPresentFlag() )
{
-#else
- if( !sps->getLoopFilterAcrossVirtualBoundariesDisabledFlag() )
- {
- READ_FLAG( uiCode, "ph_loop_filter_across_virtual_boundaries_disabled_present_flag" ); picHeader->setLoopFilterAcrossVirtualBoundariesDisabledFlag( uiCode != 0 );
- if( picHeader->getLoopFilterAcrossVirtualBoundariesDisabledFlag() )
- {
-#endif
READ_CODE( 2, uiCode, "ph_num_ver_virtual_boundaries"); picHeader->setNumVerVirtualBoundaries( uiCode );
for( unsigned i = 0; i < picHeader->getNumVerVirtualBoundaries(); i++ )
{
@@ -3120,13 +3104,9 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
}
else
{
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
picHeader->setVirtualBoundariesPresentFlag( sps->getVirtualBoundariesPresentFlag() );
if( picHeader->getVirtualBoundariesPresentFlag() )
{
-#else
- picHeader->setLoopFilterAcrossVirtualBoundariesDisabledFlag( sps->getLoopFilterAcrossVirtualBoundariesDisabledFlag() );
-#endif
picHeader->setNumVerVirtualBoundaries( sps->getNumVerVirtualBoundaries() );
picHeader->setNumHorVirtualBoundaries( sps->getNumHorVirtualBoundaries() );
for( unsigned i = 0; i < 3; i++ )
@@ -3134,9 +3114,7 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
picHeader->setVirtualBoundariesPosX( sps->getVirtualBoundariesPosX(i), i );
picHeader->setVirtualBoundariesPosY( sps->getVirtualBoundariesPosY(i), i );
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
}
-#endif
}
#if !JVET_Q0155_COLOUR_ID
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 6596269b55..356459bc1e 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -374,12 +374,8 @@ protected:
unsigned m_wrapAroundOffset;
// ADD_NEW_TOOL : (encoder lib) add tool enabling flags and associated parameters here
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
bool m_virtualBoundariesEnabledFlag;
bool m_virtualBoundariesPresentFlag;
-#else
- bool m_loopFilterAcrossVirtualBoundariesDisabledFlag;
-#endif
unsigned m_numVerVirtualBoundaries;
unsigned m_numHorVirtualBoundaries;
unsigned m_virtualBoundariesPosX[3];
@@ -1171,15 +1167,10 @@ public:
unsigned getWrapAroundOffset () const { return m_wrapAroundOffset; }
// ADD_NEW_TOOL : (encoder lib) add access functions here
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
void setVirtualBoundariesEnabledFlag( bool b ) { m_virtualBoundariesEnabledFlag = b; }
bool getVirtualBoundariesEnabledFlag() const { return m_virtualBoundariesEnabledFlag; }
void setVirtualBoundariesPresentFlag( bool b ) { m_virtualBoundariesPresentFlag = b; }
bool getVirtualBoundariesPresentFlag() const { return m_virtualBoundariesPresentFlag; }
-#else
- void setLoopFilterAcrossVirtualBoundariesDisabledFlag( bool b ) { m_loopFilterAcrossVirtualBoundariesDisabledFlag = b; }
- bool getLoopFilterAcrossVirtualBoundariesDisabledFlag() const { return m_loopFilterAcrossVirtualBoundariesDisabledFlag; }
-#endif
void setNumVerVirtualBoundaries ( unsigned u ) { m_numVerVirtualBoundaries = u; }
unsigned getNumVerVirtualBoundaries () const { return m_numVerVirtualBoundaries; }
void setNumHorVirtualBoundaries ( unsigned u ) { m_numHorVirtualBoundaries = u; }
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 5b2cd9cc00..5009796c5b 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1576,15 +1576,11 @@ void EncLib::xInitSPS( SPS& sps, VPS& vps )
{
sps.setSignDataHidingEnabledFlag(false);
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
sps.setVirtualBoundariesEnabledFlag( m_virtualBoundariesEnabledFlag );
if( sps.getVirtualBoundariesEnabledFlag() )
{
sps.setVirtualBoundariesPresentFlag( m_virtualBoundariesPresentFlag );
CHECK( sps.getSubPicInfoPresentFlag() && sps.getVirtualBoundariesPresentFlag() != 1, "When subpicture signalling if present, the signalling of virtual boundaries, is present, shall be in the SPS" );
-#else
- sps.setLoopFilterAcrossVirtualBoundariesDisabledFlag( m_loopFilterAcrossVirtualBoundariesDisabledFlag );
-#endif
sps.setNumVerVirtualBoundaries ( m_numVerVirtualBoundaries );
sps.setNumHorVirtualBoundaries ( m_numHorVirtualBoundaries );
for( unsigned int i = 0; i < m_numVerVirtualBoundaries; i++ )
@@ -1595,9 +1591,7 @@ void EncLib::xInitSPS( SPS& sps, VPS& vps )
{
sps.setVirtualBoundariesPosY ( m_virtualBoundariesPosY[i], i );
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
}
-#endif
#if JVET_Q0814_DPB
#if ENABLING_MULTI_SPS
@@ -1641,11 +1635,7 @@ void EncLib::xInitSPS( SPS& sps, VPS& vps )
#endif
#if JVET_Q0417_CONSTRAINT_SPS_VB_PRESENT_FLAG
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
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" );
-#else
- CHECK(sps.getRprEnabledFlag() && sps.getLoopFilterAcrossVirtualBoundariesDisabledFlag(), "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");
-#endif
#endif
}
@@ -2078,22 +2068,16 @@ void EncLib::xInitPicHeader(PicHeader &picHeader, const SPS &sps, const PPS &pps
#endif
// virtual boundaries
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
if( sps.getVirtualBoundariesEnabledFlag() )
{
picHeader.setVirtualBoundariesPresentFlag( sps.getVirtualBoundariesPresentFlag() );
-#else
- picHeader.setLoopFilterAcrossVirtualBoundariesDisabledFlag(sps.getLoopFilterAcrossVirtualBoundariesDisabledFlag());
-#endif
picHeader.setNumVerVirtualBoundaries(sps.getNumVerVirtualBoundaries());
picHeader.setNumHorVirtualBoundaries(sps.getNumHorVirtualBoundaries());
for(i=0; i<3; i++) {
picHeader.setVirtualBoundariesPosX(sps.getVirtualBoundariesPosX(i), i);
picHeader.setVirtualBoundariesPosY(sps.getVirtualBoundariesPosY(i), i);
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
}
-#endif
// gradual decoder refresh flag
picHeader.setGdrPicFlag(false);
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 00e8fa7670..c31e7d0f9c 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1488,18 +1488,12 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
{
WRITE_FLAG(pcSPS->getSignDataHidingEnabledFlag(), "sps_sign_data_hiding_enabled_flag");
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
WRITE_FLAG( pcSPS->getVirtualBoundariesEnabledFlag(), "sps_virtual_boundaries_enabled_flag" );
if( pcSPS->getVirtualBoundariesEnabledFlag() )
{
WRITE_FLAG( pcSPS->getVirtualBoundariesPresentFlag(), "sps_loop_filter_across_virtual_boundaries_present_flag" );
if( pcSPS->getVirtualBoundariesPresentFlag() )
{
-#else
- WRITE_FLAG( pcSPS->getLoopFilterAcrossVirtualBoundariesDisabledFlag(), "sps_loop_filter_across_virtual_boundaries_disabled_present_flag" );
- if( pcSPS->getLoopFilterAcrossVirtualBoundariesDisabledFlag() )
- {
-#endif
WRITE_CODE( pcSPS->getNumVerVirtualBoundaries(), 2, "sps_num_ver_virtual_boundaries");
for( unsigned i = 0; i < pcSPS->getNumVerVirtualBoundaries(); i++ )
{
@@ -1511,9 +1505,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_CODE((pcSPS->getVirtualBoundariesPosY(i)>>3), 13, "sps_virtual_boundaries_pos_y");
}
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
}
-#endif
#if JVET_P0117_PTL_SCALABILITY
if (pcSPS->getPtlDpbHrdParamsPresentFlag())
{
@@ -2074,19 +2066,11 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
#endif
// virtual boundaries
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
if( sps->getVirtualBoundariesEnabledFlag() && !sps->getVirtualBoundariesPresentFlag() )
{
WRITE_FLAG( picHeader->getVirtualBoundariesPresentFlag(), "ph_virtual_boundaries_present_flag" );
if( picHeader->getVirtualBoundariesPresentFlag() )
{
-#else
- if( !sps->getLoopFilterAcrossVirtualBoundariesDisabledFlag() )
- {
- WRITE_FLAG( picHeader->getLoopFilterAcrossVirtualBoundariesDisabledFlag(), "ph_loop_filter_across_virtual_boundaries_disabled_present_flag" );
- if( picHeader->getLoopFilterAcrossVirtualBoundariesDisabledFlag() )
- {
-#endif
WRITE_CODE(picHeader->getNumVerVirtualBoundaries(), 2, "ph_num_ver_virtual_boundaries");
for( unsigned i = 0; i < picHeader->getNumVerVirtualBoundaries(); i++ )
{
@@ -2100,24 +2084,16 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
}
else
{
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
picHeader->setVirtualBoundariesPresentFlag( 0 );
-#else
- picHeader->setLoopFilterAcrossVirtualBoundariesDisabledFlag( 0 );
-#endif
picHeader->setNumVerVirtualBoundaries( 0 );
picHeader->setNumHorVirtualBoundaries( 0 );
}
}
else
{
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
picHeader->setVirtualBoundariesPresentFlag( sps->getVirtualBoundariesPresentFlag() );
if( picHeader->getVirtualBoundariesPresentFlag() )
{
-#else
- picHeader->setLoopFilterAcrossVirtualBoundariesDisabledFlag( sps->getLoopFilterAcrossVirtualBoundariesDisabledFlag() );
-#endif
picHeader->setNumVerVirtualBoundaries( sps->getNumVerVirtualBoundaries() );
picHeader->setNumHorVirtualBoundaries( sps->getNumHorVirtualBoundaries() );
for( unsigned i = 0; i < 3; i++ )
@@ -2125,9 +2101,7 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader )
picHeader->setVirtualBoundariesPosX( sps->getVirtualBoundariesPosX(i), i );
picHeader->setVirtualBoundariesPosY( sps->getVirtualBoundariesPosY(i), i );
}
-#if JVET_Q0246_VIRTUAL_BOUNDARY_ENABLE_FLAG
}
-#endif
}
#if !JVET_Q0155_COLOUR_ID
--
GitLab