From efc4639192cc13dc630e74fdbb73323ade30f44f Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 8 Sep 2023 15:19:42 +0200 Subject: [PATCH] issue 780: fix Crash in ISM decoding when bitstream starts with an SID and output_config is not EXT; under NONBE_FIX_780_ISM_STARTS_WITH_SID --- lib_com/options.h | 1 + lib_dec/ivas_init_dec.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index dadd57e9bd..430bc1d7a2 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -176,6 +176,7 @@ #define NONBE_FIX_770_PLANAR_SBA_JBM /* FhG : Issue #770: Crash in planar FOA decoding with JBM caused by uninitialized value */ #define NONBE_FIX_760_COHERENCE_MASA /* Nokia: Issue 760: fixes decoder crash for some cases when all energy ratios are 1 */ #define NONBE_FIX_752_OSBA_MISCONFIG_MCT /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/ +#define NONBE_FIX_780_ISM_STARTS_WITH_SID /* VA: issue 780: fix Crash in ISM decoding when bitstream starts with an SID and output_config is not EXT */ /* ##################### End NON-BE switches ############################# */ diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 3a4d4f8130..bc78ddf723 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -623,6 +623,9 @@ ivas_error ivas_dec_setup( st_ivas->nchan_ism = nchan_ism; /* read ism_mode */ +#ifdef NONBE_FIX_780_ISM_STARTS_WITH_SID + st_ivas->ism_mode = ISM_MODE_DISC; +#endif if ( nchan_ism > 2 ) { k -= nchan_ism; /* SID metadata flags */ -- GitLab