Commit 28074174 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into philips/contribution-38-control-metadata-reverb

parents f2508000 f8c88e09

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -157,8 +157,8 @@ 
#define FIX_383_CLEAN_UP                                /* Dlb : Clean up of unused functions */

#define FIX_532_ISM_MD_INACTIVE                         /* VA: issue 532: improve MD coding in ISM inactive frames */

#define FIX_547_NAN_IGF_DEC                             /* FhG: issue 547: fix possible nan in IGF decoder */



#define FIX_529_BWD_ISSUE                               /* VA: issue 529: fix Bandwidth Detector not working reliably for Music and Generic Audio */

#define FIX_557_CRASH_IN_ISM_DTX                        /* VA issue 557: fix crash in 1ISM 48 kbps DTX */



#define IGF_TUNING_96                                   /* FhG: Issue 546: slight tuning of IGF config used in 96 kbps stereo, 128 kbps SBA and others */

lib_enc/ivas_core_pre_proc.c

+4 −0
Original line number Diff line number Diff line
@@ -129,7 +129,11 @@ ivas_error pre_proc_ivas( 
    {

        st->L_frame = L_FRAME32k;

    }

#ifdef FIX_557_CRASH_IN_ISM_DTX

    else if ( st->bwidth >= SWB && st->total_brate > MAX_ACELP_BRATE_ISM && st->total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE && st->is_ism_format && st->tcxonly && st->core_brate != SID_2k40 )

#else

    else if ( st->bwidth >= SWB && st->total_brate > MAX_ACELP_BRATE_ISM && st->total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE && st->is_ism_format && st->tcxonly )

#endif

    {

        st->L_frame = L_FRAME25_6k;

    }