Commit 51ebf72b authored by JÜRGEN Gerstacker's avatar JÜRGEN Gerstacker
Browse files

issue _1965_ fix

parent 025094a2

lib_enc/enc_acelp_fx.c

+10 −6
Original line number Diff line number Diff line
@@ -1946,7 +1946,7 @@ static void E_ACELP_codearithp_fx( const Word16 v[] /*Q9*/, UWord32 *n /*Q0*/, U 
#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

    UWord32 s;

#else

    UWord64 s;

    UWord64 W_s;

#endif

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
@@ -1981,7 +1981,7 @@ static void E_ACELP_codearithp_fx( const Word16 v[] /*Q9*/, UWord32 *n /*Q0*/, U 
#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

    s = L_deposit_l( 0 );

#else

    s = 0;

    W_s = 0;

#endif

    t = 0;

    move16();
@@ -2002,7 +2002,7 @@ static void E_ACELP_codearithp_fx( const Word16 v[] /*Q9*/, UWord32 *n /*Q0*/, U 
#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

            s = L_add_co( s, pulsestostates[pos[k]][t], &Carry, &Overflow );

#else

            s = W_add( s, pulsestostates[pos[k]][t] );

            W_s = W_add( W_s, pulsestostates[pos[k]][t] );

#endif

            t = add( t, 1 );

            if ( sub( t, NPMAXPT ) > 0 )
@@ -2021,14 +2021,14 @@ static void E_ACELP_codearithp_fx( const Word16 v[] /*Q9*/, UWord32 *n /*Q0*/, U 
#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

        s = L_lshl( s, 1 );

#else

        s = W_lshl( s, 1 );

        W_s = W_lshl( W_s, 1 );

#endif

        if ( sign < 0 )

        {

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

            s = L_add_co( s, 1, &Carry, &Overflow );

#else

            s = W_add( s, 1 );

            W_s = W_add( W_s, 1 );

#endif

        }
@@ -2040,12 +2040,16 @@ static void E_ACELP_codearithp_fx( const Word16 v[] /*Q9*/, UWord32 *n /*Q0*/, U 
#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

        s = L_add_co( s, pulsestostates[pos[k]][t], &Carry, &Overflow );

#else

        s = W_add( s, pulsestostates[pos[k]][t] );

        W_s = W_add( W_s, pulsestostates[pos[k]][t] );

#endif

        t = add( t, 1 );

    }



#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

    *ps = s; /*Q0*/

#else

    *ps = (UWord32)W_s; /*Q0*/

#endif

    move32();

    *n = L_deposit_l( 0 );

    if ( nb_pulse )