Unverified Commit d84f9e70 authored by norvell's avatar norvell
Browse files

Merge with main

parents b0b3dce1 1f748255

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ 
#define FIX_BASOP_2451_HQ_FEC_SELECTOR                  /* Eri: Resolve basop issue 2451, wrong condition on env_stab_plc_fx */

#define FIX_2398_PRECISSION_ORIENTATION_TRACKING        /* FhG: use refinement of Sqrt32 within certain functions*/

#define FIX_BASOP_2486_HQ_FINE_GAIN_ALIGNMENT           /* Eri: Basop issue 2486: IVAS BASOP used calculations with truncation, EVS BASOP used rounding. This aligns the use of a table lookup. */

#define FIX_1543_MID_LSF_BITS                           /* VA: float issue 1543: Resolve "MSAN: use-of-uninitialized-value in lib_enc/lsf_enc.c:262:5 for EVS encoder" */

#define FIX_2488_PREVENT_NEG_PITCH                      /* VA: Fix for 2488, use saturation to prevent possible wrap-around, thus negative pitch values */



/* ##################### End NON-BE switches ########################### */

lib_enc/acelp_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -553,6 +553,10 @@ ivas_error acelp_core_enc_fx( 
        move16();

        uc_two_stage_flag = 0;

        move16();

#ifdef FIX_1543_MID_LSF_BITS

        st->acelp_cfg.mid_lsf_bits = -1;

        move16();

#endif



        test();

        IF( !nelp_mode && !ppp_mode )

lib_enc/ivas_mdct_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -2462,7 +2462,11 @@ void ivas_mdct_core_whitening_enc_fx( 
        }

        IF( param_core[ch][1 + NOISE_FILL_RANGES] != 0 )

        {

#ifdef FIX_2488_PREVENT_NEG_PITCH

            set16_fx( pitch_buf_fx[ch], extract_h( L_shl_sat( Mult_32_32( L_add( L_deposit_h( st->hTcxEnc->tcxltp_pitch_int ), L_mult( st->hTcxEnc->tcxltp_pitch_fr, div_s( 1, st->pit_res_max ) ) ), Mult_32_32( L_shl( st->sr_core, Q10 ), ONE_BY_INT_FS_12k8_Q42 ) ), 16 ) ), NB_SUBFR16k );

#else

            set16_fx( pitch_buf_fx[ch], extract_l( Mult_32_32( L_add( L_deposit_h( st->hTcxEnc->tcxltp_pitch_int ), L_mult( st->hTcxEnc->tcxltp_pitch_fr, div_s( 1, st->pit_res_max ) ) ), Mult_32_32( L_shl( st->sr_core, Q10 ), ONE_BY_INT_FS_12k8_Q42 ) ) ), NB_SUBFR16k );

#endif

        }

        ELSE

        {