From 36b1eca4d0924b9c463f20f5c8f0c1ac6cb63f4a Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Mon, 4 May 2026 15:14:06 +0200 Subject: [PATCH 1/3] issue 2574: creating switch and making necessary changes --- lib_com/ivas_stereo_ica_com_fx.c | 7 +++++-- lib_com/options.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib_com/ivas_stereo_ica_com_fx.c b/lib_com/ivas_stereo_ica_com_fx.c index 705c1756d..e27fdc703 100644 --- a/lib_com/ivas_stereo_ica_com_fx.c +++ b/lib_com/ivas_stereo_ica_com_fx.c @@ -418,8 +418,11 @@ void adjustTargetSignal_fx( const Word16 method ) // Q0 { /* inter-frame shift variation and target shifting */ - - IF( method == 0 ) +#ifndef FIX_2574_EQUI_CONDITION + IF(method == 0) +#else + IF(EQ_16(method, 16)) +#endif // !FIX_2574_EQUI_CONDITION { interpTargetChannel_fx( target_fx, prevShift, currShift, L_shift_adapt ); } diff --git a/lib_com/options.h b/lib_com/options.h index 9ce33d497..0fb2591d3 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -105,6 +105,7 @@ #define FIX_BASOP_2560_STEREO_DFT_DEC_RESET /* FhG: BASOP issue 2560: align reset of hStereoDft->res_gains_ind_fx[][] between BASOP and float */ #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_2574_EQUI_CONDITION /* FhG: BASOP issue 2574: Correction of equivalnecy condition to basic operation in function adjustTargetSignal_fx()*/ /* #################### End BE switches ################################## */ -- GitLab From 671e3828ea53015caad417b9aa56ee9524db8963 Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Mon, 4 May 2026 16:10:45 +0200 Subject: [PATCH 2/3] issue 2574: Clang formatting patch --- lib_com/ivas_stereo_ica_com_fx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_com/ivas_stereo_ica_com_fx.c b/lib_com/ivas_stereo_ica_com_fx.c index e27fdc703..3ba0263fc 100644 --- a/lib_com/ivas_stereo_ica_com_fx.c +++ b/lib_com/ivas_stereo_ica_com_fx.c @@ -419,9 +419,9 @@ void adjustTargetSignal_fx( { /* inter-frame shift variation and target shifting */ #ifndef FIX_2574_EQUI_CONDITION - IF(method == 0) + IF( method == 0 ) #else - IF(EQ_16(method, 16)) + IF( EQ_16( method, 16 ) ) #endif // !FIX_2574_EQUI_CONDITION { interpTargetChannel_fx( target_fx, prevShift, currShift, L_shift_adapt ); -- GitLab From e84c6c5c341056e3592ac49d5bf95858ac3c6f1d Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Mon, 4 May 2026 17:36:47 +0200 Subject: [PATCH 3/3] issue 2574: fixing accidental typo --- lib_com/ivas_stereo_ica_com_fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/ivas_stereo_ica_com_fx.c b/lib_com/ivas_stereo_ica_com_fx.c index 3ba0263fc..79a7025fb 100644 --- a/lib_com/ivas_stereo_ica_com_fx.c +++ b/lib_com/ivas_stereo_ica_com_fx.c @@ -421,7 +421,7 @@ void adjustTargetSignal_fx( #ifndef FIX_2574_EQUI_CONDITION IF( method == 0 ) #else - IF( EQ_16( method, 16 ) ) + IF( EQ_16( method, 0 ) ) #endif // !FIX_2574_EQUI_CONDITION { interpTargetChannel_fx( target_fx, prevShift, currShift, L_shift_adapt ); -- GitLab