Commit cff9a68e authored by Jonas Svedberg's avatar Jonas Svedberg
Browse files

removed inactive define FIX617_UBSAN_DIVBYZERO_STEREOCNG_LAST_SHB_ENER_INIT , now in issue #628

parent c42f4258

lib_com/options.h

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




#define FIX617_UBSAN_DIVBYZERO_STEREOCNG                      /* Eri: Issue 617: Decoder UBSAN: division by zero in stereo cng when inut is 16kHz and output is 32kHz */

//#define FIX617_UBSAN_DIVBYZERO_STEREOCNG_LAST_SHB_ENER_INIT /* Eri: Issue 617:  old EVS initilization leads to incorrect interpolation in dB domain, likely not BE  */



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

lib_dec/cng_dec.c

+2 −11
Original line number Diff line number Diff line
@@ -845,18 +845,9 @@ void td_cng_dec_init( 
    hTdCngDec->shb_dtx_count = 0;

    hTdCngDec->trans_cnt = 0;

    hTdCngDec->burst_cnt = 0;

#ifdef FIX617_UBSAN_DIVBYZERO_STEREOCNG_LAST_SHB_ENER_INIT

    if ( st->element_mode != EVS_MONO )

    {

        hTdCngDec->last_shb_ener = -82.0f; /* low level in dB domain corresspodning to index 0(-15) */

    }

    else

    {

        hTdCngDec->last_shb_ener = 0.001f;

    }

#else



    hTdCngDec->last_shb_ener = 0.001f;

#endif





    set_f( hTdCngDec->interpol_3_2_cng_dec, 0.0f, INTERP_3_2_MEM_LEN );