From 7af4dca33dba1f688a62c222c0f2a7d5c28389b4 Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 15 Jun 2023 14:48:53 +0200 Subject: [PATCH] issue 557: fix crash in 1ISM 48 kbps DTX; under FIX_557_CRASH_IN_ISM_DTX --- lib_com/options.h | 4 +--- lib_enc/ivas_core_pre_proc.c | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 63f528e346..b8cda64c77 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -153,10 +153,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 */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_enc/ivas_core_pre_proc.c b/lib_enc/ivas_core_pre_proc.c index 1e536f8026..9c4942314d 100644 --- a/lib_enc/ivas_core_pre_proc.c +++ b/lib_enc/ivas_core_pre_proc.c @@ -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; } -- GitLab