Commit 54a3b922 authored by Fabian Bauer's avatar Fabian Bauer Committed by Sandesh Venkatesh
Browse files

replace shr_ro ba shr_r_sat oe more + buildfix

parent 2b64e7a6

lib_com/tools_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -3157,7 +3157,7 @@ void add_vec_fx( 
        FOR( i = 0; i < N; i++ )

        {

#ifdef ISSUE_1770_replace_shr_ro

            y[i] = add_o( shr_r_sat( x1[i], Qyx1 ), shr_ro( x2[i], Qyx2, &Overflow ), &Overflow );

            y[i] = add_o( shr_r_sat( x1[i], Qyx1 ), shr_r_sat( x2[i], Qyx2 ), &Overflow );

#else

            y[i] = add_o( shr_ro( x1[i], Qyx1, &Overflow ), shr_ro( x2[i], Qyx2, &Overflow ), &Overflow );

#endif

lib_enc/find_uv_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static Word16 find_ener_decrease_fx( /* o : maximum 
    wtmp1 = extract_h( L_shl( maxEnr, exp1 ) );

    wtmp1 = div_s( wtmp1, wtmp0 );

#ifdef ISSUE_1770_replace_shr_ro

    dE2 = shr_r_Sat( wtmp1, add( sub( exp1, exp0 ), 15 - 10 ) ); /*Q10*/

    dE2 = shr_r_sat( wtmp1, add( sub( exp1, exp0 ), 15 - 10 ) ); /*Q10*/

#else

    dE2 = shr_ro( wtmp1, add( sub( exp1, exp0 ), 15 - 10 ), &Overflow ); /*Q10*/

#endif