Commit f66bba2c authored by Anjaneyulu Sana's avatar Anjaneyulu Sana
Browse files

Merge branch '3gpp_issue_1459_fix' into 'main' 

Fix for 3GPP issue 1459: Complexity measurement crashes: ISM+ encoder

See merge request !1381
parents a584f6ee 8a2459dc

lib_enc/ivas_core_pre_proc_front_fx.c

+0 −15
Original line number Diff line number Diff line
@@ -1226,9 +1226,6 @@ ivas_error pre_proc_front_ivas_fx( 
    st->mem_wsp_q = *Q_new;

    move16();

    move16();

    scale_sig( old_wsp_fx, L_WSP_MEM, sub( *Q_new, *q_old_wsp ) );

    *q_old_wsp = *Q_new;

    move16();



    ivas_find_wsp_fx( L_FRAME, L_SUBFR, NB_SUBFR, A_fx, Aw_fx, inp_12k8_fx, TILT_FAC_FX, wsp_fx, &st->mem_wsp_fx, GAMMA1, L_LOOK_12k8 );
@@ -1244,18 +1241,6 @@ ivas_error pre_proc_front_ivas_fx( 


    Word16 shift1 = norm_arr( old_wsp_fx, L_WSP_MEM );

    Word16 shift2 = norm_arr( wsp_fx, L_WSP - L_WSP_MEM );

    maximum_abs_16_fx( old_wsp_fx, L_WSP_MEM, &shift );

    if ( !shift )

    {

        shift1 = Q15;

        move16();

    }

    maximum_abs_16_fx( wsp_fx, L_WSP - L_WSP_MEM, &shift );

    if ( !shift )

    {

        shift2 = Q15;

        move16();

    }

    shift = s_min( add( *q_old_wsp, shift1 ), add( Q_wsp, shift2 ) );

    shift = s_min( shift, add( norm_arr( st->mem_decim2_fx, 3 ), st->Q_old_wsp2 ) );

    shift = s_min( shift, add( norm_arr( st->old_wsp2_fx, ( L_WSP_MEM - L_INTERPOL ) / OPL_DECIM ), st->Q_old_wsp2 ) );