From 56efa7bcad495d7eb0afbee173042813e19b4cf3 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 18 Jun 2026 12:02:30 +0200 Subject: [PATCH 1/2] fix incorrect threshold 0.0 instead of 0.1 --- lib_com/ivas_fb_mixer_fx.c | 5 +++++ lib_com/options.h | 1 + 2 files changed, 6 insertions(+) diff --git a/lib_com/ivas_fb_mixer_fx.c b/lib_com/ivas_fb_mixer_fx.c index 3f1cb29e5..e72668e19 100644 --- a/lib_com/ivas_fb_mixer_fx.c +++ b/lib_com/ivas_fb_mixer_fx.c @@ -1165,7 +1165,12 @@ static Word16 ivas_calculate_abs_fr_fx( FOR( i = 0; i < frame_len; i++ ) { +#ifdef FIX_BASOP_2642_INCORRECT_IF_THRESHOLD + test(); + if ( LT_32(ppFilterbank_FRs_s_fx[i], 419430) ) +#else if ( ppFilterbank_FRs_s_fx[i] < 0 ) +#endif { ppFilterbank_FRs_s_fx[i] = 419430; // 0.1 in Q22 move32(); diff --git a/lib_com/options.h b/lib_com/options.h index 64354c999..cfab97f52 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -96,6 +96,7 @@ #define FIX_FLOAT_1600_OMASA_WRONG_RENDER_PATH /* Nokia: float issue 1600: fix initialization condition of stereo type detection for OMASA */ #define FIX_BASOP_2627_PARAM_MC_ILD_REMAP_EXP /* FhG: BASOP #2627: accumulate 10^(ILD/10) using a dynamic exponent */ #define FIX_BASOP_2635_EFAP_ADD_VERTEX_ELE_ROUND /* FhG: BASOP #2635: round |elevation| with anint_fx before the 90deg subtraction in add_vertex_fx */ +#define FIX_BASOP_2642_INCORRECT_IF_THRESHOLD /* Dolby: BASOP #2642: incorrect threshold 0.0 used instead of 0.1 in if condition */ /* ##################### End NON-BE switches ########################### */ -- GitLab From 975fe5839280fed9dd3757a95f55122f3acf0228 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 18 Jun 2026 12:25:04 +0200 Subject: [PATCH 2/2] clang format --- lib_com/ivas_fb_mixer_fx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_com/ivas_fb_mixer_fx.c b/lib_com/ivas_fb_mixer_fx.c index e72668e19..9d319ecf1 100644 --- a/lib_com/ivas_fb_mixer_fx.c +++ b/lib_com/ivas_fb_mixer_fx.c @@ -1167,10 +1167,10 @@ static Word16 ivas_calculate_abs_fr_fx( { #ifdef FIX_BASOP_2642_INCORRECT_IF_THRESHOLD test(); - if ( LT_32(ppFilterbank_FRs_s_fx[i], 419430) ) -#else + if ( LT_32( ppFilterbank_FRs_s_fx[i], 419430 ) ) +#else if ( ppFilterbank_FRs_s_fx[i] < 0 ) -#endif +#endif { ppFilterbank_FRs_s_fx[i] = 419430; // 0.1 in Q22 move32(); -- GitLab