From 6aa71cf10f101ffcce5e2703ffdeda2e062c655a Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 7 May 2025 12:48:44 +0200 Subject: [PATCH] port FIX_1044_ISM_REND_MEMORY --- lib_com/options.h | 1 + lib_dec/ivas_stat_dec.h | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index c568a52fa..58db3bce4 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -101,6 +101,7 @@ #define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/ #define FIX_969_USAN_IGF_ARITH /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */ +#define FIX_1044_ISM_REND_MEMORY /* VA: issue 1044: Lower the memory of the ISM renderer handle. */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h index d86ece7c8..ae20ff2d8 100644 --- a/lib_dec/ivas_stat_dec.h +++ b/lib_dec/ivas_stat_dec.h @@ -853,10 +853,18 @@ typedef struct ivas_lfe_dec_data_structure typedef struct renderer_struct { +#ifdef FIX_1044_ISM_REND_MEMORY + Word32 prev_gains_fx[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS]; /*Q30*/ +#else Word32 prev_gains_fx[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS]; /*Q30*/ - Word16 *interpolator_fx; /*Q15*/ +#endif + Word16 *interpolator_fx; /*Q15*/ Word16 interpolator_len; - Word32 gains_fx[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS]; /*Q30*/ +#ifdef FIX_1044_ISM_REND_MEMORY + Word32 gains_fx[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS]; /*Q30*/ +#else + Word32 gains_fx[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS]; /*Q30*/ +#endif } ISM_RENDERER_DATA, *ISM_RENDERER_HANDLE; -- GitLab