Commit 9f9f5699 authored by vaillancour's avatar vaillancour
Browse files

Merge branch '1564_ref_PortFlpMR1476' into 'ivas-float-update' 

Port MR 1476 to float-pc

See merge request !1549
parents 9e3657d2 503cc9c4

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -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 ############################ */

lib_dec/ivas_stat_dec.h

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