diff --git a/cfg/encoder_intra_vtm.cfg b/cfg/encoder_intra_vtm.cfg
index 4509605d9beee1255c1699fac1f2cb88cc040b26..05ee5bbb761da51ddf6670957561e264df6009bb 100644
--- a/cfg/encoder_intra_vtm.cfg
+++ b/cfg/encoder_intra_vtm.cfg
@@ -110,9 +110,10 @@ FastLFNST : 1
# Encoder optimization tools
AffineAmvrEncOpt : 0
-ALFStrength : 1.0
ALFAllowPredefinedFilters : 1
-CCALFStrength : 1.0
+ALFStrengthTargetLuma : 1.0
+ALFStrengthTargetChroma : 1.0
+CCALFStrengthTarget : 1.0
### DO NOT ADD ANYTHING BELOW THIS LINE ###
### DO NOT DELETE THE EMPTY LINE BELOW ###
diff --git a/cfg/encoder_lowdelay_P_vtm.cfg b/cfg/encoder_lowdelay_P_vtm.cfg
index 35b2291f4762f1177be73214459901519073c59d..7e7efcd926a61150292199e607c07ed166c57d58 100644
--- a/cfg/encoder_lowdelay_P_vtm.cfg
+++ b/cfg/encoder_lowdelay_P_vtm.cfg
@@ -136,9 +136,10 @@ FastLocalDualTreeMode : 2
# Encoder optimization tools
AffineAmvrEncOpt : 0
MmvdDisNum : 6
-ALFStrength : 1.0
ALFAllowPredefinedFilters : 1
-CCALFStrength : 1.0
+ALFStrengthTargetLuma : 1.0
+ALFStrengthTargetChroma : 1.0
+CCALFStrengthTarget : 1.0
### DO NOT ADD ANYTHING BELOW THIS LINE ###
### DO NOT DELETE THE EMPTY LINE BELOW ###
diff --git a/cfg/encoder_lowdelay_vtm.cfg b/cfg/encoder_lowdelay_vtm.cfg
index 5818fb1f7ad45e3d7a5c6e2cac34fa77ca7a4406..7d07b1f0bef08aae715d1be1a110f7c709363da4 100644
--- a/cfg/encoder_lowdelay_vtm.cfg
+++ b/cfg/encoder_lowdelay_vtm.cfg
@@ -140,9 +140,10 @@ FastLocalDualTreeMode : 2
# Encoder optimization tools
AffineAmvrEncOpt : 0
MmvdDisNum : 6
-ALFStrength : 1.0
ALFAllowPredefinedFilters : 1
-CCALFStrength : 1.0
+ALFStrengthTargetLuma : 1.0
+ALFStrengthTargetChroma : 1.0
+CCALFStrengthTarget : 1.0
### DO NOT ADD ANYTHING BELOW THIS LINE ###
### DO NOT DELETE THE EMPTY LINE BELOW ###
diff --git a/cfg/encoder_randomaccess_vtm.cfg b/cfg/encoder_randomaccess_vtm.cfg
index 6340de55b33675f33131e7c2d698f318ebc4fcd4..0e4f2c4b140aea9613b4a9ac5be1b37435f3d439 100644
--- a/cfg/encoder_randomaccess_vtm.cfg
+++ b/cfg/encoder_randomaccess_vtm.cfg
@@ -166,9 +166,10 @@ ChromaTS : 1
# Encoder optimization tools
AffineAmvrEncOpt : 1
MmvdDisNum : 6
-ALFStrength : 1.0
ALFAllowPredefinedFilters : 1
-CCALFStrength : 1.0
+ALFStrengthTargetLuma : 1.0
+ALFStrengthTargetChroma : 1.0
+CCALFStrengthTarget : 1.0
TemporalFilter : 1 # Enable/disable GOP Based Temporal Filter
TemporalFilterFutureReference : 1 # Enable/disable reading future frames
TemporalFilterStrengthFrame8 : 0.95 # Enable filter at every 8th frame with given strength
diff --git a/cfg/encoder_randomaccess_vtm_gop16.cfg b/cfg/encoder_randomaccess_vtm_gop16.cfg
index a3a6984d2fca4f906ec01ede78770483dec262c9..879496205bf54e0a53c20b4bb3c9f41c378d9cbc 100644
--- a/cfg/encoder_randomaccess_vtm_gop16.cfg
+++ b/cfg/encoder_randomaccess_vtm_gop16.cfg
@@ -150,9 +150,10 @@ ChromaTS : 1
# Encoder optimization tools
AffineAmvrEncOpt : 1
MmvdDisNum : 6
-ALFStrength : 1.0
ALFAllowPredefinedFilters : 1
-CCALFStrength : 1.0
+ALFStrengthTargetLuma : 1.0
+ALFStrengthTargetChroma : 1.0
+CCALFStrengthTarget : 1.0
TemporalFilter : 1 # Enable/disable GOP Based Temporal Filter
TemporalFilterFutureReference : 1 # Enable/disable reading future frames
TemporalFilterStrengthFrame8 : 0.95 # Enable filter at every 8th frame with given strength
diff --git a/doc/software-manual.tex b/doc/software-manual.tex
index 58d625f2d16385c7dd6533e09d810d231bedd401..970b6301c3ea225d397699bcfb30c0a3a737d2bf 100644
--- a/doc/software-manual.tex
+++ b/doc/software-manual.tex
@@ -2888,10 +2888,28 @@ switched at CTB level. Set to 1 to disable alternative chroma filters.
Value shall be in the range 1..8.
\\
-\Option{ALFStrength} &
+\Option{ALFStrengthLuma} &
%\ShortOption{\None} &
\Default{1.0} &
-Enables control of ALF filter strength. The parameter scales the magnitudes of the ALF filter coefficients for both luma and chroma. Valid values are in the range 0.0 to 1.0. NOTE: Refinement of quantized filter coefficents is not used when ALFStrength is different from 1.0. To ensure reduced filter strength the parameter ALFAllowPredefinedFilters should also be set to false.
+Enables control of ALF filter strength for luma. The parameter scales the magnitudes of the ALF filter coefficients for luma. Valid values are in the range 0.0 to 1.0. NOTE: Refinement of quantized filter coefficents is not used when ALFStrengthLuma is different from 1.0. To ensure reduced filter strength the parameter ALFAllowPredefinedFilters should also be set to false.
+\\
+
+\Option{ALFStrengthChroma} &
+%\ShortOption{\None} &
+\Default{1.0} &
+Enables control of ALF filter strength for chroma. The parameter scales the magnitudes of the ALF filter coefficients for chroma. Valid values are in the range 0.0 to 1.0.
+\\
+
+\Option{ALFStrengthTargetLuma} &
+%\ShortOption{\None} &
+\Default{1.0} &
+Enables control of ALF filter strength target for luma filter optimization. The parameter scales the auto-correlation matrix E and the cross-correlation vector y for luma. Valid values are in the range 0.0 to 1.0.
+\\
+
+\Option{ALFStrengthTargetChroma} &
+%\ShortOption{\None} &
+\Default{1.0} &
+Enables control of ALF filter strength target for chroma filter optimization. The parameter scales the auto-correlation matrix E and the cross-correlation vector y for chroma. Valid values are in the range 0.0 to 1.0.
\\
\Option{ALFAllowPredefinedFilters} &
@@ -2918,6 +2936,12 @@ QP threshold above which the encoder reduces cross-component ALF usage.
Enables control of CCALF filter strength. The parameter scales the magnitudes of the CCALF filter coefficients. Valid values are in the range 0.0 to 1.0. NOTE: Refinement of quantized filter coefficents is not used when CCALFStrength is different from 1.0.
\\
+\Option{CCALFStrengthTarget} &
+%\ShortOption{\None} &
+\Default{1.0} &
+Enables control of CCALF filter strength target in filter optimization. The parameter scales the auto-correlation matrix E and the cross-correlation vector y for CCALF. Valid values are in the range 0.0 to 1.0.
+\\
+
\Option{SMVD} &
%\ShortOption{\None} &
\Default{false} &
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 2755f729d31b1e80a80ce74e616774c314eecb4b..887b04be70a14f6f65f8ebbcf3eb35bc68191e06 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -1041,9 +1041,19 @@ void EncApp::xInitLibCfg()
m_cEncLib.setForceSingleSplitThread ( m_forceSplitSequential );
#endif
m_cEncLib.setUseALF ( m_alf );
+#if JVET_U0081
+ m_cEncLib.setALFStrengthLuma (m_alfStrengthLuma);
+#else
m_cEncLib.setALFStrength (m_alfStrength);
+#endif
m_cEncLib.setCCALFStrength (m_ccalfStrength);
m_cEncLib.setALFAllowPredefinedFilters (m_alfAllowPredefinedFilters);
+#if JVET_U0081
+ m_cEncLib.setALFStrengthChroma (m_alfStrengthChroma);
+ m_cEncLib.setALFStrengthTargetLuma (m_alfStrengthTargetLuma);
+ m_cEncLib.setALFStrengthTargetChroma (m_alfStrengthTargetChroma);
+ m_cEncLib.setCCALFStrengthTarget (m_ccalfStrengthTarget);
+#endif
m_cEncLib.setUseCCALF ( m_ccalf );
m_cEncLib.setCCALFQpThreshold ( m_ccalfQpThreshold );
m_cEncLib.setLmcs ( m_lmcsEnabled );
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 7094cf7ed3fa8a1beecb647b60b79c4cf4d93f50..5f77fca0cfd5e223e714940110e1874a9a61dbc8 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1387,9 +1387,19 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("DebugCTU", m_debugCTU, -1, "If DebugBitstream is present, load frames up to this POC from this bitstream. Starting with DebugPOC-frame at CTUline containin debug CTU.")
("EnsureWppBitEqual", m_ensureWppBitEqual, false, "Ensure the results are equal to results with WPP-style parallelism, even if WPP is off")
( "ALF", m_alf, true, "Adaptive Loop Filter\n" )
+#if JVET_U0081
+ ("ALFStrengthLuma", m_alfStrengthLuma, 1.0, "Adaptive Loop Filter strength for luma. The parameter scales the magnitudes of the ALF filter coefficients for luma. Valid range is 0.0 <= ALFStrengthLuma <= 1.0")
+#else
("ALFStrength", m_alfStrength, 1.0, "Adaptive Loop Filter strength. The parameter scales the magnitudes of the ALF filter coefficients for both luma and chroma. Valid range is 0.0 <= ALFStrength <= 1.0")
+#endif
("ALFAllowPredefinedFilters", m_alfAllowPredefinedFilters, true, "Allow use of predefined filters for ALF")
("CCALFStrength", m_ccalfStrength, 1.0, "Cross-component Adaptive Loop Filter strength. The parameter scales the magnitudes of the CCALF filter coefficients. Valid range is 0.0 <= CCALFStrength <= 1.0")
+#if JVET_U0081
+ ("ALFStrengthChroma", m_alfStrengthChroma, 1.0, "Adaptive Loop Filter strength for chroma. The parameter scales the magnitudes of the ALF filter coefficients for chroma. Valid range is 0.0 <= ALFStrengthChroma <= 1.0")
+ ("ALFStrengthTargetLuma", m_alfStrengthTargetLuma, 1.0, "Adaptive Loop Filter strength target for ALF luma filter optimization. The parameter scales the auto-correlation matrix E and the cross-correlation vector y for luma. Valid range is 0.0 <= ALFStrengthTargetLuma <= 1.0")
+ ("ALFStrengthTargetChroma", m_alfStrengthTargetChroma, 1.0, "Adaptive Loop Filter strength target for ALF chroma filter optimization. The parameter scales the auto-correlation matrix E and the cross-correlation vector y for chroma. Valid range is 0.0 <= ALFStrengthTargetChroma <= 1.0")
+ ("CCALFStrengthTarget", m_ccalfStrengthTarget, 1.0, "Cross-component Adaptive Loop Filter strength target for filter optimization. The parameter scales the auto-correlation matrix E and the cross-correlation vector y. Valid range is 0.0 <= CCALFStrengthTarget <= 1.0")
+#endif
( "CCALF", m_ccalf, true, "Cross-component Adaptive Loop Filter" )
( "CCALFQpTh", m_ccalfQpThreshold, 37, "QP threshold above which encoder reduces CCALF usage")
( "RPR", m_rprEnabledFlag, true, "Reference Sample Resolution" )
@@ -2743,14 +2753,35 @@ bool EncAppCfg::xCheckParameter()
}
if (m_alf)
{
+#if JVET_U0081
+ xConfirmPara(m_alfStrengthLuma < 0.0, "ALFStrengthLuma is less than 0. Valid range is 0.0 <= ALFStrengthLuma <= 1.0");
+ xConfirmPara(m_alfStrengthLuma > 1.0, "ALFStrengthLuma is greater than 1. Valid range is 0.0 <= ALFStrengthLuma <= 1.0");
+#else
xConfirmPara(m_alfStrength < 0.0, "ALFStrength is less than 0. Valid range is 0.0 <= ALFStrength <= 1.0" );
xConfirmPara(m_alfStrength > 1.0, "ALFStrength is greater than 1. Valid range is 0.0 <= ALFStrength <= 1.0" );
+#endif
}
if (m_ccalf)
{
xConfirmPara(m_ccalfStrength < 0.0, "CCALFStrength is less than 0. Valid range is 0.0 <= CCALFStrength <= 1.0");
xConfirmPara(m_ccalfStrength > 1.0, "CCALFStrength is greater than 1. Valid range is 0.0 <= CCALFStrength <= 1.0");
}
+#if JVET_U0081
+ if (m_alf)
+ {
+ xConfirmPara(m_alfStrengthChroma < 0.0, "ALFStrengthChroma is less than 0. Valid range is 0.0 <= ALFStrengthChroma <= 1.0");
+ xConfirmPara(m_alfStrengthChroma > 1.0, "ALFStrengthChroma is greater than 1. Valid range is 0.0 <= ALFStrengthChroma <= 1.0");
+ xConfirmPara(m_alfStrengthTargetLuma < 0.0, "ALFStrengthTargetLuma is less than 0. Valid range is 0.0 <= ALFStrengthTargetLuma <= 1.0");
+ xConfirmPara(m_alfStrengthTargetLuma > 1.0, "ALFStrengthTargetLuma is greater than 1. Valid range is 0.0 <= ALFStrengthTargetLuma <= 1.0");
+ xConfirmPara(m_alfStrengthTargetChroma < 0.0, "ALFStrengthTargetChroma is less than 0. Valid range is 0.0 <= ALFStrengthTargetChroma <= 1.0");
+ xConfirmPara(m_alfStrengthTargetChroma > 1.0, "ALFStrengthTargetChroma is greater than 1. Valid range is 0.0 <= ALFStrengthTargetChroma <= 1.0");
+ }
+ if (m_ccalf)
+ {
+ xConfirmPara(m_ccalfStrengthTarget < 0.0, "CCALFStrengthTarget is less than 0. Valid range is 0.0 <= CCALFStrengthTarget <= 1.0");
+ xConfirmPara(m_ccalfStrengthTarget > 1.0, "CCALFStrengthTarget is greater than 1. Valid range is 0.0 <= CCALFStrengthTarget <= 1.0");
+ }
+#endif
if (m_ccalf && (m_chromaFormatIDC == CHROMA_400))
{
msg( WARNING, "****************************************************************************\n");
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index c3a7898478e7026c253c0f9ccc984bc4fc8e4d73..c5196940838c0fc27e563394de7849b2c3d058ff 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -695,9 +695,19 @@ protected:
bool m_forceDecodeBitstream1;
bool m_alf; ///< Adaptive Loop Filter
+#if JVET_U0081
+ double m_alfStrengthLuma;
+#else
double m_alfStrength;
+#endif
bool m_alfAllowPredefinedFilters;
double m_ccalfStrength;
+#if JVET_U0081
+ double m_alfStrengthChroma;
+ double m_alfStrengthTargetLuma;
+ double m_alfStrengthTargetChroma;
+ double m_ccalfStrengthTarget;
+#endif
bool m_ccalf;
int m_ccalfQpThreshold;
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 30a7c43094eee56154db8d23c8d0a6c5d0cda74b..b0b8980200d42f1f6165108bc6d645121e5fad58 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -52,6 +52,8 @@
// clang-format off
+#define JVET_U0081 1 // ALF filter strength target
+
//########### place macros to be removed in next cycle below this line ###############
#define JVET_S0078_NOOUTPUTPRIORPICFLAG 0 // JVET-S0078: Handling of NoOutputOfPriorPicsFlag in output process
diff --git a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
index 0115ab523a6680daed99761ba44c028533572c0d..732f1de8ca6235d16cfefd12deb3c26853d6f476 100644
--- a/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
+++ b/source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
@@ -1834,7 +1834,12 @@ double EncAdaptiveLoopFilter::deriveCoeffQuant( int *filterClipp, int *filterCoe
filterCoeffQuant[numCoeff - 1] = 0;
int modified=1;
+#if JVET_U0081
+ bool isLumaFilter = numCoeff > 7 ? 1 : 0;
+ if ((isLumaFilter && m_encCfg->getALFStrengthLuma() != 1.0) || (!isLumaFilter && m_encCfg->getALFStrengthChroma() != 1.0))
+#else
if( m_encCfg->getALFStrength() != 1.0 )
+#endif
{
modified = 0;
}
@@ -1878,10 +1883,18 @@ double EncAdaptiveLoopFilter::deriveCoeffQuant( int *filterClipp, int *filterCoe
void EncAdaptiveLoopFilter::roundFiltCoeff( int *filterCoeffQuant, double *filterCoeff, const int numCoeff, const int factor )
{
+#if JVET_U0081
+ bool isLumaFilter = numCoeff > 7 ? 1 : 0;
+ double alfStrength = isLumaFilter ? m_encCfg->getALFStrengthLuma() : m_encCfg->getALFStrengthChroma();
+#endif
for( int i = 0; i < numCoeff; i++ )
{
int sign = filterCoeff[i] > 0 ? 1 : -1;
+#if JVET_U0081
+ filterCoeffQuant[i] = int((filterCoeff[i] * alfStrength) * sign * factor + 0.5) * sign;
+#else
filterCoeffQuant[i] = int((filterCoeff[i] * m_encCfg->getALFStrength()) * sign * factor + 0.5) * sign;
+#endif
}
}
@@ -2263,7 +2276,21 @@ void EncAdaptiveLoopFilter::getBlkStats(AlfCovariance* alfCovariance, const AlfF
const int numBins = AlfNumClippingValues[channel];
int transposeIdx = 0;
int classIdx = 0;
-
+#if JVET_U0081
+ bool isLumaFilter = shape.numCoeff > 7 ? 1 : 0;
+ double filterStrengthTarget = isLumaFilter ? m_encCfg->getALFStrengthTargetLuma() : m_encCfg->getALFStrengthTargetChroma();
+ double filterStrengthTargetE = 1.0;
+ double filterStrengthTargetY = 1.0;
+ if (filterStrengthTarget != 0.0)
+ {
+ filterStrengthTargetY = 1 / filterStrengthTarget;
+ filterStrengthTargetE = filterStrengthTargetY * filterStrengthTargetY;
+ }
+ else
+ {
+ filterStrengthTargetY = 0.0;
+ }
+#endif
for( int i = 0; i < area.height; i++ )
{
int vbDistance = ((areaDst.y + i) % vbCTUHeight) - vbPos;
@@ -2298,11 +2325,19 @@ void EncAdaptiveLoopFilter::getBlkStats(AlfCovariance* alfCovariance, const AlfF
{
if (m_alfWSSD)
{
+#if JVET_U0081
+ alfCovariance[classIdx].E[b0][b1][k][l] += filterStrengthTargetE * weight * (ELocal[k][b0] * (double)ELocal[l][b1]);
+#else
alfCovariance[classIdx].E[b0][b1][k][l] += weight * (ELocal[k][b0] * (double)ELocal[l][b1]);
+#endif
}
else
{
+#if JVET_U0081
+ alfCovariance[classIdx].E[b0][b1][k][l] += filterStrengthTargetE * ELocal[k][b0] * (double)ELocal[l][b1];
+#else
alfCovariance[classIdx].E[b0][b1][k][l] += ELocal[k][b0] * (double)ELocal[l][b1];
+#endif
}
}
}
@@ -2311,11 +2346,19 @@ void EncAdaptiveLoopFilter::getBlkStats(AlfCovariance* alfCovariance, const AlfF
{
if (m_alfWSSD)
{
+#if JVET_U0081
+ alfCovariance[classIdx].y[b][k] += filterStrengthTargetY * weight * (ELocal[k][b] * (double)yLocal);
+#else
alfCovariance[classIdx].y[b][k] += weight * (ELocal[k][b] * (double)yLocal);
+#endif
}
else
{
+#if JVET_U0081
+ alfCovariance[classIdx].y[b][k] += filterStrengthTargetY * ELocal[k][b] * (double)yLocal;
+#else
alfCovariance[classIdx].y[b][k] += ELocal[k][b] * (double)yLocal;
+#endif
}
}
}
@@ -4060,7 +4103,20 @@ void EncAdaptiveLoopFilter::getBlkStatsCcAlf(AlfCovariance &alfCovariance, const
}
Pel ELocal[MAX_NUM_CC_ALF_CHROMA_COEFF][1];
-
+#if JVET_U0081
+ double filterStrengthTarget = m_encCfg->getCCALFStrengthTarget();
+ double filterStrengthTargetE = 1.0;
+ double filterStrengthTargetY = 1.0;
+ if (filterStrengthTarget != 0.0)
+ {
+ filterStrengthTargetY = 1 / filterStrengthTarget;
+ filterStrengthTargetE = filterStrengthTargetY * filterStrengthTargetY;
+ }
+ else
+ {
+ filterStrengthTargetY = 0.0;
+ }
+#endif
for (int i = 0; i < compArea.height; i++)
{
int vbDistance = ((i << getComponentScaleY(compID, m_chromaFormat)) % vbCTUHeight) - vbPos;
@@ -4089,11 +4145,19 @@ void EncAdaptiveLoopFilter::getBlkStatsCcAlf(AlfCovariance &alfCovariance, const
{
if (m_alfWSSD)
{
+#if JVET_U0081
+ alfCovariance.E[b0][b1][k][l] += filterStrengthTargetE * weight * (ELocal[k][b0] * (double)ELocal[l][b1]);
+#else
alfCovariance.E[b0][b1][k][l] += weight * (ELocal[k][b0] * (double)ELocal[l][b1]);
+#endif
}
else
{
+#if JVET_U0081
+ alfCovariance.E[b0][b1][k][l] += filterStrengthTargetE * ELocal[k][b0] * (double)ELocal[l][b1];
+#else
alfCovariance.E[b0][b1][k][l] += ELocal[k][b0] * (double)ELocal[l][b1];
+#endif
}
}
}
@@ -4102,11 +4166,19 @@ void EncAdaptiveLoopFilter::getBlkStatsCcAlf(AlfCovariance &alfCovariance, const
{
if (m_alfWSSD)
{
+#if JVET_U0081
+ alfCovariance.y[b][k] += filterStrengthTargetY * weight * (ELocal[k][b] * (double)yLocal);
+#else
alfCovariance.y[b][k] += weight * (ELocal[k][b] * (double)yLocal);
+#endif
}
else
{
+#if JVET_U0081
+ alfCovariance.y[b][k] += filterStrengthTargetY * ELocal[k][b] * (double)yLocal;
+#else
alfCovariance.y[b][k] += ELocal[k][b] * (double)yLocal;
+#endif
}
}
}
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index 45ffac06c30a36de51c77c4bb386dcf20b0bf1b0..05af5a017c64eb3af8fb8f9dbed275797dc7b7c2 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -737,9 +737,19 @@ protected:
#endif
bool m_alf; ///< Adaptive Loop Filter
+#if JVET_U0081
+ double m_alfStrengthLuma;
+#else
double m_alfStrength;
+#endif
bool m_alfAllowPredefinedFilters;
double m_ccalfStrength;
+#if JVET_U0081
+ double m_alfStrengthChroma;
+ double m_alfStrengthTargetLuma;
+ double m_alfStrengthTargetChroma;
+ double m_ccalfStrengthTarget;
+#endif
bool m_ccalf;
int m_ccalfQpThreshold;
#if JVET_O0756_CALCULATE_HDRMETRICS
@@ -1923,12 +1933,27 @@ public:
#endif
void setUseALF( bool b ) { m_alf = b; }
bool getUseALF() const { return m_alf; }
+#if JVET_U0081
+ void setALFStrengthLuma(double s) { m_alfStrengthLuma = s; }
+ double getALFStrengthLuma() const { return m_alfStrengthLuma; }
+#else
void setALFStrength( double s) { m_alfStrength = s; }
double getALFStrength() const { return m_alfStrength; }
+#endif
void setALFAllowPredefinedFilters(bool b) { m_alfAllowPredefinedFilters = b; }
bool getALFAllowPredefinedFilters() const { return m_alfAllowPredefinedFilters; }
void setCCALFStrength(double s) { m_ccalfStrength = s; }
double getCCALFStrength() const { return m_ccalfStrength; }
+#if JVET_U0081
+ void setALFStrengthChroma(double s) { m_alfStrengthChroma = s; }
+ double getALFStrengthChroma() const { return m_alfStrengthChroma; }
+ void setALFStrengthTargetLuma(double s) { m_alfStrengthTargetLuma = s; }
+ double getALFStrengthTargetLuma() const { return m_alfStrengthTargetLuma; }
+ void setALFStrengthTargetChroma(double s) { m_alfStrengthTargetChroma = s; }
+ double getALFStrengthTargetChroma() const { return m_alfStrengthTargetChroma; }
+ void setCCALFStrengthTarget(double s) { m_ccalfStrengthTarget = s; }
+ double getCCALFStrengthTarget() const { return m_ccalfStrengthTarget; }
+#endif
void setUseCCALF( bool b ) { m_ccalf = b; }
bool getUseCCALF() const { return m_ccalf; }
void setCCALFQpThreshold( int b ) { m_ccalfQpThreshold = b; }