Commit e72e5502 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Updates for crash fix

parent efd5bc35

lib_com/prot.h

+22 −20
Original line number Diff line number Diff line
@@ -2912,6 +2912,7 @@ void a2isf( 
    const float *old_isf,

    const int16_t lpcOrder );





#ifndef NONE_BE_FIX_816_LFE_PLC_FLOAT

void a2rc(

#else
@@ -5351,7 +5352,8 @@ void IMDCT( 
    const int16_t FB_flag,

    Decoder_State *st,

    const int16_t fullband,

    float *acelp_zir );

    float *acelp_zir,

    Word16 lengthh );



void hq_hr_dec(

    Decoder_State *st,                /* i/o: decoder state structure         */

lib_com/tcx_mdct.c

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ void TCX_MDCT_Inverse( 
            y[i] = -32767.0f;

        }

    }



    return;

}

lib_dec/acelp_core_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -893,7 +893,6 @@ ivas_error acelp_core_dec( 
                        syn[i] = -32767.0f;

                    }

                }



                if ( st->hMusicPF != NULL )

                {

                    for ( i = 0; i < DCT_L_POST; i++ )

lib_dec/dec_tcx.c

+9 −9
Original line number Diff line number Diff line
@@ -303,7 +303,8 @@ void IMDCT( 
    const int16_t FB_flag,

    Decoder_State *st,

    const int16_t fullbandScale,

    float *acelp_zir )

    float *acelp_zir,

    Word16 lengthh )

{

    int16_t i, nz, aldo, w, L_win, L_ola;

    float win[( L_FRAME_PLUS + L_MDCT_OVLP_MAX ) / 2];
@@ -663,7 +664,7 @@ void IMDCT( 
            }

        }

    }

    for ( i = 0; i <  L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX; i++ )

    for ( i = 0; i < lengthh; i++ )

    {

        if ( xn_buf[i] > 32767 )

        {
@@ -674,7 +675,6 @@ void IMDCT( 
            xn_buf[i] = -32767.0f;

        }

    }



    return;

}
@@ -1710,7 +1710,7 @@ void decoder_tcx_imdct( 
    {

        IMDCT( xn_bufFB, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf, hTcxCfg->tcx_aldo_window_1_trunc, hTcxCfg->tcx_aldo_window_2,

               hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,

               kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_outLB, 0, st, 0, acelp_zir );

               kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_outLB, 0, st, 0, acelp_zir, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );

    }



    /* Generate additional comfort noise to mask potential coding artefacts */
@@ -1724,19 +1724,19 @@ void decoder_tcx_imdct( 
        mvr2r( x, xn_bufFB, max( L_spec, max( L_frame, L_frameTCX ) ) );



        IMDCT( xn_bufFB, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf, hTcxCfg->tcx_aldo_window_1_trunc, hTcxCfg->tcx_aldo_window_2, hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,

               kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_outLB, 0, st, 0, acelp_zir );

               kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_outLB, 0, st, 0, acelp_zir, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );

    }



    if ( st->element_mode != EVS_MONO )

    {

        IMDCT( x_tmp, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB, hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB,

               hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,

               kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir );

               kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );

    }

    else

    {

        IMDCT( x, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB, hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB, hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,

               kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir );

               kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );

    }



    /* PLC: [TCX: Tonal Concealment] */

lib_dec/hq_core_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -345,13 +345,13 @@ void hq_core_dec( 


        /* LB synthesis */

        IMDCT( t_audio_q, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, wtda_audio, tcx_cfg->tcx_aldo_window_1_trunc, tcx_cfg->tcx_aldo_window_2, tcx_cfg->tcx_mdct_window_half, tcx_cfg->tcx_mdct_window_minimum, tcx_cfg->tcx_mdct_window_trans, tcx_cfg->tcx_mdct_window_half_length, tcx_cfg->tcx_mdct_window_min_length, index,

               MDCT_IV, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, 0, st->bfi, hHQ_core->old_outLB, 0, st, 0, acelp_zir );

               MDCT_IV, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, 0, st->bfi, hHQ_core->old_outLB, 0, st, 0, acelp_zir, 2 * L_FRAME48k );



        mvr2r( wtda_audio + ( overlap >> 1 ) - tcx_offset, output, L_frame_glob );



        /* FB synthesis */

        IMDCT( t_audio_q, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, wtda_audio, tcx_cfg->tcx_aldo_window_1_FB_trunc, tcx_cfg->tcx_aldo_window_2_FB, tcx_cfg->tcx_mdct_window_halfFB, tcx_cfg->tcx_mdct_window_minimumFB, tcx_cfg->tcx_mdct_window_transFB, tcx_cfg->tcx_mdct_window_half_lengthFB, tcx_cfg->tcx_mdct_window_min_lengthFB, index,

               MDCT_IV, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, 0, st->bfi, hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir );

               MDCT_IV, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, 0, st->bfi, hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir, 2 * L_FRAME48k );



        mvr2r( wtda_audio + ( overlapFB >> 1 ) - tcx_offsetFB, synth, L_frameTCX_glob );