From 72f06e66bd3ea78f98fdfb82ca1c7ae0b3753049 Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Thu, 16 Apr 2026 10:28:38 +0200 Subject: [PATCH 1/4] Issue 2532: adding the switch --- lib_com/options.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib_com/options.h b/lib_com/options.h index 5f27f69da..2dfcb4953 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -97,6 +97,7 @@ #define FIX_BASOP_2509_EVS_CONCEAL_UNINIT_MEM /* FhG: BASOP 2509: st->hTcxCfg->psychParamsCurrent is not initialized */ #define HARMONIZE_2499_CONFIGUREFDCNGDEC /* FhG: basop issue 2499: harmonoize configureFdCngDec */ #define FIX_BASOP_2530_IVAS_DECISION_MAT /* VA: Fix ambiguous usage of extract_l() */ +#define FIX_BASOP_2532_cx_e /* FhG: Fix issue 2532 about additional exponent variable*/ /* #################### End BE switches ################################## */ -- GitLab From b1f7553b7f2036d5b41260eebc527b1946dc3b88 Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Thu, 16 Apr 2026 11:09:15 +0200 Subject: [PATCH 2/4] Issue 2532: replacing the cx_e with cx_next_band_e to see how the pipeline reacts --- lib_dec/ivas_mc_param_dec_fx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib_dec/ivas_mc_param_dec_fx.c b/lib_dec/ivas_mc_param_dec_fx.c index a11feddf1..c567d20c5 100644 --- a/lib_dec/ivas_mc_param_dec_fx.c +++ b/lib_dec/ivas_mc_param_dec_fx.c @@ -1815,7 +1815,11 @@ void ivas_param_mc_dec_prepare_renderer( Scale_sig32( cx_fx, len, -Q1 ); // add one bit head room Scale_sig32( cx_next_band_fx, len, -Q1 ); // add one bit head room cx_e = add( cx_e, Q1 ); - cx_next_band_e = add( cx_e, Q1 ); +#ifndef FIX_BASOP_2532_cx_e + cx_next_band_e = add(cx_e, Q1); +#else + cx_next_band_e = add(cx_next_band_e, Q1); +#endif // !FIX_BASOP_2532_cx_e } v_add_fx( cx_fx, cx_next_band_fx, cx_fx, len ); Copy32( cx_fx, cx_next_band_fx, len ); -- GitLab From 4de44cd8a29eaf434b1d0f0405662a4d7b0a9b2f Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Thu, 16 Apr 2026 14:04:31 +0200 Subject: [PATCH 3/4] Issue 2532: clang formatting patch --- lib_dec/ivas_mc_param_dec_fx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_dec/ivas_mc_param_dec_fx.c b/lib_dec/ivas_mc_param_dec_fx.c index c567d20c5..98c87df50 100644 --- a/lib_dec/ivas_mc_param_dec_fx.c +++ b/lib_dec/ivas_mc_param_dec_fx.c @@ -1816,9 +1816,9 @@ void ivas_param_mc_dec_prepare_renderer( Scale_sig32( cx_next_band_fx, len, -Q1 ); // add one bit head room cx_e = add( cx_e, Q1 ); #ifndef FIX_BASOP_2532_cx_e - cx_next_band_e = add(cx_e, Q1); + cx_next_band_e = add( cx_e, Q1 ); #else - cx_next_band_e = add(cx_next_band_e, Q1); + cx_next_band_e = add( cx_next_band_e, Q1 ); #endif // !FIX_BASOP_2532_cx_e } v_add_fx( cx_fx, cx_next_band_fx, cx_fx, len ); -- GitLab From 4497e9b01f0ab12fa9eca603ab615e4c6e948237 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Fri, 17 Apr 2026 17:47:37 +0200 Subject: [PATCH 4/4] make patch fully consistent; expected to be BE --- lib_dec/ivas_mc_param_dec_fx.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib_dec/ivas_mc_param_dec_fx.c b/lib_dec/ivas_mc_param_dec_fx.c index 98c87df50..2ea6e2518 100644 --- a/lib_dec/ivas_mc_param_dec_fx.c +++ b/lib_dec/ivas_mc_param_dec_fx.c @@ -1801,6 +1801,10 @@ void ivas_param_mc_dec_prepare_renderer( } } cx_e = max_e; +#ifdef FIX_BASOP_2532_cx_e + cx_next_band_e = max_e; + move16(); +#endif move16(); /* we have to do it similar to the encoder in case of attacks (i.e. accumulate two bands) to ensure correct DMX of the target covariance*/ @@ -1838,7 +1842,11 @@ void ivas_param_mc_dec_prepare_renderer( IF( is_next_band ) { +#ifndef FIX_BASOP_2532_cx_e + ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_next_band_fx, cx_next_band_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov ); +#else ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_next_band_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov ); +#endif } ELSE { -- GitLab