diff --git a/lib_com/options.h b/lib_com/options.h index bba060fc89079e7e784c185b1780bafbbef1bad6..da572db15f2fe868f61f47891b104bea814ffdef 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -127,6 +127,7 @@ #define FIX_BASOP_2511_PROTO_REF_POWER_FIX /* FhG: BASOP 2511; Fix reference power computation in protoSignalComputation_shd_fx() */ #define FIX_BASOP_2512_WRONG_SHIFT_IN_DIRAC_CONFIG /* Nokia: BASOP 2512: Fix wrong division by shift */ #define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN /* Nokia: BASOP issue 2513: Removes extra return block */ +#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 c5bbfb2ea3e5d6cbf55b4c2566eb2e9e58da93b1..34d34132a8290e22d1cc5baee544ac386b8fcc9b 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