From c8ca4ea4c8bfc62c54cc0aef6019b8cf428e2c96 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:12:00 +0200
Subject: [PATCH] remove macro JVET_Q0495_NLALF_CLIP_CLEANUP
---
source/Lib/CommonLib/AdaptiveLoopFilter.cpp | 15 ---------------
source/Lib/CommonLib/TypeDef.h | 1 -
2 files changed, 16 deletions(-)
diff --git a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp
index 109693dec..3b2e14712 100644
--- a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp
+++ b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp
@@ -752,34 +752,19 @@ void AdaptiveLoopFilter::create( const int picWidth, const int picHeight, const
m_alfVBChmaCTUHeight = (m_maxCUHeight >> ((m_chromaFormat == CHROMA_420) ? 1 : 0));
static_assert( AlfNumClippingValues[CHANNEL_TYPE_LUMA] > 0, "AlfNumClippingValues[CHANNEL_TYPE_LUMA] must be at least one" );
-#if JVET_Q0495_NLALF_CLIP_CLEANUP
m_alfClippingValues[CHANNEL_TYPE_LUMA][0] = 1 << m_inputBitDepth[CHANNEL_TYPE_LUMA];
int shiftLuma = m_inputBitDepth[CHANNEL_TYPE_LUMA] - 8;
for (int i = 1; i < AlfNumClippingValues[CHANNEL_TYPE_LUMA]; ++i)
{
m_alfClippingValues[CHANNEL_TYPE_LUMA][i] = 1 << (7 - 2 * i + shiftLuma);
}
-#else
- for( int i = 0; i < AlfNumClippingValues[CHANNEL_TYPE_LUMA]; ++i )
- {
- m_alfClippingValues[CHANNEL_TYPE_LUMA][i] = (Pel)std::round( std::pow(2., double(m_inputBitDepth[CHANNEL_TYPE_LUMA] - 2.35*i)) );
- }
-#endif
static_assert( AlfNumClippingValues[CHANNEL_TYPE_CHROMA] > 0, "AlfNumClippingValues[CHANNEL_TYPE_CHROMA] must be at least one" );
-#if JVET_Q0495_NLALF_CLIP_CLEANUP
m_alfClippingValues[CHANNEL_TYPE_CHROMA][0] = 1 << m_inputBitDepth[CHANNEL_TYPE_CHROMA];
int shiftChroma = m_inputBitDepth[CHANNEL_TYPE_CHROMA] - 8;
for (int i = 1; i < AlfNumClippingValues[CHANNEL_TYPE_CHROMA]; ++i)
{
m_alfClippingValues[CHANNEL_TYPE_CHROMA][i] = 1 << (7 - 2 * i + shiftChroma);
}
-#else
- m_alfClippingValues[CHANNEL_TYPE_CHROMA][0] = 1 << m_inputBitDepth[CHANNEL_TYPE_CHROMA];
- for( int i = 1; i < AlfNumClippingValues[CHANNEL_TYPE_CHROMA]; ++i )
- {
- m_alfClippingValues[CHANNEL_TYPE_CHROMA][i] = (Pel)std::round( std::pow(2., double(m_inputBitDepth[CHANNEL_TYPE_CHROMA] - 2.35*i)) );
- }
-#endif
if (m_created)
{
return;
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 09fa6fd89..f27e4ccdf 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -142,7 +142,6 @@
-#define JVET_Q0495_NLALF_CLIP_CLEANUP 1 // JVET-Q0495: Cleanup of clipping table for NL-ALF
#define JVET_Q0156_STSA 1 // JVET-Q0156: Enable inter-layer prediction for STSA pictures
--
GitLab