Commit d9b5dca0 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_638_ENERGIE_IAC_ROM_TABLES

parent 2cbc3f71

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ 
#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES       /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers	*/



#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */

lib_rend/ivas_hrtf_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -33,11 +33,7 @@ 
#include <stdint.h>

#include "options.h"

#include "prot_fx.h"

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#include "ivas_rom_binaural_crend_head.h"

#else

#include "ivas_rom_rend.h"

#endif

#include "ivas_prot_rend_fx.h"

#include "ivas_error.h"

#include "wmc_auto.h"

lib_rend/ivas_objectRenderer_mix_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ 
#include "ivas_error.h"

#include "wmc_auto.h"

#include "ivas_rom_rend.h"

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#include "ivas_rom_binaural_crend_head.h"

#endif

#include "ivas_prot_fx.h"



/*-------------------------------------------------------------------*

lib_rend/ivas_rom_binaural_crend_head.h

+0 −2
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ extern Word32 CRendBin_Combined_BRIR_coeff_im_16kHz_fx[HRTF_LS_CHANNELS][BINAURA 
extern Word32 CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz_fx[BINAURAL_CHANNELS][2522];

extern Word32 CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz_fx[BINAURAL_CHANNELS][2522];



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB

extern  float defaultHRIR_coherence_48kHz_fx[LR_IAC_LENGTH_NR_FC];       /*Q-27*/

extern  float defaultHRIR_left_avg_power_48kHz_fx[LR_IAC_LENGTH_NR_FC];  /*Q-23*/
@@ -374,6 +373,5 @@ extern const Word32 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC]; / 
extern const Word32 defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC];  /*Q-23*/

extern const Word32 defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC]; /*Q-23*/

#endif

#endif



#endif /* _IVAS_ROM_BINAURAL_CREND_HEAD_ */

lib_rend/ivas_rom_binaural_crend_head_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -59650,7 +59650,6 @@ const Word32 CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz_fx[BINAURAL_CHANNELS] 
    -6515466, },

};













#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES





























#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB















/********************** defaultHRIR reverb rom tables at sampling rate 48kHz **********************/










@@ -60184,7 +60183,6 @@ const Word32 defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC] /*Q-23*/













};





























#endif













#endif











































Word32 sine_table_Q31 [361] = {