Commit 7f7a43d3 authored by vaillancour's avatar vaillancour
Browse files

Merge branch '1564_basop_PortFlpMR1476' into 'main' 

Port MR 1476 to main-pc

Closes #1564

See merge request !1548
parents 37544115 e7923672

lib_com/options.h

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

lib_dec/ivas_stat_dec.h

+10 −2
Original line number Diff line number Diff line
@@ -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*/

#endif

    Word16 *interpolator_fx; /*Q15*/

    Word16 interpolator_len;

#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;