Commit 118b27df authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2363_FIND_WSP

parent 25267769

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_2363_FIND_WSP                               /* VA: basop issue 2363 : harmonizing find_wsp function */

#define FIX_2370_UNUSED_BUFFERS_CORE_ENC                /* VA: basop issue 2370: remove temporary input buffers in core-encoder  */

#define FIX_2376_FIX_USAN_PRE_PROC                      /* VA: basop issue 2376: Resolve "USAN: SEGV in ivas_compute_core_buffers_fx() */

#define FIX_2367_REMOVE_CODE_ICBWE                      /* VA: basop issue 2367: Remove IC-BWE obsolete code  */

lib_com/prot_fx.h

+0 −15
Original line number Diff line number Diff line
@@ -10910,21 +10910,6 @@ void bands_and_bit_alloc_ivas_fx( 
    const Word16 element_mode,     /* i  : element mode                                          */

    const Word16 GSC_IVAS_mode     /* i  : GSC IVAS mode                                         */

);

#ifndef FIX_2363_FIND_WSP

void ivas_find_wsp_fx(

    const Word16 L_frame,    /* i  : length of the frame                   Q0*/

    const Word16 L_subfr,    /* i  : length of subframe                    Q0*/

    const Word16 nb_subfr,   /* i  : number of subframes                   Q0*/

    const Word16 *A_fx,      /* i  : A(z) filter coefficients               Q12 */

    Word16 *Aw_fx,           /* o  : weighted A(z) filter coefficients      Q12 */

    const Word16 *speech_fx, /* i  : pointer to the denoised speech frame   Q_new */

    const Word16 tilt_fact,  /* i  : tilt factor                            Q15 */

    Word16 *wsp_fx,          /* o  : poitnter to the weighted speech frame  Q_new */

    Word16 *mem_wsp_fx,      /* i/o: W(Z) denominator memory                Q_new */

    const Word16 gamma,      /* i  : weighting factor                       Q15 */

    const Word16 L_look      /* i  : look-ahead                            Q0*/

);

#endif















Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(















    Word16 *x,           /* Q0 */

























lib_enc/find_wsp_fx.c



+0
−58




























Original line number
Diff line number
Diff line








@@ -77,61 +77,3 @@ void find_wsp_fx(













        deemph_fx( &wsp[L_frame], preemph_fac, lookahead, &wtmp );















    }















}












#ifndef FIX_2363_FIND_WSP













/*-------------------------------------------------------------------*













 * ivas_find_wsp_fx()













 *













 * Compute weighted speech used in open-loop pitch search













 *-------------------------------------------------------------------*/













void ivas_find_wsp_fx(













    const Word16 L_frame,  /* i  : length of the frame                   Q0*/













    const Word16 L_subfr,  /* i  : length of subframe                    Q0*/













    const Word16 nb_subfr, /* i  : number of subframes                   Q0*/













    const Word16 *A_fx,













    /* i  : A(z) filter coefficients              */ // Q12













    Word16 *Aw_fx,













    /* o  : weighted A(z) filter coefficients     */ // Q12













    const Word16 *speech_fx,













    /* i  : pointer to the denoised speech frame  */ // Q_new













    const Word16 tilt_fact,













    /* i  : tilt factor                           */ // Q15













    Word16 *wsp_fx,













    /* o  : poitnter to the weighted speech frame */ // Q_new













    Word16 *mem_wsp_fx,













    /* i/o: W(Z) denominator memory               */ // Q_new













    const Word16 gamma,













    /* i  : weighting factor                      */ // Q15













    const Word16 L_look                              /* i  : look-ahead                            Q0*/













)













{













    Word16 *p_Aw_fx, tmp_fx;













    Word16 i_subfr;









































    /*-----------------------------------------------------------------*













     *  Compute weighted A(z) unquantized for subframes













     *-----------------------------------------------------------------*/













    weight_a_subfr_fx( nb_subfr, A_fx, Aw_fx, gamma, M );



























    /*-----------------------------------------------------------------*













     *  Compute weighted speech for all subframes













     *-----------------------------------------------------------------*/













    p_Aw_fx = Aw_fx;













    FOR( i_subfr = 0; i_subfr < L_frame; i_subfr += L_subfr )













    {













        Residu3_fx( p_Aw_fx, &speech_fx[i_subfr], &wsp_fx[i_subfr], L_subfr, 0 );













        p_Aw_fx += ( M + 1 );













    }













    p_Aw_fx -= ( M + 1 );



























    /*-----------------------------------------------------------------*













     *  Weighted speech computation is extended on look-ahead













     *-----------------------------------------------------------------*/



























    deemph_fx( wsp_fx, tilt_fact, L_frame, mem_wsp_fx );













    Residu3_fx( p_Aw_fx, &speech_fx[L_frame], &wsp_fx[L_frame], L_look, 0 );













    tmp_fx = *mem_wsp_fx;













    deemph_fx( &wsp_fx[L_frame], tilt_fact, L_look, &tmp_fx );













    return;













}













#endif
























lib_enc/ivas_core_pre_proc_front_fx.c



+0
−4




























Original line number
Diff line number
Diff line








@@ -1057,11 +1057,7 @@ void pre_proc_front_ivas_fx(













    move16();















    move16();





























#ifndef FIX_2363_FIND_WSP













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













#else















    find_wsp_fx( A_fx, inp_12k8_fx, wsp_fx, &st->mem_wsp_fx, TILT_FAC_FX, L_FRAME, L_LOOK_12k8, L_SUBFR, Aw_fx, GAMMA1, NB_SUBFR );













#endif































    Word16 Q_wsp = *Q_new;















    move16();

































lib_enc/ivas_core_pre_proc_fx.c



+0
−4




























Original line number
Diff line number
Diff line








@@ -1109,11 +1109,7 @@ void ivas_compute_core_buffers_fx(













         * Compute Weighted Input















         *---------------------------------------------------------------*/





























#ifndef FIX_2363_FIND_WSP













        ivas_find_wsp_fx( L_FRAME16k, L_SUBFR, NB_SUBFR16k, A_fx, Aw_fx, st->speech_enc_pe, PREEMPH_FAC_16k, st->wspeech_enc, &st->mem_wsp_enc, st->gamma, L_LOOK_16k );













#else















        find_wsp_fx( A_fx, st->speech_enc_pe, st->wspeech_enc, &st->mem_wsp_enc, PREEMPH_FAC_16k, L_FRAME16k, L_LOOK_16k, L_SUBFR, Aw_fx, st->gamma, NB_SUBFR16k );













#endif















    }































    /*-----------------------------------------------------------------*