Commit db917629 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'basop-2514-porting-error-in-efap-function-add_vertex_to_convex_hull_fx' into 'main' 

Resolve "Porting error in EFAP function add_vertex_to_convex_hull_fx"

Closes #2514

See merge request !2930
parents 32c9b48e 5af7a33a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -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 ########################### */

lib_rend/ivas_efap_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -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