Commit 95ec6447 authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2363-harmonisation-of-find_wsp' into 'main' 

basop-2363-harmonisation-of-find_wsp

Closes #2363

See merge request !2746
parents b21e60d2 26dcd5b5

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ 
#define FIX_BASOP_2350_HARM_0B_BWE_2                    /* VA: basop issue 2350: Simplify calling of hf_synth_fx() */

#define FIX_2349_HARM_FIND_UV                           /* VA: basop issue 2349: harmonization of find_uv() function */

#define FIX_2364_HARM_MULT_HARM                         /* VA: basop issue 2364 : harmonizing multi_harm_fx function */

#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() */

lib_com/prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -11027,7 +11027,7 @@ 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*/









@@ -11041,6 +11041,7 @@ void ivas_find_wsp_fx(













    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_uv_fx.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -739,7 +739,7 @@ Word16 find_uv_fx(













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































#ifdef FIX_2349_HARM_FIND_UV













    IF( st_fx->element_mode == EVS_MONO ) /* Overwrite DE3 in case of EVS */













    IF( st_fx->element_mode == EVS_MONO ) /* Overwrite dE3 in case of EVS */















    {















        dE3 = sub( Etot, hNoiseEst->Etot_last_fx ); /*Q8*/















    }










@@ -1108,8 +1108,8 @@ Word16 find_uv_fx(













        {















            st_fx->rf_mode = 0;















            move16();













            /* Current frame cannot be compressed to pack the partial redundancy;*/





























            /* Current frame cannot be compressed to pack the partial redundancy */















            IF( NE_16( st_fx->rf_mode, st_fx->Opt_RF_ON ) ) /* can happen only for EVS format */















            {















#ifdef FIX_2349_HARM_FIND_UV

































lib_enc/find_wsp_fx.c



+2
−1






























Original line number
Diff line number
Diff line








@@ -77,7 +77,7 @@ void find_wsp_fx(













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















    }















}



























#ifndef FIX_2363_FIND_WSP















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















 * ivas_find_wsp_fx()















 *










@@ -134,3 +134,4 @@ void ivas_find_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



+4
−0






























Original line number
Diff line number
Diff line








@@ -1086,7 +1086,11 @@ ivas_error 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();