From e9676325b491d8640e06bf0a7be56c78cb77de8c Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Mon, 24 Jul 2023 08:33:26 +0200
Subject: [PATCH] Define AlfBankIdx to represent a filter index in ALF
---
source/Lib/CommonLib/AdaptiveLoopFilter.cpp | 2 +-
source/Lib/CommonLib/AlfParameters.h | 2 +-
source/Lib/CommonLib/TypeDef.h | 1 +
source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp | 11 +++++++----
source/Lib/EncoderLib/EncAdaptiveLoopFilter.h | 11 ++++++++---
5 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp
index b9a06236b..98241b6c9 100644
--- a/source/Lib/CommonLib/AdaptiveLoopFilter.cpp
+++ b/source/Lib/CommonLib/AdaptiveLoopFilter.cpp
@@ -660,7 +660,7 @@ void AdaptiveLoopFilter::reconstructCoeff(AlfParam &alfParam, const ChannelType
}
for( int classIdx = 0; classIdx < numClasses; classIdx++ )
{
- int filterIdx = alfParam.filterCoeffDeltaIdx[classIdx];
+ AlfBankIdx filterIdx = alfParam.filterCoeffDeltaIdx[classIdx];
CHECK(!(filterIdx >= 0 && filterIdx < alfParam.numLumaFilters), "Bad coeff delta idx in ALF");
for (int coeffIdx = 0; coeffIdx < numCoeffMinus1; ++coeffIdx)
diff --git a/source/Lib/CommonLib/AlfParameters.h b/source/Lib/CommonLib/AlfParameters.h
index 653da0115..32d90cb16 100644
--- a/source/Lib/CommonLib/AlfParameters.h
+++ b/source/Lib/CommonLib/AlfParameters.h
@@ -116,7 +116,7 @@ struct AlfParam
int numAlternativesChroma; // alf_chroma_num_alts_minus_one + 1
AlfCoeff chromaCoeff[ALF_MAX_NUM_ALTERNATIVES_CHROMA][MAX_NUM_ALF_CHROMA_COEFF]; // alf_coeff_chroma[i]
Pel chromaClipp[ALF_MAX_NUM_ALTERNATIVES_CHROMA][MAX_NUM_ALF_CHROMA_COEFF]; // alf_clipp_chroma[i]
- short filterCoeffDeltaIdx[MAX_NUM_ALF_CLASSES]; // filter_coeff_delta[i]
+ AlfBankIdx filterCoeffDeltaIdx[MAX_NUM_ALF_CLASSES]; // filter_coeff_delta[i]
bool alfLumaCoeffFlag[MAX_NUM_ALF_CLASSES]; // alf_luma_coeff_flag[i]
int numLumaFilters; // number_of_filters_minus1 + 1
bool alfLumaCoeffDeltaFlag; // alf_luma_coeff_delta_flag
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index deb6b4ae5..0fdbc52e5 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -992,6 +992,7 @@ inline int operator-(AlfMode i, AlfMode j) { return to_underlying(i) - to_un
inline bool isAlfLumaFixed(AlfMode m) { return m >= AlfMode::LUMA_FIXED0 && m < AlfMode::LUMA0; }
using AlfCoeff = int16_t;
+using AlfBankIdx = uint8_t;
//////////////////////////////////////////////////////////////////////////
// Encoder modes to try out
diff --git a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
index 9edfbeb2d..d745f2265 100644
--- a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
+++ b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
@@ -1597,7 +1597,7 @@ double EncAdaptiveLoopFilter::mergeFiltersAndCost(
}
}
- memcpy( alfParam.filterCoeffDeltaIdx, m_filterIndices[numFiltersBest - 1], sizeof( short ) * MAX_NUM_ALF_CLASSES );
+ memcpy(alfParam.filterCoeffDeltaIdx, m_filterIndices[numFiltersBest - 1], sizeof(AlfBankIdx) * MAX_NUM_ALF_CLASSES);
coeffBitsFinal += getNonFilterCoeffRate(alfParam);
return distReturn;
}
@@ -1785,7 +1785,7 @@ int EncAdaptiveLoopFilter::lengthUvlc(int code)
double EncAdaptiveLoopFilter::deriveFilterCoeffs(
AlfCovariance* cov, AlfCovariance* covMerged,
int clipMerged[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF], AlfFilterShape& alfShape,
- short* filterIndices, int numFilters, double errorTabForce0Coeff[MAX_NUM_ALF_CLASSES][2], AlfParam& alfParam)
+ AlfBankIdx* filterIndices, int numFilters, double errorTabForce0Coeff[MAX_NUM_ALF_CLASSES][2], AlfParam& alfParam)
{
double error = 0.0;
AlfCovariance& tmpCov = covMerged[MAX_NUM_ALF_CLASSES];
@@ -1923,7 +1923,10 @@ void EncAdaptiveLoopFilter::roundFiltCoeffCCALF(AlfCoeff* filterCoeffQuant, doub
}
}
-void EncAdaptiveLoopFilter::mergeClasses( const AlfFilterShape& alfShape, AlfCovariance* cov, AlfCovariance* covMerged, int clipMerged[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF], const int numClasses, short filterIndices[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES] )
+void EncAdaptiveLoopFilter::mergeClasses(
+ const AlfFilterShape& alfShape, AlfCovariance* cov, AlfCovariance* covMerged,
+ int clipMerged[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF], const int numClasses,
+ AlfBankIdx filterIndices[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES])
{
int tmpClip[MAX_NUM_ALF_LUMA_COEFF];
int bestMergeClip[MAX_NUM_ALF_LUMA_COEFF];
@@ -1934,7 +1937,7 @@ void EncAdaptiveLoopFilter::mergeClasses( const AlfFilterShape& alfShape, AlfCov
uint8_t indexListTemp[MAX_NUM_ALF_CLASSES];
int numRemaining = numClasses;
- memset( filterIndices, 0, sizeof( short ) * MAX_NUM_ALF_CLASSES * MAX_NUM_ALF_CLASSES );
+ std::fill_n(filterIndices[0], MAX_NUM_ALF_CLASSES * MAX_NUM_ALF_CLASSES, 0);
for( int i = 0; i < numClasses; i++ )
{
diff --git a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.h b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.h
index 686ba4b4c..a9e592883 100644
--- a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.h
+++ b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.h
@@ -249,7 +249,7 @@ private:
AlfCoeff** m_filterCoeffSet; // [lumaClassIdx/chromaAltIdx][coeffIdx]
int** m_filterClippSet; // [lumaClassIdx/chromaAltIdx][coeffIdx]
int** m_diffFilterCoeff;
- short m_filterIndices[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES];
+ AlfBankIdx m_filterIndices[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES];
EnumArray<unsigned, ChannelType> m_bitsNewFilter;
@@ -336,11 +336,16 @@ private:
const ComponentID compID, const int yPos);
void calcCovarianceCcAlf(Pel ELocal[MAX_NUM_CC_ALF_CHROMA_COEFF][1], const Pel *rec, const ptrdiff_t stride,
const AlfFilterShape &shape, int vbDistance);
- void mergeClasses(const AlfFilterShape& alfShape, AlfCovariance* cov, AlfCovariance* covMerged, int clipMerged[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF], const int numClasses, short filterIndices[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES]);
+ void mergeClasses(const AlfFilterShape& alfShape, AlfCovariance* cov, AlfCovariance* covMerged,
+ int clipMerged[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF],
+ const int numClasses, AlfBankIdx filterIndices[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES]);
double getFilterCoeffAndCost(CodingStructure &cs, double distUnfilter, ChannelType channel, bool bReCollectStat,
int shapeIdx, int &coeffBits, bool onlyFilterCost = false);
- double deriveFilterCoeffs(AlfCovariance* cov, AlfCovariance* covMerged, int clipMerged[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF], AlfFilterShape& alfShape, short* filterIndices, int numFilters, double errorTabForce0Coeff[MAX_NUM_ALF_CLASSES][2], AlfParam& alfParam);
+ double deriveFilterCoeffs(AlfCovariance* cov, AlfCovariance* covMerged,
+ int clipMerged[MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_CLASSES][MAX_NUM_ALF_LUMA_COEFF],
+ AlfFilterShape& alfShape, AlfBankIdx* filterIndices, int numFilters,
+ double errorTabForce0Coeff[MAX_NUM_ALF_CLASSES][2], AlfParam& alfParam);
int deriveFilterCoefficientsPredictionMode(AlfFilterShape& alfShape, AlfCoeff** filterSet, int** filterCoeffDiff,
const int numFilters);
double deriveCoeffQuant(int* filterClipp, AlfCoeff* filterCoeffQuant, const AlfCovariance& cov,
--
GitLab