diff --git a/lib_com/options.h b/lib_com/options.h index e7530c4138611ae957edcdd4e1d253a1cdcb9df1..cd7f11fd89efba0f49260cd56c2ae6ecf4206b33 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -168,8 +168,10 @@ #define NONBE_FIX_746_NONDIEGETIC_MD /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/ #define NONBE_FIX_729_ASAN_2ISM_ACELP /* VA: issue 729: fix ASAN ACELP errors with 2 ISM coding using LTV */ #define NONBE_FIX_694_OMASA_ACELP /* Nokia: Issue #694: OMASA crash in ACELP with extreme item */ +#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*/ + /* ##################### End NON-BE switches ############################# */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 1fe58874a0863d5f12e0ce1e222dad7e1b7abd03..586c4838bb831a3d3aa16662bdd636c0f6da3a02 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -1705,12 +1705,12 @@ int16_t ivas_jbm_dec_get_num_tc_channels( if ( st_ivas->ivas_format == SBA_FORMAT ) { if ( -#ifndef FIX_PLANAR_SBA_JBM_RS +#ifndef NONBE_FIX_770_PLANAR_SBA_JBM ( st_ivas->sba_planar && num_tc >= 3 ) || ( #endif num_tc == 3 -#ifndef FIX_PLANAR_SBA_JBM_RS +#ifndef NONBE_FIX_770_PLANAR_SBA_JBM ) #endif )