Commit 15245dfa authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2488_PREVENT_NEG_PITCH

parent 0c572264

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



#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_2488_PREVENT_NEG_PITCH                      /* VA: Fix for 2488, use saturation to prevent possible wrap-around, thus negative pitch values */

#define FIX_1547_ISMDTX_HANDLE                          /* VA: float issue 1547: fix use of 'hISMDTX' handle */

#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_BASOP_2491_MDCT_JBM_CLICK                   /* FhG: BASOP #2491: Fix Q_synth after TCX concealment (using ACELP concealment) */

lib_enc/ivas_mdct_core_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -2483,11 +2483,7 @@ 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

        {