Commit 3f263d12 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'bug_fix_tcx_ltp_enc_swb_tbe_enc' into 'main' 

Bug fix in tcx_ltp_enc and swb_tbe_enc [allow regression]

See merge request !1335
parents 040c725b 690a6fe1

lib_enc/swb_tbe_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -3835,8 +3835,8 @@ void swb_tbe_enc_ivas_fx( 
            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 */

            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();

        }

lib_enc/tcx_ltp_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -931,9 +931,9 @@ void tcx_ltp_encode_ivas_fx( 
    {

        hTcxEnc->tcxltp_pitch_int_past = L_frame;

        move16();

        hTcxEnc->tcxltp_pitch_int_past = 0;

        hTcxEnc->tcxltp_pitch_fr_past = 0;

        move16();

        hTcxEnc->tcxltp_pitch_int_past = 0;

        hTcxEnc->tcxltp_gain_past = 0;

        move16();

    }