Commit d75018af authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_BASOP_2517_CLICK_IN_OMASA_LTV

parent c66787dd

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 


#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

#define FIX_BASOP_2517_CLICK_IN_OMASA_LTV               /* FhG: BASOP #2517: preserve precision by removing one-bit headroom from Q_min and allowing saturation during buffer scaling */

#define NONBE_FIX_ISSUE_2518                            /* FhG: Fix issue 2518, noise during ACELP switching from 16KHz to 12k8Hz by improving Q_new calculation. */

#define NONBE_FIX_ISSUE_2518_TRANSENC_SAT_FIX           /* FhG: Fix issue 2518, fix wrong amplitude because of saturation of x_tran in transf_cdbk_enc_fx() for transient signals. */

#define NONBE_FIX_ISSUE_2569                            /* FhG: Fix issue 2569, overflow of mem_preemph16k_fx in LTV test. */

lib_enc/acelp_core_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -669,7 +669,6 @@ ivas_error acelp_core_enc_fx( 
         * Calculation of LP residual (filtering through A[z] filter)

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



#ifdef FIX_BASOP_2517_CLICK_IN_OMASA_LTV

        Word16 scf = sub( norm_arr( inp - M, add( st->L_frame, M ) ), 2 );

        test();

        IF( NE_16( st->element_mode, EVS_MONO ) && GT_16( scf, 0 ) )
@@ -683,9 +682,6 @@ ivas_error acelp_core_enc_fx( 
        {

            calc_residu_fx( st, inp, res_fx, Aq );

        }

#else

        calc_residu_fx( st, inp, res_fx, Aq );

#endif



        calculate_hangover_attenuation_gain_fx( st, &att_fx, vad_hover_flag );

lib_enc/ivas_core_pre_proc_front_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1193,7 +1193,6 @@ void pre_proc_front_ivas_fx( 
        move16();

    }



#ifdef FIX_BASOP_2517_CLICK_IN_OMASA_LTV

    Word16 inp_local[L_INP_12k8];

    Word16 Q_local;

    Word16 offset = (Word16) ( inp_12k8_fx - old_inp_12k8_fx );
@@ -1210,9 +1209,6 @@ void pre_proc_front_ivas_fx( 
    {

        analy_lp_fx( inp_12k8_fx, L_FRAME, L_look, ener_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lsp_old1_fx, alw_pitch_lag_12k8, alw_voicing_fx, INT_FS_12k8, element_mode, i, *Q_new, Q_r );

    }

#else

    analy_lp_fx( inp_12k8_fx, L_FRAME, L_look, ener_fx, A_fx, epsP_h, epsP_l, lsp_new_fx, lsp_mid_fx, st->lsp_old1_fx, alw_pitch_lag_12k8, alw_voicing_fx, INT_FS_12k8, element_mode, i, *Q_new, Q_r );

#endif



    FOR( Word16 idx = 0; idx < M + 1; idx++ )

    {