Commit 4f55bfb6 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

change shr_o -> shr_sat

parent afa29a47

lib_enc/gaus_enc_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -362,7 +362,11 @@ void gauss2v_fx( 
    exp_den = norm_l( Lden );

    Den = extract_h( L_shl( Lden, exp_den ) );



#ifdef ISSUE_1772_replace_shr_o

    delta = shr_sat( div_s( Num, Den ), sub( exp_num, exp_den ) ); /* Q15 */

#else

    delta = shr_o( div_s( Num, Den ), sub( exp_num, exp_den ), &Overflow ); /* Q15 */

#endif

    delta = i_mult2( delta, m_sign );                                       /* Apply sign		Q0*/

    /* index_delta = (short)(FAC_DELTA * fdelta) */

    index_delta = shr( delta, SFAC_DELTA );
@@ -823,7 +827,11 @@ void gauss2v_ivas_fx( 
    exp_den = norm_l( Lden );

    Den = extract_h( L_shl( Lden, exp_den ) );



#ifdef ISSUE_1772_replace_shr_o

    delta = shr_sat( div_s( Num, Den ), sub( exp_num, exp_den ) ); /* Q15 */

#else

    delta = shr_o( div_s( Num, Den ), sub( exp_num, exp_den ), &Overflow ); /* Q15 */

#endif

    delta = i_mult2( delta, m_sign );                                       /* Apply sign */

    /* index_delta = (short)(FAC_DELTA * fdelta) */

    index_delta = shr( delta, SFAC_DELTA );

lib_enc/multi_harm_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -238,7 +238,11 @@ Word16 multi_harm_fx( /* o : frame multi-harmonicity 
                    corxy = shl( corxy, cor );

                    /* cor = corxy * corxy / (corx2 * cory2) */

                    corxy = div_s( corxy, corx2 );

#ifdef ISSUE_1772_replace_shr_o

                    cor = shr_sat( corxy, sub( shl( tmp16, 1 ), Expx2 ) ); /* Q15 */

#else

                    cor = shr_o( corxy, sub( shl( tmp16, 1 ), Expx2 ), &Overflow ); /* Q15 */

#endif

                }

                ELSE

                {
@@ -575,7 +579,11 @@ Word16 multi_harm_ivas_fx( /* o : frame multi-harmoni 
                    corxy = shl( corxy, cor );

                    /* cor = corxy * corxy / (corx2 * cory2) */

                    corxy = div_s( corxy, corx2 );

#ifdef ISSUE_1772_replace_shr_o

                    cor = shr_sat( corxy, sub( shl( tmp16, 1 ), Expx2 ) ); /* Q15 */

#else

                    cor = shr_o( corxy, sub( shl( tmp16, 1 ), Expx2 ), &Overflow ); /* Q15 */

#endif

                }

                ELSE

                {

lib_enc/set_impulse_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -201,7 +201,11 @@ void set_impulse_fx( 
            den = extract_h( L_shl( rr_fx[i], exp_den ) );



            num = div_s( num, den );

#ifdef ISSUE_1772_replace_shr_o

            krit_fx = shr_sat( num, sub( sub( shl_o( exp_num, 1, &Overflow ), exp_den ), 2 ), &Overflow ); /* Q18 */

#else

            krit_fx = shr_o( num, sub( sub( shl_o( exp_num, 1, &Overflow ), exp_den ), 2 ), &Overflow ); /* Q18 */

#endif



            IF( GT_16( krit_fx, krit_max_fx ) )

            {

lib_enc/stat_noise_uv_enc_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -69,7 +69,11 @@ void stat_noise_uv_enc_fx( 
        expd = norm_l( LepsP[1] );

        den = extract_h( L_shl_o( LepsP[1], expd, &Overflow ) );    /*expd-16*/

        num = div_s( num, den );                                    /*expn-expd+15*/

#ifdef ISSUE_1772_replace_shr_o

        num = shr_sat( num, add( sub( expn, expd ), 5 ), &Overflow ); /*Q10*/

#else

        num = shr_o( num, add( sub( expn, expd ), 5 ), &Overflow ); /*Q10*/

#endif

        num = sub( num, 1024 );                                     /*num - 1*/



        test();
@@ -142,7 +146,11 @@ void stat_noise_uv_enc_ivas_fx( 
        expd = norm_l( LepsP[1] );

        den = extract_h( L_shl_o( LepsP[1], expd, &Overflow ) );    /*expd-16*/

        num = div_s( num, den );                                    /*expn-expd+15*/

#ifdef ISSUE_1772_replace_shr_o

        num = shr_sat( num, add( sub( expn, expd ), 5 ) ); /*Q10*/

#else

        num = shr_o( num, add( sub( expn, expd ), 5 ), &Overflow ); /*Q10*/

#endif

        num = sub( num, 1024 );                                     /*num - 1*/



        test();