From 46bed2f6fe10989c6359e55c1c69dc8daa363378 Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Mon, 1 Jun 2026 17:20:04 +0200 Subject: [PATCH 1/2] issue 2613: creating the switch and changing the inconsistent comparison to basop macro --- lib_com/ivas_stereo_td_bit_alloc_fx.c | 6 +++++- lib_com/options.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib_com/ivas_stereo_td_bit_alloc_fx.c b/lib_com/ivas_stereo_td_bit_alloc_fx.c index 799dca4d5..70b85ef14 100644 --- a/lib_com/ivas_stereo_td_bit_alloc_fx.c +++ b/lib_com/ivas_stereo_td_bit_alloc_fx.c @@ -716,7 +716,11 @@ void tdm_SCh_LSF_intra_pred_fx( fixed_beta = 30801; // 0.94f in Q15 move16(); } - ELSE IF( element_brate <= IVAS_24k4 ) +#ifndef FIX_ISSUE_2613_WRONG_COMP_MACRO + ELSE IF(element_brate <= IVAS_24k4) +#else + ELSE IF(LE_32(element_brate, IVAS_24k4)) +#endif // !FIX_ISSUE_2613_WRONG_COMP_MACRO { fixed_beta = 29818; // 0.91f in Q15 move16(); diff --git a/lib_com/options.h b/lib_com/options.h index a1b758cfc..963bc0d2a 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -96,6 +96,7 @@ #define HARMONIZE_2598_tcx_arith_decode_envelope /* FhG: harmonize tcx_arith_decode_envelope between EVS and IVAS versions */ #define HARMONIZE_2598_tcx_arith_encode_envelope /* FhG: harmonize tcx_arith_encode_envelope between EVS and IVAS versions */ #define FIX_ISSUE_2594_FALSE_COMMENT /* FhG: basop issue 2594: fixing false comments about Q value*/ +#define FIX_ISSUE_2613_WRONG_COMP_MACRO /* FhG: basop issue 2613: Inconsistent comparison macros in function tdm_SCh_LSF_intra_pred_fx*/ /* #################### End BE switches ################################## */ -- GitLab From 8bd548c81f381e18f097d948e05e02ed2386bb62 Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Mon, 1 Jun 2026 17:27:34 +0200 Subject: [PATCH 2/2] issue 2613: Clang formatting patch --- lib_com/ivas_stereo_td_bit_alloc_fx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_com/ivas_stereo_td_bit_alloc_fx.c b/lib_com/ivas_stereo_td_bit_alloc_fx.c index 70b85ef14..74f039d0a 100644 --- a/lib_com/ivas_stereo_td_bit_alloc_fx.c +++ b/lib_com/ivas_stereo_td_bit_alloc_fx.c @@ -717,9 +717,9 @@ void tdm_SCh_LSF_intra_pred_fx( move16(); } #ifndef FIX_ISSUE_2613_WRONG_COMP_MACRO - ELSE IF(element_brate <= IVAS_24k4) + ELSE IF( element_brate <= IVAS_24k4 ) #else - ELSE IF(LE_32(element_brate, IVAS_24k4)) + ELSE IF( LE_32( element_brate, IVAS_24k4 ) ) #endif // !FIX_ISSUE_2613_WRONG_COMP_MACRO { fixed_beta = 29818; // 0.91f in Q15 -- GitLab