Commit 1da99628 authored by kinuthia's avatar kinuthia
Browse files

Merge branch '685-ism4-decoder-detects-ber' into 'main' 

Fix for false BER_detect in FIX_685_BER_IN_HVQ

See merge request !938
parents 64f05971 58302820

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ 
#define FIX_683_JBM_CLEANUP                             /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */

#define FIX_689_USAN_QSPHERICAL                         /* Nokia: Fix usan error from issue 689 */

#define FIX_680_ACELP_TABLE_OMASA                       /* Nokia: Fix for issue 680 preventing overindexing of PulseConfTable */

#define FIX_685_BER_IN_HVQ                              /* Eri: Fix for issue 685. Invalid configuration in EVS now happening in IVAS with variable rate core. Remove BER warning for IVAS. */



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

lib_dec/peak_vq_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -280,7 +280,11 @@ static void peak_vq_dec( 
    pvq_bands = hvq_pvq_bitalloc( pvq_bits, core_brate, st->bwidth, ynrm, manE_peak, expE_peak, Rk, R, sel_bnds, &n_sel_bnds );



    /* safety check in case of bit errors */

#ifdef FIX_685_BER_IN_HVQ

    if ( ( pvq_bands == 0 ) && st->element_mode == EVS_MONO ) /* PVQ bands may be zero for IVAS */

#else

    if ( pvq_bands == 0 )

#endif

    {

        st->BER_detect = 1;

    }