From 0cd3e43fbf024f1f3d757c40b84da80db813558d Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 14 Jun 2023 15:38:07 +0200 Subject: [PATCH 1/2] fix crash for 2ISM at 64 kbps due to too high bitrate in the low-rate mode --- lib_dec/ivas_ism_metadata_dec.c | 2 +- lib_enc/ivas_ism_metadata_enc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec.c index 0f54c699d6..30f6c7442c 100644 --- a/lib_dec/ivas_ism_metadata_dec.c +++ b/lib_dec/ivas_ism_metadata_dec.c @@ -542,7 +542,7 @@ ivas_error ivas_ism_metadata_dec( if ( ism_mode == ISM_MODE_DISC ) { #ifdef FIX_532_ISM_MD_INACTIVE - if ( ism_imp[ch] == ISM_NO_META ) + if ( ism_imp[ch] == ISM_NO_META && total_brate[ch] < ACELP_8k00 ) #else if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global ) #endif diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c index 518ba3353a..27a4a3b0cb 100644 --- a/lib_enc/ivas_ism_metadata_enc.c +++ b/lib_enc/ivas_ism_metadata_enc.c @@ -636,7 +636,7 @@ ivas_error ivas_ism_metadata_enc( if ( ism_mode == ISM_MODE_DISC ) { #ifdef FIX_532_ISM_MD_INACTIVE - if ( ism_imp[ch] == ISM_NO_META ) + if ( ism_imp[ch] == ISM_NO_META && total_brate[ch] < ACELP_8k00 ) #else if ( hIsmMeta[ch]->ism_metadata_flag == 0 && vad_flag[ch] == 0 && ism_metadata_flag_global ) #endif -- GitLab From e3d09896b79bb6656de3b657dd1e2d6e371e326e Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 15 Jun 2023 12:42:44 +0200 Subject: [PATCH 2/2] activate FIX_532_ISM_MD_INACTIVE again (non-BE outputs in ISM are expected) --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index a0864dee37..8a98ccc141 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -151,7 +151,7 @@ #endif #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_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 */ -- GitLab