From 29d9814ea8f6492a2779182749f75db20c9fc25a Mon Sep 17 00:00:00 2001 From: Benjamin McDonald Date: Thu, 30 Jun 2022 16:37:27 +1000 Subject: [PATCH 1/2] fix for 1-ivas-internal-error-in-decoder-for-custom-loudspeaker-format-with-sba-input-at-24-4kbps --- lib_com/options.h | 2 ++ lib_dec/ivas_spar_foa_dec.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 5ee8fff0cd..02317c005a 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -147,6 +147,8 @@ /*#define FIX_IVAS_180_PLC_SIGNAL_LAST_OVLP_IN_TCX10*/ /* IVAS-180 write last overlap mode in TCX10 frames to allow for correct TCX10/TCX5 subframe decomposition in TCX10 frames after a lost frame */ /*#define FIX_I1_113*/ /* under review : MCT bit distribution optimization for SBA high bitrates*/ +#define FIX_1 /* fix bug 1-ivas-internal-error-in-decoder-for-custom-loudspeaker-format-with-sba-input-at-24-4kbps */ + /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ #endif diff --git a/lib_dec/ivas_spar_foa_dec.c b/lib_dec/ivas_spar_foa_dec.c index 1adcc883d4..01332839f4 100644 --- a/lib_dec/ivas_spar_foa_dec.c +++ b/lib_dec/ivas_spar_foa_dec.c @@ -976,7 +976,11 @@ void ivas_spar_foa_dec_upmixer( /* determine if we can skip certain data */ ivas_spar_get_skip_mat( hSparFoa, numch_out, numch_in, num_spar_bands, b_skip_mat ); /* this can be precomputed based on bitrate and format*/ +#ifdef FIX_1 + numch_out_dirac = st_ivas->hDecoderConfig->nchan_out; +#else numch_out_dirac = audioCfg2channels( st_ivas->hDecoderConfig->output_config ); +#endif for ( int16_t i_sf = 0; i_sf < MAX_PARAM_SPATIAL_SUBFRAMES; i_sf++ ) { -- GitLab From 939abc9e96d07fb5482620ebb818b380def50633 Mon Sep 17 00:00:00 2001 From: Benjamin McDonald Date: Tue, 5 Jul 2022 14:27:51 +1000 Subject: [PATCH 2/2] rename switch to describe function --- lib_com/options.h | 2 +- lib_dec/ivas_spar_foa_dec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 1a534f7947..c5fa1d384f 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -147,7 +147,7 @@ /*#define FIX_IVAS_180_PLC_SIGNAL_LAST_OVLP_IN_TCX10*/ /* IVAS-180 write last overlap mode in TCX10 frames to allow for correct TCX10/TCX5 subframe decomposition in TCX10 frames after a lost frame */ /*#define FIX_I1_113*/ /* under review : MCT bit distribution optimization for SBA high bitrates*/ -#define FIX_1 /* fix bug 1-ivas-internal-error-in-decoder-for-custom-loudspeaker-format-with-sba-input-at-24-4kbps */ +#define FIX_1_CUSTOM_LS /* fix bug 1-ivas-internal-error-in-decoder-for-custom-loudspeaker-format-with-sba-input-at-24-4kbps */ #define FIX_TDREND_STANDALONE /* Fix for TD standalone renderer (broken after update of hHrtfTD pointer and addition of hRenderConfig */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_spar_foa_dec.c b/lib_dec/ivas_spar_foa_dec.c index 01332839f4..0a2a61c83e 100644 --- a/lib_dec/ivas_spar_foa_dec.c +++ b/lib_dec/ivas_spar_foa_dec.c @@ -976,7 +976,7 @@ void ivas_spar_foa_dec_upmixer( /* determine if we can skip certain data */ ivas_spar_get_skip_mat( hSparFoa, numch_out, numch_in, num_spar_bands, b_skip_mat ); /* this can be precomputed based on bitrate and format*/ -#ifdef FIX_1 +#ifdef FIX_1_CUSTOM_LS numch_out_dirac = st_ivas->hDecoderConfig->nchan_out; #else numch_out_dirac = audioCfg2channels( st_ivas->hDecoderConfig->output_config ); -- GitLab