Commit a89284a2 authored by Manuel Jander's avatar Manuel Jander
Browse files

Fix EVS regression.

parent b0ea84a8

lib_enc/swb_pre_proc_fx.c

+10 −5
Original line number Diff line number Diff line
@@ -308,7 +308,10 @@ void wb_pre_proc_ivas_fx( 
    }



#ifdef NONBE_FIX_ISSUE_2206

    IF ( st_fx->element_mode != EVS_MONO ) {

        /* In case of EVS, hBWE_FD->old_input_wb_fx might saturate furher below. */

        Q_wb_sp = s_min( Q_wb_sp, sub( norm_arr( hBWE_FD->old_input_wb_fx, NS2SA( 16000, DELAY_FD_BWE_ENC_NS ) ), sub( new_inp_resamp16k_q, -1 ) ) );

    }

#endif



    Copy_Scale_sig( new_inp_resamp16k, temp_buf, L_FRAME16k, Q_wb_sp );
@@ -547,7 +550,7 @@ void wb_pre_proc_ivas_fx( 


#ifdef NONBE_FIX_ISSUE_2206

        Copy_Scale_sig_nosat( new_inp_resamp16k, &old_input[Sample_Delay_WB_BWE], L_FRAME16k, sub( Q_wb_sp, new_inp_resamp16k_q ) );

        Copy_Scale_sig_nosat( hBWE_FD->old_input_wb_fx, old_input, Sample_Delay_WB_BWE, sub( Q_wb_sp, -1 ) );

        Copy_Scale_sig( hBWE_FD->old_input_wb_fx, old_input, Sample_Delay_WB_BWE, sub( Q_wb_sp, -1 ) );

        Copy_Scale_sig_nosat( new_inp_resamp16k + L_FRAME16k - Sample_Delay_WB_BWE, hBWE_FD->old_input_wb_fx, Sample_Delay_WB_BWE, sub( -1, new_inp_resamp16k_q ) );

#else

        Copy( new_inp_resamp16k, &old_input[Sample_Delay_WB_BWE], L_FRAME16k );
@@ -560,16 +563,18 @@ void wb_pre_proc_ivas_fx( 
            Copy( old_input, hBWE_FD->L_old_wtda_swb_fx, L_FRAME16k );

#ifdef NONBE_FIX_ISSUE_2206

            set16_zero_fx( hBWE_FD->L_old_wtda_swb_fx + L_FRAME16k, L_FRAME48k - L_FRAME16k );

            st_fx->Q_old_wtda = Q_wb_sp;

#else

#endif

#ifdef HARMONIZE_TBE2

            if ( st_fx->element_mode != EVS_MONO )

#endif

            {

#ifdef NONBE_FIX_ISSUE_2206

                st_fx->Q_old_wtda = Q_wb_sp;

#else

                st_fx->Q_old_wtda = -Q1;

#endif

                move16();

            }

#endif

        }

    }