From 6df5a327e2b52bf6c6976aacc115701cf6a4fc10 Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Thu, 7 May 2026 12:44:08 +0200 Subject: [PATCH 1/2] issue 2579: Creating the switch and making the necessary change: correcting value of the variable corrLagMax according to floating point counterpart --- lib_com/options.h | 1 + lib_enc/ivas_stereo_ica_enc_fx.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 5390fd919..42bece453 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -106,6 +106,7 @@ #define HARMONIZE_2539_cng_energy /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */ #define FIX_1585_ASAN_FORMAT_SW_ALT /* VA: float issue 1585: alternative fix memory leaks with format switching */ #define FIX_BASOP_2573_RF_MODE_UPDATE /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */ +#define FIX_ISSUE_2579_CORRLAGMAX /* FhG: BASOP issue 2579: Non matching variable found in function unclr_calc_corr_features_fx()*/ /* #################### End BE switches ################################## */ diff --git a/lib_enc/ivas_stereo_ica_enc_fx.c b/lib_enc/ivas_stereo_ica_enc_fx.c index 234652072..cd53d3966 100644 --- a/lib_enc/ivas_stereo_ica_enc_fx.c +++ b/lib_enc/ivas_stereo_ica_enc_fx.c @@ -2314,7 +2314,12 @@ static void unclr_calc_corr_features_fx( move32(); /* L/R correlation values (zero lag, maximum) */ - corrLagMax = maximum_l( corrEst, sub( lagSearchRange[1], add( lagSearchRange[0], 1 ) ), &corrEstMax ); +#ifndef FIX_ISSUE_2579_CORRLAGMAX + corrLagMax = maximum_l(corrEst, sub(lagSearchRange[1], add(lagSearchRange[0], 1)), &corrEstMax); +#else + corrLagMax = maximum_l(corrEst, sub( add(lagSearchRange[1], 1), lagSearchRange[0]), &corrEstMax); +#endif // !FIX_ISSUE_2579_CORRLAGMAX + d_corrLagMax = sub( corrLagMax, hStereoClassif->unclr_corrLagMax_prev ); hStereoClassif->unclr_fv_fx[E_d_corrLagMax] = L_shl( d_corrLagMax, 15 ); -- GitLab From 3f39521958b8c09c144e7ae321d4e5a8d1f6c518 Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Thu, 7 May 2026 13:07:29 +0200 Subject: [PATCH 2/2] issue 2579: Clang formatting patch --- lib_enc/ivas_stereo_ica_enc_fx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_enc/ivas_stereo_ica_enc_fx.c b/lib_enc/ivas_stereo_ica_enc_fx.c index cd53d3966..8940a78b4 100644 --- a/lib_enc/ivas_stereo_ica_enc_fx.c +++ b/lib_enc/ivas_stereo_ica_enc_fx.c @@ -2315,9 +2315,9 @@ static void unclr_calc_corr_features_fx( /* L/R correlation values (zero lag, maximum) */ #ifndef FIX_ISSUE_2579_CORRLAGMAX - corrLagMax = maximum_l(corrEst, sub(lagSearchRange[1], add(lagSearchRange[0], 1)), &corrEstMax); + corrLagMax = maximum_l( corrEst, sub( lagSearchRange[1], add( lagSearchRange[0], 1 ) ), &corrEstMax ); #else - corrLagMax = maximum_l(corrEst, sub( add(lagSearchRange[1], 1), lagSearchRange[0]), &corrEstMax); + corrLagMax = maximum_l( corrEst, sub( add( lagSearchRange[1], 1 ), lagSearchRange[0] ), &corrEstMax ); #endif // !FIX_ISSUE_2579_CORRLAGMAX d_corrLagMax = sub( corrLagMax, hStereoClassif->unclr_corrLagMax_prev ); -- GitLab