Commit 5e6afd91 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISSUE_1816_IMPROVE_MPY_ZERO_DOT_1_PRECISION

parent 2552cc3c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ 
 * lower 16-bit of the product, any upper bits are omitted. Example: Product 0x0100 * 0x0100 results in 0x0001.0000, gets truncated to its lower bits and return 0x0000.

 * The issue is fixed by simply casting one of the product operands to Word32 in lib_com/basop32.c

 */

#define FIX_ISSUE_1816_IMPROVE_MPY_ZERO_DOT_1_PRECISION /* FhG: (NON-BE) improve precision of multiplications with factor 0.1f, avoids overflow with up-rounded value */



#define FIX_ISSUE_1795_Q3_OVERFLOW              /* FhG: Q3 overflow in function WB_BWE_gain_pred_fx (EVS legacy code) BE, MR1855 */

#define NONBE_FIX_1748_SPAR_DIV_OPT                      /*Dlb: issue 1748: SPAR common div optimizations*/

lib_dec/swb_tbe_dec_fx.c

+0 −26
Original line number Diff line number Diff line
@@ -2723,7 +2723,6 @@ void swb_tbe_dec_fx( 
        exp = 0;

        move16();

    }

#ifdef FIX_ISSUE_1816_IMPROVE_MPY_ZERO_DOT_1_PRECISION

    /*

       code for EVS and IVAS are basically identical with the exception of i_mult_sat() which has precision issues

       thus is was replaced for IVAS and kept for EVS, in order to keep EVS BE to test sequences and legacy implementations
@@ -2754,18 +2753,6 @@ void swb_tbe_dec_fx( 
            move16();

        }

    }

#else

    FOR( ; i < L_SHB_LAHEAD + 10; i++ )

    {

        temp = i_mult_sat( sub( i, 19 ), 3277 /*0.1f Q15*/ );        /* Q15 */

        L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), temp ); /* Q31-exp */

        temp = sub( 32767 /*1.0f Q15*/, temp );

        Lscale = L_add( Mult_32_16( Lscale, temp ), L_tmp1 );

        L_tmp = Mult_32_16( Lscale, shaped_shb_excitation[i] );     /* Q_bwe_exc + (31-exp) - 15 */

        shaped_shb_excitation[i] = round_fx( L_shl( L_tmp, exp ) ); /* Q_bwe_exc */

        move16();

    }

#endif



    /* Update SHB excitation */

    Copy( shaped_shb_excitation + L_FRAME16k, hBWE_TD->state_syn_shbexc_fx, L_SHB_LAHEAD ); /* Q_bwe_exc */
@@ -6318,7 +6305,6 @@ void ivas_swb_tbe_dec_fx( 
            exp = 0;

            move16();

        }

#ifdef FIX_ISSUE_1816_IMPROVE_MPY_ZERO_DOT_1_PRECISION

        /*

           code for EVS and IVAS are basically identical with the exception of i_mult_sat() which has precision issues

           thus is was replaced for IVAS and kept for EVS, in order to keep EVS BE to test sequences and legacy implementations
@@ -6349,18 +6335,6 @@ void ivas_swb_tbe_dec_fx( 
                move16();

            }

        }

#else

        FOR( ; i < L_SHB_LAHEAD + 10; i++ )

        {

            temp_fx = i_mult_sat( sub( i, 19 ), 3277 /*0.1f Q15*/ );        /* Q15 */

            L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), temp_fx ); /* Q31-exp */

            temp_fx = sub( 32767 /*1.0f Q15*/, temp_fx );

            Lscale = L_add( Mult_32_16( Lscale, temp_fx ), L_tmp1 );

            L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] );             /* Q_bwe_exc + (31-exp) - 15 */

            shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */

            move16();

        }

#endif

    }

    ELSE

    {

lib_enc/swb_tbe_enc_fx.c

+0 −26
Original line number Diff line number Diff line
@@ -2535,7 +2535,6 @@ void swb_tbe_enc_fx( 
        exp = 0;

        move16();

    }

#ifdef FIX_ISSUE_1816_IMPROVE_MPY_ZERO_DOT_1_PRECISION

    /*

       code for EVS and IVAS are basically identical with the exception of i_mult_sat() which has precision issues

       thus is was replaced for IVAS and kept for EVS, in order to keep EVS BE to test sequences and legacy implementations
@@ -2566,18 +2565,6 @@ void swb_tbe_enc_fx( 
            move16();

        }

    }

#else

    FOR( ; i < L_SHB_LAHEAD + 10; i++ )

    {

        tmp = i_mult_o( sub( i, 19 ), 3277 /*0.1f Q15*/, &Overflow );        /* Q15 */

        L_tmp1 = Mult_32_16( L_shl_o( 1, sub( 31, exp ), &Overflow ), tmp ); /* Q31-exp */

        tmp = sub( 32767 /*1.0f Q15*/, tmp );

        Lscale = L_add( Mult_32_16( Lscale, tmp ), L_tmp1 );

        L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] );                               /* Q_bwe_exc + (31-exp) - 15 */

        shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */

        move16();

    }

#endif



    /* Update SHB excitation */

    Copy( shaped_shb_excitation_fx + L_FRAME16k, hBWE_TD->state_syn_shbexc_fx, L_SHB_LAHEAD ); /* Q_bwe_exc */
@@ -3864,7 +3851,6 @@ void swb_tbe_enc_ivas_fx( 
            exp = 0;

            move16();

        }

#ifdef FIX_ISSUE_1816_IMPROVE_MPY_ZERO_DOT_1_PRECISION

        /*

           code for EVS and IVAS are basically identical with the exception of i_mult_sat() which has precision issues

           thus is was replaced for IVAS and kept for EVS, in order to keep EVS BE to test sequences and legacy implementations
@@ -3895,18 +3881,6 @@ void swb_tbe_enc_ivas_fx( 
                move16();

            }

        }

#else

        FOR( ; i < L_SHB_LAHEAD + 10; i++ )

        {

            tmp = i_mult_o( sub( i, 19 ), 3277 /*0.1f Q15*/, &Overflow );        /* Q15 */

            L_tmp1 = Mult_32_16( L_shl_o( 1, sub( 31, exp ), &Overflow ), tmp ); /* Q31-exp */

            tmp = sub( 32767 /*1.0f Q15*/, tmp );

            L_tmp = L_add( Mult_32_16( Lscale, tmp ), L_tmp1 );

            L_tmp = Mult_32_16( L_tmp, shaped_shb_excitation_fx[i] );                                /* Q_bwe_exc + (31-exp) - 15 */

            shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */

            move16();

        }

#endif

    }

    ELSE

    {