Commit 7fddf5c0 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'ivas_ltv_crash_fix_1' into 'main' 

Updates to fix few LTV test crash issues.

See merge request !160
parents dce0a528 a589ca07

lib_com/tns_base.c

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ Word16 ITF_Detect_ivas_fx( 
        assert(n < (Word16)(sizeof(tmpbuf)/sizeof(Word16)));

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

        {

            tmpbuf[i] = round_fx(L_shl(pSpectrum[iStartLine+i-IGF_START_MN], shift));

            tmpbuf[i] = round_fx_o(L_shl(pSpectrum[iStartLine+i-IGF_START_MN], shift), &Overflow);

        }



        FOR (lag = 0; lag <= maxOrder; lag++)

lib_dec/dec_tcx.c

+10 −5
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ void IMDCT_flt( 
                    Word32 x_fx[L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX];

                    Word16 win_fx[810] = { 0 };

                    Word16 q_x = Q16, q_win, x_e_hdrm;

                    x_e_hdrm = sub(q_x, 13);

                    x_e_hdrm = sub(q_x, 15);

                    q_win = q_x + x_e_hdrm - 16;

                    for ( int k = 0; k < L_ola + L_win; k++ )

                    {
@@ -2125,12 +2125,17 @@ void decoder_tcx_imdct_fx( 


            Word16 s = getScaleFactor32(x_fx, s_max(endLine, shr(L, 1)));

            s = sub(s, 2);

            IF(s <= 0)

            {

                FOR(j = 0; j < s_max(endLine, shr(L, 1)); j++)

                {

                    x_fx[j] = L_shl(x_fx[j], s);

                    move32();

                }

                x_e = sub(x_e, s);

            } ELSE {

                s = 0;

            }



            ITF_Apply_fx( x_fx, startLine, endLine, A_itf_fx, q_a_itf, curr_order );