Commit ad6cde4c authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '780-crash-in-ism-decoding-when-bitstream-starts-with-an-sid-and-output_config-is-not-ext' into 'main'

Resolve "Crash in ISM decoding when bitstream starts with an SID and output_config is not EXT"

See merge request !1061
parents 06489253 e1788a64

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,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 ############################# */

lib_dec/ivas_init_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -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 */