From 4d8f69b07aad5476d5cca324652043c4810f6fcd Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 4 Jul 2024 13:57:24 +0200 Subject: [PATCH] issue 1138: Fix SBA EXT output call of audioCfg2channels(); under FIX_1138_SBA_EXT_ERROR_PRINTOUT --- lib_com/options.h | 1 + lib_rend/ivas_output_init.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index e490d7750e..6a82b20490 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -167,6 +167,7 @@ #define FIX_1113_CLDFB_REND_IN_ISAR /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */ #define ADJUST_MCT_CHANNELS_MAX /* FhG: set correct max mct channels constant*/ #define FIX_745_FIX_DATA_TYPE_CONVERSION /* VA: issue 745: implicit data type conversion when calling IVAS_DEC_Configure() */ +#define FIX_1138_SBA_EXT_ERROR_PRINTOUT /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */ /* #################### End BE switches ################################## */ diff --git a/lib_rend/ivas_output_init.c b/lib_rend/ivas_output_init.c index 2105b76c3d..a78b7fe2c3 100644 --- a/lib_rend/ivas_output_init.c +++ b/lib_rend/ivas_output_init.c @@ -304,7 +304,11 @@ int16_t ivas_get_nchan_buffers_dec( { nchan_out_buff = max( nchan_out_buff, st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe ); } +#ifdef FIX_1138_SBA_EXT_ERROR_PRINTOUT + else if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL ) +#else else +#endif { nchan_out_buff = max( audioCfg2channels( st_ivas->transport_config ), audioCfg2channels( st_ivas->intern_config ) ); nchan_out_buff = max( nchan_out_buff, audioCfg2channels( output_config ) ); -- GitLab