diff --git a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp index 875310240a0ca7ec6e63358eaa46f03226847230..22c2740f2d42debdec3065143a5f3c890bca0e72 100644 --- a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp +++ b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp @@ -3741,7 +3741,7 @@ void AdaptiveLoopFilter::fixedFilterBlk( AlfClassifier **classifier, const CPelB const bool useCodingInfo = true; const bool useBounCondition = applyCodingInfo && !( !isSpsAdjust && isIntraSlice ) && useCodingInfo; - const bool useResiCondition = applyCodingInfo && (isSpsAdjust || !isSpsAdjust) && !isIntraSlice && useCodingInfo; + const bool useResiCondition = applyCodingInfo && !isIntraSlice && useCodingInfo; const int offsetClipValue = 1 << ( clpRng.bd - 1 ); #endif int fixedFiltIndF0 = -1; @@ -4662,7 +4662,7 @@ void AdaptiveLoopFilter::fixedFilteringResi(AlfClassifier **classifier, const CP const bool isSpsAdjust = cs.sps->getAlfLumaFixedFilterAdjust(); const bool useCodingInfo = isSpsAdjust ? true : false; const bool useBounCondition = applyCodingInfo && !( !isSpsAdjust && isIntraSlice ) && useCodingInfo; - const bool useResiCondition = applyCodingInfo && (isSpsAdjust || !isSpsAdjust) && !isIntraSlice && useCodingInfo; + const bool useResiCondition = applyCodingInfo && !isIntraSlice && useCodingInfo; const int offsetClipValue = 1 << ( clpRng.bd - 1 ); #endif @@ -8212,7 +8212,7 @@ void AdaptiveLoopFilter::gaussFiltering(CodingStructure &cs, Pel ***gaussPic, co const bool isIntraSlice = cs.slice->isIntra(); const bool isSpsAdjust = cs.sps->getAlfLumaFixedFilterAdjust(); const bool useBounCondition = applyCodingInfo && !(!isSpsAdjust && isIntraSlice); - const bool useResiCondition = applyCodingInfo && (isSpsAdjust || !isSpsAdjust) && !isIntraSlice && false; + const bool useResiCondition = applyCodingInfo && !isIntraSlice && false; const int offsetClipValue = 1 << ( clpRng.bd - 1 ); #endif @@ -8401,8 +8401,7 @@ void AdaptiveLoopFilter::calcAlfLumaCodingInfoBlk( CodingStructure& cs, AlfClass { const bool isIntraSlice = cs.slice->isIntra(); - const bool isSpsAdjust = cs.sps->getAlfLumaFixedFilterAdjust(); - const bool calcResi = !isIntraSlice && (isSpsAdjust || !isSpsAdjust); + const bool calcResi = !isIntraSlice; const Pel *srcResiPtr = srcLumaResi.buf; int srcResiStride = srcLumaResi.stride; diff --git a/source/Lib/CommonLib/x86/AdaptiveLoopFilterX86.h b/source/Lib/CommonLib/x86/AdaptiveLoopFilterX86.h index b6f449d96f9d761f74b08eca50d78ff0cc03cb57..44cf3f4175858c96c7db81907b9b96cd748300f3 100644 --- a/source/Lib/CommonLib/x86/AdaptiveLoopFilterX86.h +++ b/source/Lib/CommonLib/x86/AdaptiveLoopFilterX86.h @@ -6134,7 +6134,7 @@ static void simdGaussFiltering(CodingStructure &cs, Pel ***gaussPic, const CPelB const bool isSpsAdjust = cs.sps->getAlfLumaFixedFilterAdjust(); const bool useBounCondition = applyCodingInfo && !(!isSpsAdjust && isIntraSlice); - const bool useResiCondition = applyCodingInfo && (isSpsAdjust || !isSpsAdjust) && !isIntraSlice && false; + const bool useResiCondition = applyCodingInfo && !isIntraSlice && false; const int offsetClipValue = 1 << ( clpRng.bd - 1 ); #endif #if !( USE_AVX2 && JVET_AJ0188_CODING_INFO_CLASSIFICATION ) @@ -6828,7 +6828,7 @@ static void simdFilter13x13Blk( AlfClassifier **classifier, const CPelBuf &srcLu const bool useCodingInfo = true; const bool useBounCondition = applyCodingInfo && !( !isSpsAdjust && isIntraSlice ) && useCodingInfo; - const bool useResiCondition = applyCodingInfo && (isSpsAdjust || !isSpsAdjust) && !isIntraSlice && useCodingInfo; + const bool useResiCondition = applyCodingInfo && !isIntraSlice && useCodingInfo; const int offsetClipValue = 1 << (clpRng.bd - 1); #endif #if JVET_AE0139_ALF_IMPROVED_FIXFILTER @@ -7731,7 +7731,7 @@ static void simdFixFilter9x9Db9Blk(AlfClassifier **classifier, const CPelBuf &sr const bool useCodingInfo = true; const bool useBounCondition = applyCodingInfo && !( !isSpsAdjust && isIntraSlice ) && useCodingInfo; - const bool useResiCondition = applyCodingInfo && (isSpsAdjust || !isSpsAdjust) && !isIntraSlice && useCodingInfo; + const bool useResiCondition = applyCodingInfo && !isIntraSlice && useCodingInfo; const int offsetClipValue = 1 << ( clpRng.bd - 1 ); #endif @@ -8944,7 +8944,7 @@ static void simdFilterResi9x9Db9Blk(AlfClassifier **classifier, const CPelBuf &s const bool isSpsAdjust = cs.sps->getAlfLumaFixedFilterAdjust(); const bool useCodingInfo = isSpsAdjust ? true : false; const bool useBounCondition = applyCodingInfo && !( !isSpsAdjust && isIntraSlice ) && useCodingInfo; - const bool useResiCondition = applyCodingInfo && (isSpsAdjust || !isSpsAdjust) && !isIntraSlice && useCodingInfo; + const bool useResiCondition = applyCodingInfo && !isIntraSlice && useCodingInfo; const int offsetClipValue = 1 << ( clpRng.bd - 1 ); #endif #if !( USE_AVX2 && JVET_AJ0188_CODING_INFO_CLASSIFICATION )