Commit 519789f0 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1044_ISM_REND_MEMORY

parent 7794fe07

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ 
#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#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_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */

#define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

lib_dec/ivas_stat_dec.h

+0 −8
Original line number Diff line number Diff line
@@ -805,18 +805,10 @@ 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;