diff --git a/lib_com/options.h b/lib_com/options.h index 42ba64994a8f0e529aaece12b126d910c26087f0..02697835f1e0bd4a87c3a1d3e70cce051b431652 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -191,6 +191,7 @@ #define FIX_970_USAN_IN_NELP_SEED #define NONBE_FIX_1075 /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */ #define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB /* FhG: fix bug in TD MDCT-Stereo concealment */ +#define FIX_1044_ISM_REND_MEMORY /* VA: issue 1044: Lower the memory of the ISM renderer handle. */ #define NONBE_FIX_984_OMASA_EXT_OUTPUT /* Nok: issue 1497 - porting OMASA EXT MR */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h index 83ab0a70d3e88bc168b83ecd087237ca12cf229f..b260a48e4a0be7ca8b5cb17afca6d0b3f6d9afb3 100644 --- a/lib_dec/ivas_stat_dec.h +++ b/lib_dec/ivas_stat_dec.h @@ -805,10 +805,18 @@ typedef struct ivas_lfe_dec_data_structure typedef struct renderer_struct { +#ifdef FIX_1044_ISM_REND_MEMORY + float prev_gains[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS]; +#else float prev_gains[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS]; +#endif float *interpolator; int16_t interpolator_length; +#ifdef FIX_1044_ISM_REND_MEMORY + float gains[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS]; +#else float gains[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS]; +#endif } ISM_RENDERER_DATA, *ISM_RENDERER_HANDLE;