Commit 6df7ffbd authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_638_ENERGIE_IAC_ROM_TABLES

parent ada79919

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,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.c

+0 −4
Original line number Diff line number Diff line
@@ -38,11 +38,7 @@ 
#include "wmc_auto.h"

#include "ivas_prot.h"

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#include "ivas_rom_binaural_crend_head.h"

#else

#include "ivas_rom_rend.h"

#endif

#endif



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

lib_rend/ivas_objectRenderer_mix.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

#ifdef DEBUGGING

#include "debug.h"

#endif

lib_rend/ivas_rom_binaural_crend_head.c

+0 −2
Original line number Diff line number Diff line
@@ -7237,7 +7237,6 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][252 
};



























#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES





























/********************** default HRIR reverb rom tables **********************/
























@@ -7582,7 +7581,6 @@ const float defaultHRIR_right_avg_power_16kHz[LR_IAC_LENGTH_NR_FC] = {













};















      















#endif













#endif











































#undef WMC_TOOL_SKIP

























lib_rend/ivas_rom_binaural_crend_head.h



+0
−2




























Original line number
Diff line number
Diff line








@@ -348,7 +348,6 @@ extern float CRendBin_Combined_BRIR_coeff_im_16kHz[HRTF_LS_CHANNELS][BINAURAL_CH













extern float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2522];















extern float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2522];





























#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES































/********************** default HRIR reverb rom tables **********************/

























@@ -373,6 +372,5 @@ extern const float defaultHRIR_coherence_16kHz[LR_IAC_LENGTH_NR_FC];













extern const float defaultHRIR_left_avg_power_16kHz[LR_IAC_LENGTH_NR_FC];















extern const float defaultHRIR_right_avg_power_16kHz[LR_IAC_LENGTH_NR_FC];















#endif













#endif































#endif /* _IVAS_ROM_BINAURAL_CREND_HEAD_ */