From 965c7b46ecf8e2d13b16dce6d76b8e644aa21e2a Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Thu, 16 Apr 2026 10:06:28 +0200 Subject: [PATCH 1/3] Issue 2533: Adding 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..9a681e2f7 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_ISSUE_2533_EXTRA_CONDITION /* FhG: Fix issue basop 2533 removing the extra condition*/ /* #################### End BE switches ################################## */ -- GitLab From 82ba33f3a7021be0a8b310811bae2d119f85281d Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Thu, 16 Apr 2026 10:12:15 +0200 Subject: [PATCH 2/3] Issue 2533: changes to investigate function behaviour --- lib_dec/ivas_mc_param_dec_fx.c | 15 ++++++++++++++- 1 file changed, 14 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..e1f16d275 100644 --- a/lib_dec/ivas_mc_param_dec_fx.c +++ b/lib_dec/ivas_mc_param_dec_fx.c @@ -1828,7 +1828,7 @@ void ivas_param_mc_dec_prepare_renderer( { CONTINUE; } - +#ifndef FIX_ISSUE_2533_EXTRA_CONDITION IF( NE_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) ) { IF( is_next_band ) @@ -1842,6 +1842,19 @@ void ivas_param_mc_dec_prepare_renderer( ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_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 ); } } +#else + IF(is_next_band) + { + + 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); + } + ELSE + { + + ivas_param_mc_get_mixing_matrices_fx(hParamMC, hSynthesisOutputSetup, cx_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 + } } -- GitLab From e41c7f25fd3e6196da5535449fb1013b571858e1 Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Thu, 16 Apr 2026 10:32:05 +0200 Subject: [PATCH 3/3] Issue 2533: clang formatting patch --- lib_dec/ivas_mc_param_dec_fx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib_dec/ivas_mc_param_dec_fx.c b/lib_dec/ivas_mc_param_dec_fx.c index e1f16d275..44f5dbacd 100644 --- a/lib_dec/ivas_mc_param_dec_fx.c +++ b/lib_dec/ivas_mc_param_dec_fx.c @@ -1843,18 +1843,17 @@ void ivas_param_mc_dec_prepare_renderer( } } #else - IF(is_next_band) + IF( is_next_band ) { - 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); + 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 ); } ELSE { - ivas_param_mc_get_mixing_matrices_fx(hParamMC, hSynthesisOutputSetup, cx_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); + ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_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 - } } -- GitLab