Commit f9d17812 authored by multrus's avatar multrus
Browse files

[cleanup] accept ISSUE_1751_replace_shl_ro, ISSUE_1770_replace_shr_ro, ISSUE_1772_replace_shr_o

parent e7898b87

lib_com/deemph_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -197,11 +197,7 @@ void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, W 
    {

        FOR( i = 0; i < L; i++ )

        {

#ifdef ISSUE_1772_replace_shr_o

            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*/

#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*/

#endif

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

            move16();

        }

lib_com/low_rate_band_att_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -97,11 +97,7 @@ void ivas_fine_gain_pred_fx( 


                    /*gp *= 1.0f - 0.05f / accuracy; */

                    tmp = div_s( 13107, accuracy ); /* 0.05 in Q18 */

#ifdef ISSUE_1772_replace_shr_o

                    tmp = shr_sat( tmp, sub( 34, exp ) ); /*15+18-exp+16-15=34-exp */

#else

                    tmp = shr_o( tmp, sub( 34, exp ), &Overflow ); /*15+18-exp+16-15=34-exp */

#endif

                    tmp = sub( 32767, tmp );

                    tmp = s_max( 27554, tmp ); /* Limit attenuation to norm quantizer error, 2^-0.25 in Q15 */

                    gp = mult_r( tmp, gp );    /*15+12+1-16=12 */
@@ -209,11 +205,7 @@ void fine_gain_pred_fx( 


                    /*gp *= 1.0f - 0.05f / accuracy; */

                    tmp = div_s( 13107, accuracy ); /* 0.05 in Q18 */

#ifdef ISSUE_1772_replace_shr_o

                    tmp = shr_sat( tmp, sub( 34, exp ) ); /*15+18-exp+16-15=34-exp */

#else

                    tmp = shr_o( tmp, sub( 34, exp ), &Overflow ); /*15+18-exp+16-15=34-exp */

#endif

                    tmp = sub( 32767, tmp );

                    tmp = s_max( 27554, tmp ); /* Limit attenuation to norm quantizer error, 2^-0.25 in Q15 */

                    gp = mult_r( tmp, gp );    /*15+12+1-16=12 */

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ 


#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */



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

#define ISSUE_1770_replace_shr_ro               /* FhG: replace by non-overflow-alternative - BE */

#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 FIX_ISSUE_1792                          /* FhG: fix noise bursts in binaural rendering */

lib_com/syn_filt_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -188,20 +188,12 @@ void syn_filt_fx( 
    Word16 *yy;

    Word32 s;

    Word16 q;

#ifndef ISSUE_1772_replace_shr_o

    Flag Overflow = 0;

    move16();

#endif

    Word16 a0;



    yy = &buf[0];

    q = add( norm_s( a[0] ), 1 );



#ifdef ISSUE_1772_replace_shr_o

    a0 = shr_sat( a[0], shift ); /* input / 2^shift */

#else

    a0 = shr_o( a[0], shift, &Overflow ); /* input / 2^shift */

#endif



    /*------------------------------------------------------------------*

     * copy initial filter states into synthesis buffer and do synthesis
@@ -379,11 +371,7 @@ void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], W 
     *-----------------------------------------------------------------------*/

    mem += m; /*move16();*/



#ifdef ISSUE_1772_replace_shr_o

    a0 = shr_sat( a[0], shift ); /* input / 2^shift */

#else

    a0 = shr_o( a[0], shift, &Overflow ); /* input / 2^shift */

#endif

    /*-----------------------------------------------------------------------*

     * Do the filtering

     *-----------------------------------------------------------------------*/

lib_com/tools_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -3124,11 +3124,7 @@ void add_vec_fx( 
    {

        FOR( i = 0; i < N; i++ )

        {

#ifdef ISSUE_1770_replace_shr_ro

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

#else

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

#endif

            move16();

        }

    }
@@ -3136,11 +3132,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_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

            move16();

        }

    }