From 0a27028ba6989f2dd38510b2f10d4e4e709a775e Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Wed, 8 Apr 2026 20:17:46 +0300 Subject: [PATCH] Fix BASOP issue 2514 by fixing the assignment error. --- lib_com/options.h | 1 + lib_rend/ivas_efap_fx.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index e628cf13d..467b0ec10 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -122,6 +122,7 @@ #define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */ #define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */ #define FIX_2495_Q_ALIGN_OSBA_RENDERER /* FhG: Basop issue #2495: Corrected exponent scaling of outAudio.data_fx before buffer accumulation in renderSbaToBinaural(). */ +#define FIX_BASOP_2514_EFAP_PORTING_ERROR /* Nokia: BASOP issue 2514: Fix wrongly ported line */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_rend/ivas_efap_fx.c b/lib_rend/ivas_efap_fx.c index c5bbfb2ea..34d34132a 100644 --- a/lib_rend/ivas_efap_fx.c +++ b/lib_rend/ivas_efap_fx.c @@ -1001,7 +1001,11 @@ static void add_vertex_to_convex_hull_fx( move32(); centroid[1] = Mpy_32_32( centroid[1], tmp32 ); // q27 move32(); +#ifdef FIX_BASOP_2514_EFAP_PORTING_ERROR + centroid[2] = Mpy_32_32( centroid[2], tmp32 ); // q27 +#else centroid[2] = Mpy_32_32( centroid[1], tmp32 ); // q27 +#endif move32(); centroid[0] = L_shl( centroid[0], 4 ); // q31 -- GitLab