Commit a6b0e09b authored by vaclav's avatar vaclav
Browse files

Merge branch '2463-evs-bug-in-calling-quant_bwe_lsf_fx' into 'main' 

Harmonize calling Quant_BWE_LSF_fx()

Closes #2463

See merge request !2886
parents ea83b952 2e1d74a8

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#define FIX_BASOP_2478_HARM_ENC_PRM_HM                  /* FhG: basop issue 2478: harmonize enc_prm_hm() and enc_prm_hm_ivas_fx() */

#define FIX_2455_HARMONIZE_generate_comfort_noise_enc   /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2455_HARMONIZE_configureFdCngEnc            /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

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





/* #################### End BE switches ################################## */

lib_enc/swb_tbe_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1681,6 +1681,9 @@ 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
@@ -1689,6 +1692,7 @@ void swb_tbe_enc_fx( 
        {

            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 */