From ed0d5d52e08d214b9cb58ee97e16c08591aab245 Mon Sep 17 00:00:00 2001 From: Karsten Suehring Date: Fri, 18 Jan 2019 12:14:56 +0100 Subject: [PATCH] remove macro JVET_L0083_ALF_FRAC_BIT --- source/Lib/CommonLib/AdaptiveLoopFilter.cpp | 4 ---- source/Lib/CommonLib/AdaptiveLoopFilter.h | 4 ---- source/Lib/CommonLib/TypeDef.h | 1 - 3 files changed, 9 deletions(-) diff --git a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp index 067275d5..1ff8876e 100644 --- a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp +++ b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp @@ -472,11 +472,7 @@ void AdaptiveLoopFilter::filterBlk( AlfClassifier** classifier, const PelUnitBuf short *coef = filterSet; -#if JVET_L0083_ALF_FRAC_BIT const int shift = m_NUM_BITS - 1; -#else - const int shift = 9; -#endif const int offset = 1 << ( shift - 1 ); diff --git a/source/Lib/CommonLib/AdaptiveLoopFilter.h b/source/Lib/CommonLib/AdaptiveLoopFilter.h index 21638970..688fecc9 100644 --- a/source/Lib/CommonLib/AdaptiveLoopFilter.h +++ b/source/Lib/CommonLib/AdaptiveLoopFilter.h @@ -66,11 +66,7 @@ enum Direction class AdaptiveLoopFilter { public: -#if JVET_L0083_ALF_FRAC_BIT static constexpr int m_NUM_BITS = 8; -#else - static constexpr int m_NUM_BITS = 10; -#endif static constexpr int m_CLASSIFICATION_BLK_SIZE = 32; //non-normative, local buffer size AdaptiveLoopFilter(); diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 892266d4..a37c6b7e 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -70,7 +70,6 @@ -#define JVET_L0083_ALF_FRAC_BIT 1 // Reduce number of ALF fractional bit to 7 #define JVET_L0082_ALF_COEF_BITS 1 // ALF filter coefficient bitwidth constraints -- 2.21.0