From 69c5e8bcd918e1c14f6f5819f9f4b6da5fcb27a5 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Mon, 6 Jul 2020 15:14:24 +0200
Subject: [PATCH] remove macro JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
---
source/Lib/CommonLib/TypeDef.h | 3 ---
source/Lib/DecoderLib/VLCReader.cpp | 22 ----------------------
source/Lib/EncoderLib/VLCWriter.cpp | 13 -------------
3 files changed, 38 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 9525b1594..0e0260d96 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -118,11 +118,8 @@
-#define JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE 1 // JVET-R0200 Move the SH flags slice_lmcs_enabled_flag and slice_explicit_scaling_list_used_flag to be just after the ALF parameters
-#if JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
#define JVET_R0098_LMCS_AND_SCALING_LISTS_FOR_PH_IN_SH 1 // JVET-R0098: Only signall LMCS and explicit scaling list enable flags in SH when PH is not in SH
-#endif
#define JVET_R0388_DBF_CLEANUP 1 // JVET-R0388: Cleanups on deblocking signalling
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 5dc3f81a2..efdaa22f8 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -3716,7 +3716,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->setTileGroupCcAlfCrApsId(-1);
}
}
-#if JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
#if JVET_R0098_LMCS_AND_SCALING_LISTS_FOR_PH_IN_SH
if (picHeader->getLmcsEnabledFlag() && !pcSlice->getPictureHeaderInSliceHeader())
#else
@@ -3751,7 +3750,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->setExplicitScalingListUsed(false);
#endif
}
-#endif
// 4:4:4 colour plane ID
if( sps->getSeparateColourPlaneFlag() )
@@ -4300,26 +4298,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->setTSResidualCodingDisabledFlag(uiCode != 0);
#endif
-#if !JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
- if (picHeader->getLmcsEnabledFlag())
- {
- READ_FLAG(uiCode, "slice_lmcs_enabled_flag");
- pcSlice->setLmcsEnabledFlag(uiCode);
- }
- else
- {
- pcSlice->setLmcsEnabledFlag(false);
- }
- if (picHeader->getExplicitScalingListEnabledFlag())
- {
- READ_FLAG(uiCode, "slice_explicit_scaling_list_used_flag");
- pcSlice->setExplicitScalingListUsed(uiCode);
- }
- else
- {
- pcSlice->setExplicitScalingListUsed(false);
- }
-#endif
if( pcSlice->getFirstCtuRsAddrInSlice() == 0 )
{
pcSlice->setDefaultClpRng( *sps );
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 6e2aeeacb..e60fb50d1 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -2224,7 +2224,6 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
}
}
-#if JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
#if JVET_R0098_LMCS_AND_SCALING_LISTS_FOR_PH_IN_SH
if (picHeader->getLmcsEnabledFlag() && !pcSlice->getPictureHeaderInSliceHeader())
#else
@@ -2241,7 +2240,6 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
{
WRITE_FLAG(pcSlice->getExplicitScalingListUsed(), "slice_explicit_scaling_list_used_flag");
}
-#endif
// 4:4:4 colour plane ID
if( pcSlice->getSPS()->getSeparateColourPlaneFlag() )
@@ -2556,17 +2554,6 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
WRITE_FLAG(pcSlice->getTSResidualCodingDisabledFlag() ? 1 : 0, "slice_ts_residual_coding_disabled_flag");
#endif
-#if !JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
- if (picHeader->getLmcsEnabledFlag())
- {
- WRITE_FLAG(pcSlice->getLmcsEnabledFlag(), "slice_lmcs_enabled_flag");
- }
-
- if (picHeader->getExplicitScalingListEnabledFlag())
- {
- WRITE_FLAG(pcSlice->getExplicitScalingListUsed(), "slice_explicit_scaling_list_used_flag");
- }
-#endif
if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag())
{
--
GitLab