diff --git a/lib_com/options.h b/lib_com/options.h index 42c8854aedcc3dbe5e9667375db2540327dfff12..458b1690dfbcfe18424b460508ce4ba05964da68 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -156,6 +156,7 @@ #endif #define NONBE_FIX_984_OMASA_EXT_OUTPUT /* Nokia: issue #984: complete the OMASA EXT output implementation */ +#define FIX_1044_ISM_REND_MEMORY /* VA: issue 1044: Lower the memory of the ISM renderer handle. */ #define USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */ #define FIX_1043_JBM_MD_BUFFER /* VA: issue 1043: JBM MD handle allocation is avoided in non-JBM EXT operations */ diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h index 5b8bd48ffed7b8b3757bfd7b2f4f2cf9b045cd18..d8654af80d8d06938c815b4a791371733ddd4457 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;