From 736b50da160551a5311c7255fa0aaa644b600809 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Mon, 6 Jul 2020 15:14:32 +0200
Subject: [PATCH] remove macro JVET_R0388_DBF_CLEANUP
---
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/VLCReader.cpp | 8 --------
source/Lib/EncoderLib/VLCWriter.cpp | 8 --------
3 files changed, 17 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index cedcb3e91..2a76d1799 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -120,7 +120,6 @@
-#define JVET_R0388_DBF_CLEANUP 1 // JVET-R0388: Cleanups on deblocking signalling
#define JVET_R0114_NEGATIVE_SCALING_WINDOW_OFFSETS 1 // JVET-R0114: Allow negative scaling window offsets
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 975f8f2f3..ad5eacd9e 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -3267,19 +3267,15 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
if(picHeader->getDeblockingFilterOverrideFlag())
{
-#if JVET_R0388_DBF_CLEANUP
if (!pps->getPPSDeblockingFilterDisabledFlag())
{
-#endif
READ_FLAG(uiCode, "ph_deblocking_filter_disabled_flag");
picHeader->setDeblockingFilterDisable(uiCode != 0);
-#if JVET_R0388_DBF_CLEANUP
}
else
{
picHeader->setDeblockingFilterDisable(false);
}
-#endif
if (!picHeader->getDeblockingFilterDisable())
{
READ_SVLC( iCode, "ph_beta_offset_div2" );
@@ -4176,18 +4172,14 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
}
if(pcSlice->getDeblockingFilterOverrideFlag())
{
-#if JVET_R0388_DBF_CLEANUP
if (!pps->getPPSDeblockingFilterDisabledFlag())
{
-#endif
READ_FLAG(uiCode, "slice_deblocking_filter_disabled_flag"); pcSlice->setDeblockingFilterDisable(uiCode ? 1 : 0);
-#if JVET_R0388_DBF_CLEANUP
}
else
{
pcSlice->setDeblockingFilterDisable(false);
}
-#endif
if(!pcSlice->getDeblockingFilterDisable())
{
READ_SVLC( iCode, "slice_beta_offset_div2" ); pcSlice->setDeblockingFilterBetaOffsetDiv2( iCode );
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index bd3be3f58..328a216a0 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -2054,14 +2054,10 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader, bool writeRbspTrailingB
if(picHeader->getDeblockingFilterOverrideFlag())
{
-#if JVET_R0388_DBF_CLEANUP
if (!pps->getPPSDeblockingFilterDisabledFlag())
{
-#endif
WRITE_FLAG(picHeader->getDeblockingFilterDisable(), "ph_deblocking_filter_disabled_flag");
-#if JVET_R0388_DBF_CLEANUP
}
-#endif
if( !picHeader->getDeblockingFilterDisable() )
{
WRITE_SVLC( picHeader->getDeblockingFilterBetaOffsetDiv2(), "ph_beta_offset_div2" );
@@ -2473,14 +2469,10 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
}
if (pcSlice->getDeblockingFilterOverrideFlag())
{
-#if JVET_R0388_DBF_CLEANUP
if (!pcSlice->getPPS()->getPPSDeblockingFilterDisabledFlag())
{
-#endif
WRITE_FLAG(pcSlice->getDeblockingFilterDisable(), "slice_deblocking_filter_disabled_flag");
-#if JVET_R0388_DBF_CLEANUP
}
-#endif
if(!pcSlice->getDeblockingFilterDisable())
{
WRITE_SVLC (pcSlice->getDeblockingFilterBetaOffsetDiv2(), "slice_beta_offset_div2");
--
GitLab