Commit 60c14880 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

cleanup whitespace diffs - synchronize else paths with origin code (intentionally only whitespaces)

parent ca2ea0b7

lib_com/deemph_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, W 
            L_tmp = L_msu_sat( Mpy_32_16_1( L_tmp, mu ), shr_sat( x[i], shift ), -32768 /*1.0f in Q15*/ ); /*Qx-shift+16*/

            x[i] = round_fx_sat( L_tmp );                                                                  /*Qx-shift*/

#else

            L_tmp = L_msu_o( Mpy_32_16_1( L_tmp, mu ), shr_o( x[i], shift, &Overflow ), -32768 /*1.0f in Q15*/, &Overflow ); /*Qx-shift+16*/

            L_tmp = L_msu_o( Mpy_32_16_1( L_tmp, mu ), shr_sat( x[i], shift ), -32768 /*1.0f in Q15*/, &Overflow ); /*Qx-shift+16*/

            x[i] = round_fx_o( L_tmp, &Overflow );                                                                  /*Qx-shift*/

#endif

            move16();

lib_com/gs_gains_fx.c

+9 −9
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ void Comp_and_apply_gain_ivas_fx( 
#ifdef ISSUE_1836_replace_overflow_libcom

            Ener_per_bd_yQ[i_band] = shl_sat( y_gain, sub( exp1, 13 ) ); /*Q13*/

#else

            Ener_per_bd_yQ[i_band] = shl_o( y_gain, sub( exp1, 13 ), &Overflow ); /*Q13*/   //??sat

            Ener_per_bd_yQ[i_band] = shl_o( y_gain, sub( exp1, 13 ), &Overflow ); /*Q13*/

#endif

            move16(); /*Q1     */

            tmp_exp = add( add( exp1, 1 ), sub( *Q_exc, Qexc_diff ) );

lib_com/hp50_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ static void filter_2nd_order( 
#endif



    BASOP_SATURATE_WARNING_ON_EVS



    BASOP_SATURATE_ERROR_ON_EVS

    L_sum = HP50_Mpy_32_32_fix( b2, mem[3] );                   /* b2*x2 */

    L_sum = L_add( L_sum, HP50_Mode2_Mpy_32_16_fix( b1, x2 ) ); /* b1*x1 */

lib_com/hq2_noise_inject_fx.c

+10 −11
Original line number Diff line number Diff line
@@ -665,7 +665,6 @@ void hq2_noise_inject_fx( 
                    tmp = extract_h( L_shl_sat( L_tmp, add( 1, Q_speech ) ) ); /*Q12 */ //??sat

#else

                    tmp = extract_h( L_shl_o( L_tmp, add( 1, Q_speech ), &Overflow ) ); /*Q12 */

#endif

                    tmp = sub( fac_fx, tmp );                                           /*Q12 */

                    L_tmp = Mult_32_16( ni_gain_fx[k], tmp );                           /*Q(17+12-15=14) */

                    L_y2[i] = L_add( L_y2[i], L_shr( Mult_32_16( L_tmp, rand_fx ), 2 ) );

lib_com/igf_base_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1120,9 +1120,9 @@ void IGFCommonFuncsCalcSfbEnergyPowerSpec( const Word16 startSfb, /**< in 


#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();

    Flag Carry = 0;

    move16();

    move16();

#endif



    FOR( sfb = startSfb; sfb < stopSfb; sfb++ )