From 84314d873cad23dca4d8d7f7a748faa9d8844ba5 Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Wed, 6 Sep 2023 12:02:55 +0200 Subject: [PATCH] fix #770, Planar SBA crash, number of TC was initialized wrong in this case --- lib_com/options.h | 2 +- lib_dec/ivas_jbm_dec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index bb7652a6a2..47342d279d 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -168,7 +168,7 @@ #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 */ /* ##################### End NON-BE switches ############################# */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 1fe58874a0..586c4838bb 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 ) -- GitLab