Commit 456ef28c authored by vaillancour's avatar vaillancour
Browse files

Fixes for 32 stv32c_sw_96_1280_32kHz.f06.COD

parent 9c0e6243

lib_com/hq_tools_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -513,7 +513,11 @@ void harm_bwe_fine_fx( 
            norm_signal = norm_l(envelope[i]);

            enve_lo[i] = L_Extract_lc(L_shl(envelope[i], norm_signal), &enve_hi[i]);

            L_signal[i] = Div_32(L_signal[i], enve_hi[i], enve_lo[i]);

#ifdef BASOP_NOGLOB

            SWB_signal[i] = round_fx_sat(L_shl_sat(L_signal[i], norm_signal));

#else

            SWB_signal[i] = round_fx(L_shl(L_signal[i], norm_signal));

#endif

            move16();

            move16();

            move32();
@@ -524,7 +528,11 @@ void harm_bwe_fine_fx( 
            norm_signal = norm_l(envelope[i]);

            enve_lo[i] = L_Extract_lc(L_shl(envelope[i], norm_signal), &enve_hi[i]);

            L_signal[i] = L_negate(Div_32(L_negate(L_signal[i]), enve_hi[i], enve_lo[i]));

#ifdef BASOP_NOGLOB

            SWB_signal[i] = round_fx_sat(L_shl_sat(L_signal[i], norm_signal));

#else

            SWB_signal[i] = round_fx(L_shl(L_signal[i], norm_signal));

#endif

            move16();

            move16();

            move32();

lib_dec/swb_tbe_dec_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -1904,8 +1904,13 @@ void swb_tbe_dec_fx( 
    curr_pow = L_shl(1407374848l/*0.00001f Q47*/, tmp);   /* 2*(Q_bwe_exc) */

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

    {

#ifdef BASOP_NOGLOB

        prev_pow = L_mac0_sat( prev_pow, shaped_shb_excitation[i], shaped_shb_excitation[i] ); /*2*Q_bwe_exc*/

        curr_pow = L_mac0_sat( curr_pow, shaped_shb_excitation[i + L_SHB_LAHEAD + 10], shaped_shb_excitation[i+L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */

#else

        prev_pow = L_mac0( prev_pow, shaped_shb_excitation[i], shaped_shb_excitation[i] ); /*2*Q_bwe_exc*/

        curr_pow = L_mac0( curr_pow, shaped_shb_excitation[i + L_SHB_LAHEAD + 10], shaped_shb_excitation[i+L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */

#endif

    }



    if( GT_16( voice_factors[0], 24576/*0.75f Q15*/ ))