Commit 3fa268c8 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

activated macro and deactivated macro triggered code in critical files... 

activated macro and deactivated macro triggered code in critical files lsf_tools_fx, enc_acelp_fx and lp_exc_e_fx
parent 0a06a75a

lib_com/lsf_tools_fx.c

+4 −5
Original line number Diff line number Diff line
@@ -989,14 +989,13 @@ Word16 E_LPC_f_lsp_pol_get( const Word16 lsp[], Word32 f[], const Word16 n, cons 
    /*b = -2.0f * *plsp;*/

    b = *plsp;

    move16();

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

    m2 = shl_sat( -2, sub( 15, Q_out ) );



    /* There's only 1 integer x to solve -32768 = x * 2^y, if y is an integer : x= -1, y = 15 .

     * y = 15 is possible if Q_out is 0, but x = -1 is impossible, because x is set to -2 .

     * so we can assume a saturated overflow, if -2 * 2^y = -32768 .

    /* There's only 1 integer to solve -32768 = -2 * 2^y, y = 14 .

     * so we can assume a saturated overflow, if -2 * 2^y = -32768 and y is not 14.

     */

    Overflow = ( m2 == MIN_16 ) ? 1 : 0;

    Overflow = ( m2 == MIN_16 && Q_out != 1) ? 1 : 0;

#else

    m2 = shl_o( -2, sub( 15, Q_out ), &Overflow );

#endif

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -114,6 +114,6 @@ 
#define ISSUE_1772_replace_shr_o                /* FhG: replace by non-overflow-alternative - BE */



#define FIX_1735_W_SHL_SAT_L                    /* FhG: Usage of W_shl_sat_l() */

//#define ISSUE_1796_replace_shl_o               /*FhG: replace shl_ro by overflow-free alternatives*/

#define ISSUE_1796_replace_shl_o               /*FhG: replace shl_ro by overflow-free alternatives*/



#endif

lib_enc/enc_acelp_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ Word16 E_ACELP_xy1_corr_fx( Word16 xn[] /*Q15-exp_xn*/, Word16 y1[] /*Q15-exp_xn 
    i = add( exp_xy, 1 - 1 ); /* -1 -> gain in Q14 */

    i = sub( i, exp_yy );

    BASOP_SATURATE_WARNING_OFF_EVS

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

    gain = shl_sat( gain, i ); /* saturation can occur here */



    /* There's only 1 integer x to solve 32767 = x * 2^y, if y is an integer : x= 32767 and y = 0 .

lib_enc/lp_exc_e_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ Word16 corr_xy1_fx( /* o : pitch gain (0..GAIN_PIT_MAX) 
        xy = shr( xy, 1 );      /* be sure that xy < yy */

        gain = div_s( xy, yy ); // Q15

        i = sub( exp_xy, exp_yy );

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1796_replace_shl_o_

        gain = shl_sat( gain, i ); /* saturation can occur here */



        /*