diff --git a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp index 9e16dcac073df0b6da147d6ce0245e9a21de02a3..eb5434a3107b9a6eb52cd9c0d2b474770b053c15 100644 --- a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp +++ b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp @@ -1368,12 +1368,10 @@ void AdaptiveLoopFilter::filterBlkCcAlf(const PelBuf &dstBuf, const CPelUnitBuf const Pel *srcCross = lumaPtr + col + row * lumaStride; int pos = ((startHeight + i + ii) << scaleY) & (vbCTUHeight - 1); -#if JVET_R0233_CCALF_LINE_BUFFER_REDUCTION if (scaleY == 0 && (pos == vbPos || pos == vbPos + 1)) { continue; } -#endif if (pos == (vbPos - 2) || pos == (vbPos + 1)) { offset3 = offset1; diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index a5fdcd34af4fb35c0babe5ce405b114563fc544c..f115fd091e182f624a46ea291b31048fbe730852 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -127,7 +127,6 @@ -#define JVET_R0233_CCALF_LINE_BUFFER_REDUCTION 1 // JVET-R0233 method 2: Line buffer reduction for CCALF #define JVET_Q0471_CHROMA_QT_SPLIT 0 // JVET-Q0471: Chroma QT split, reverted by JVET-R0131 diff --git a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp index 21ecf73772c5874a9bfdc13a44490a1856018e29..cda51713ca85353ab0bcf01924409c2182b622d3 100644 --- a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp +++ b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp @@ -4088,12 +4088,8 @@ void EncAdaptiveLoopFilter::getBlkStatsCcAlf(AlfCovariance &alfCovariance, const for (int i = 0; i < compArea.height; i++) { int vbDistance = ((i << getComponentScaleY(compID, m_chromaFormat)) % vbCTUHeight) - vbPos; -#if JVET_R0233_CCALF_LINE_BUFFER_REDUCTION const bool skipThisRow = getComponentScaleY(compID, m_chromaFormat) == 0 && (vbDistance == 0 || vbDistance == 1); for (int j = 0; j < compArea.width && (!skipThisRow); j++) -#else - for (int j = 0; j < compArea.width; j++) -#endif { std::memset(ELocal, 0, sizeof(ELocal));