Commit 20d2c151 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'fxd_changes_for_MR_907' into 'main' 

Fixed point changes for MR !907

See merge request !1110
parents ccb4b561 6624c8d0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
#define FIX_ISSUE_1214                          /* Ittiam: Fix for issue 1214: Energy leakage in IGF tiles for MDCT-stereo @64kbps SWB*/

#define FIX_881_HILBERT_FILTER                  /* VA: improve the precision of the Hilbert filter to remove 2kHz unwanted tone */

#define FIX_ISSUE_1245                          /* Ittiam: Fix for issue 1245: Basop Encoder: Audible noise for silent Stereo input DTX on @24.4 kbps, @32 kbps*/

#define FIX_920_IGF_INIT_ERROR                  /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

#define FIX_MINOR_SVD_WMOPS_MR1010X             /* FhG: Minor WMOPS tuning, bit-exact to previous version, saves about 8.2 WMOPS for MR1010 */

#define SVD_WMOPS_OPT                           /* Ittiam : SVD related optimizations */

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

lib_com/prot_fx.h

+4 −1
Original line number Diff line number Diff line
@@ -11067,6 +11067,9 @@ void calculate_hangover_attenuation_gain_ivas_fx( 
void init_coder_ace_plus_ivas_fx(

    Encoder_State *st,             /* i  : Encoder state                          */

    const Word32 last_total_brate, /* i  : last total bitrate                     */

#ifdef FIX_920_IGF_INIT_ERROR

    const Word32 igf_brate, /* i  : IGF configuration bitrate           */

#endif

    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0)   */

);

























lib_enc/core_enc_init.c



+8
−1




























Original line number
Diff line number
Diff line








@@ -63,6 +63,9 @@ static void init_acelp_ivas_fx( Encoder_State *st, Word16 L_frame_old, Word16 sh













void init_coder_ace_plus_ivas_fx(















    Encoder_State *st,             /* i  : Encoder state                          */















    const Word32 last_total_brate, /* i  : last total bitrate                     */













#ifdef FIX_920_IGF_INIT_ERROR













    const Word32 igf_brate, /* i  : IGF configuration bitrate           */













#endif















    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0)   */















)















{










@@ -195,7 +198,11 @@ void init_coder_ace_plus_ivas_fx(













    test();















    IF( st->igf && st->hIGFEnc != NULL )















    {













#ifdef FIX_920_IGF_INIT_ERROR













        IGFEncSetMode_ivas_fx( st->hIGFEnc, igf_brate, st->bwidth, st->element_mode, st->rf_mode );













#else















        IGFEncSetMode_ivas_fx( st->hIGFEnc, st->total_brate, st->bwidth, st->element_mode, st->rf_mode );













#endif















    }















    ELSE IF( st->hIGFEnc != NULL )















    {

































lib_enc/core_enc_switch.c



+4
−0




























Original line number
Diff line number
Diff line








@@ -229,7 +229,11 @@ void core_coder_mode_switch_ivas_fx(













        Scale_sig( st->old_inp_12k8_fx, L_INP_MEM, shift );















        st->exp_old_inp_12k8 = sub( st->exp_old_inp_12k8, shift );















        move16();













#ifdef FIX_920_IGF_INIT_ERROR













        init_coder_ace_plus_ivas_fx( st, last_total_brate, st->total_brate, MCT_flag );













#else















        init_coder_ace_plus_ivas_fx( st, last_total_brate, MCT_flag );













#endif















        if ( st->hLPDmem != NULL )















        {















            st->hLPDmem->q_lpd_old_exc = st->prev_Q_new;

































lib_enc/init_enc.c



+4
−0




























Original line number
Diff line number
Diff line








@@ -1096,7 +1096,11 @@ ivas_error init_encoder_ivas_fx(













    move16();















    /* Initialize ACELP */















#endif













#ifdef FIX_920_IGF_INIT_ERROR













    init_coder_ace_plus_ivas_fx( st, st->last_total_brate, igf_brate, 0 );













#else















    init_coder_ace_plus_ivas_fx( st, st->last_total_brate, 0 );













#endif































    IF( st->hLPDmem != NULL )















    {