Commit 947f586a authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1348_fix' into 'main' 

[allow-regression] Fix for 3GPP issue 1348: Increased noise level in BASOP decoder for...

See merge request !1369
parents f7da3e8d e9f6f464

lib_com/ivas_prot_fx.h

+5 −0
Original line number Diff line number Diff line
@@ -1595,7 +1595,12 @@ void decoder_tcx_imdct_fx( 
    Word32 x_fx[N_MAX],

    Word16 q_x,

    Word16 xn_buf_fx[],

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN

    Word16 *q_win,

    Word16 *q_winFB,

#else

    Word16 q_win,

#endif

    const UWord16 kernelType, /* i  : TCX transform kernel type               */

    const Word16 fUseTns,     /* i  : flag that is set if TNS data is present */

    Word16 synth_fx[],        /* i/o: synth[-M..L_frame]                      */

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,10 @@ 
#define MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of dmx calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Requires MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */





#define FIX_1348_BIT_PRECISION_IMPROVEMENT

#define FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN

#define FIX_1348_BIT_PRECISION_IMPROVEMENT_DYNAMIC_QOLD



#define FIX_USAN_BASOP_UTIL_DIVIDE3232          /* Eri: Fix USAN error in BASOP_Util_Divide3232_Scale_newton by adding explicit type cast for -1 in hex */



#define FIX_1740_MISING_POP_WMOPS               /* VA: fix issue 1740: missing pop_wmops() */

lib_com/prot_fx.h

+18 −0
Original line number Diff line number Diff line
@@ -9447,9 +9447,19 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T 
void IMDCT_ivas_fx(

    Word32 *x_fx,

    Word16 q_x,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN

    Word16 *old_syn_overl_fx,

    Word16 *Q_old_syn_overl_fx,

    Word16 *syn_Overl_TDAC_fx,

    Word16 *Q_syn_Overl_TDAC_fx,

#else

    Word16 *old_syn_overl_fx,

    Word16 *syn_Overl_TDAC_fx,

#endif

    Word16 *xn_buf_fx,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN

    Word16 q_xn_buf_fx,

#endif

    const Word16 *tcx_aldo_window_1_fx,

    const PWord16 *tcx_aldo_window_1_trunc_fx,

    const PWord16 *tcx_aldo_window_2_fx,
@@ -9470,11 +9480,19 @@ void IMDCT_ivas_fx( 
    const Word16 frame_cnt,

    const Word16 bfi,

    Word16 *old_out_fx,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_DYNAMIC_QOLD

    Word16 *q_old_out_fx,

#endif

    const Word16 FB_flag,

    Decoder_State *st,

    const Word16 fullbandScale,

    Word16 *acelp_zir_fx,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN

    Word16 *q_acelp_zir_fx,

    Word16 *pq_win );

#else

    Word16 q_win );

#endif















void v_mult16_fixed(















    const Word16 x1[], /* i  : Input vector 1                                   */

































lib_dec/core_dec_init_fx.c



+22
−2




























Original line number
Diff line number
Diff line








@@ -396,8 +396,15 @@ void open_decoder_LPD_fx(













                move16();































                Copy( hHQ_core->fer_samples_fx + delay_comp, hTcxDec->syn_OverlFB, shr( hTcxDec->L_frameTCX, 1 ) ); /* hHQ_core->Q_fer_samples*/



























#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT













                hTcxDec->Q_syn_OverlFB = hHQ_core->Q_fer_samples;













                move16();













#endif















                lerp( hHQ_core->fer_samples_fx + delay_comp, hTcxDec->syn_Overl, shr( st->L_frame, 1 ), shr( hTcxDec->L_frameTCX, 1 ) ); /*Q0: ACELP(bfi)->TCX(rect)*/













#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT













                hTcxDec->Q_syn_Overl = hHQ_core->Q_fer_samples;













                move16();













#endif































                /*old_out needed for MODE1 routine and syn_Overl_TDAC for MODE2 routine*/















                hHQ_core->Q_old_wtda = -1;










@@ -1070,7 +1077,15 @@ void acelp_plc_mdct_transition_fx(













        move16(); /*CLDFB delay*/































        Copy( st->hHQ_core->fer_samples_fx + delay_comp, st->hTcxDec->syn_OverlFB, shr( st->hTcxDec->L_frameTCX, 1 ) ); /* Q_fer_samples */













#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT













        st->hTcxDec->Q_syn_OverlFB = st->hHQ_core->Q_fer_samples;













        move16();













#endif















        lerp( st->hHQ_core->fer_samples_fx + delay_comp, st->hTcxDec->syn_Overl, shr( st->L_frame, 1 ), shr( st->hTcxDec->L_frameTCX, 1 ) ); /*ACELP(bfi)->TCX(rect)*/













#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT













        st->hTcxDec->Q_syn_Overl = st->hHQ_core->Q_fer_samples;













        move16();













#endif















        /*old_out needed for MODE1 routine and syn_Overl_TDAC for MODE2 routine*/















        st->hHQ_core->Q_old_wtda = -1;















        move16();










@@ -2090,6 +2105,11 @@ void reset_tcx_overl_buf_fx(













    set16_fx( hTcxDec->syn_Overl, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/















    hTcxDec->Q_syn_Overl = 0;















    move16();













#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT













    set16_fx( hTcxDec->syn_OverlFB, 0, L_FRAME48k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/













    hTcxDec->Q_syn_OverlFB = 0;













    move16();













#endif















    set16_fx( hTcxDec->syn_Overl_TDACFB, 0, L_FRAME_MAX / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/















    hTcxDec->Q_syn_Overl_TDACFB = 0;















    move16();

































lib_dec/dec_ace_fx.c



+4
−0




























Original line number
Diff line number
Diff line








@@ -690,6 +690,10 @@ void decoder_acelp_fx(













    E_UTIL_deemph2( st->Q_syn, syn, st->preemph_fac, st->L_frame, &tmp_deemph ); /* tmp_deemph and syn in Q0 starting from here*/































    bufferCopyFx( syn + shr( st->L_frame, 1 ), hTcxDec->old_syn_Overl, shr( st->L_frame, 1 ), 0 /*Qf_syn*/, -1 /*Qf_old_xnq*/, 0, 0 /*Q_old_xnq*/ );













#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT













    st->hTcxDec->Q_old_syn_Overl = sub( st->Q_syn, 1 );













    move16();













#endif































    Copy( syn + sub( st->L_frame, M + 1 ), st->syn, 1 + M ); /*Q0*/