Commit d26e7a24 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2463_EVS_BWE_LSF

parent f918e677

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define HARM_HQ_CORE_KEEP_BE                            /* hack to keep all BE after HQ core functions harmonization; pending resolving issues #2450, #2451, #2452 */

#define FIX_2463_EVS_BWE_LSF                            /* VA: basop issue 2463: harmonize calling of Quant_BWE_LSF_fx() */

#define FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM            /* Eri: Basop issue 2453: Fix alignment of peak_avrg_ratio_fx */

#define FIX_2480_HARM_TONALMDCT                         /* FhG: basop issue 2480: Harmonize TonalMDCTConceal_Detect_fx() and TonalMDCTConceal_Detect_ivas_fx() */

#define FIX_2479_HARM_PITCH_GAIN                        /* FhG: basop issue 2479: Harmonize tcx_ltp_pitch_search_*(), tcx_ltp_find_gain_*fx() */

lib_enc/swb_tbe_enc_fx.c

+0 −11
Original line number Diff line number Diff line
@@ -1681,18 +1681,7 @@ void swb_tbe_enc_fx( 
    ELSE

    {

        /* LSF quantization (21 bits) */

#ifdef FIX_2463_EVS_BWE_LSF

        Quant_BWE_LSF_fx( hBstr, hBWE_TD, st_fx->codec_mode, lsf_shb_fx, lsf_shb_fx, st_fx->extl_brate );

#else

        IF( st_fx->element_mode == EVS_MONO )

        {

            Quant_BWE_LSF_fx( hBstr, hBWE_TD, st_fx->codec_mode, lsf_shb_fx, lsf_shb_fx, st_fx->extl ); // this is likely a bug in EVS

        }

        ELSE

        {

            Quant_BWE_LSF_fx( hBstr, hBWE_TD, st_fx->codec_mode, lsf_shb_fx, lsf_shb_fx, st_fx->extl_brate );

        }

#endif

    }



    /* space the lsfs to assert a minimum distance */