Commit ae52e3a9 authored by emerit's avatar emerit
Browse files

update rom with new generated filters

parent f72ceef0

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ 
#define FIX_CREND_SIMPLIFY_CODE   

#ifdef FIX_CREND_SIMPLIFY_CODE

#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */

#define USE_CREND_16BIT_ROM

// #define USE_FASTCONV_PARAMBIN_16BIT_ROM

// #define USE_PARAMBIN_16BIT_ROM

// #define USE_TDREND_16BIT_ROM

#endif

/* #################### End BASOP porting switches ############################ */

lib_rend/ivas_rom_TdBinauralRenderer.h

+58 −0
Original line number Diff line number Diff line
@@ -43,6 +43,63 @@ 
 *------------------------------------------------------------------------*/

/* TD renderer default HRIR model */



#ifdef USE_TDREND_16BIT_ROM



extern const Word16 defaultHRIR_rom_latency_s_Q_fx;

extern const Word32 defaultHRIR_rom_latency_s_fx;

extern const Word16 defaultHRIR_rom_model_configuration[6];

extern const Word16 defaultHRIR_rom_azimDim3[15];

extern const Word16 defaultHRIR_rom_azim_start_idx[15];

extern const Word16 defaultHRIR_rom_azimSegSamples[1];

extern const Word16 defaultHRIR_rom_azimShapeIdx[15];

extern const Word16 defaultHRIR_rom_azimShapeSampFactor[15];

extern const Word16 defaultHRIR_rom_elevKSeq_Q_fx;

extern const Word16 defaultHRIR_rom_elevKSeq_fx[13];

extern const Word16 defaultHRIR_rom_Alpha48_Q_fx;

extern const Word16 defaultHRIR_rom_AlphaL48_fx[470 * 128]; /*Q30*/

extern const Word16 defaultHRIR_rom_AlphaR48_fx[470 * 128]; /*Q30*/

extern const Word16 defaultHRIR_rom_Alpha32_Q_fx;

extern const Word16 defaultHRIR_rom_AlphaL32_fx[470 * 86]; /*Q30*/

extern const Word16 defaultHRIR_rom_AlphaR32_fx[470 * 86]; /*Q30*/

extern const Word16 defaultHRIR_rom_Alpha16_Q_fx;

extern const Word16 defaultHRIR_rom_AlphaL16_fx[470 * 43]; /*Q30*/

extern const Word16 defaultHRIR_rom_AlphaR16_fx[470 * 43]; /*Q30*/

extern const Word16 defaultHRIR_rom_E48_Q_fx;

extern const Word32 defaultHRIR_rom_EL48_fx[HRTF_MODEL_N_SECTIONS * 470]; /*Q28*/

extern const Word32 defaultHRIR_rom_ER48_fx[HRTF_MODEL_N_SECTIONS * 470]; /*Q28*/

extern const Word16 defaultHRIR_rom_E32_Q_fx;

extern const Word32 defaultHRIR_rom_EL32_fx[HRTF_MODEL_N_SECTIONS * 470]; /*Q28*/

extern const Word32 defaultHRIR_rom_ER32_fx[HRTF_MODEL_N_SECTIONS * 470]; /*Q28*/

extern const Word16 defaultHRIR_rom_E16_Q_fx;

extern const Word32 defaultHRIR_rom_EL16_fx[HRTF_MODEL_N_SECTIONS * 470]; /*Q28*/

extern const Word32 defaultHRIR_rom_ER16_fx[HRTF_MODEL_N_SECTIONS * 470]; /*Q28*/

extern const Word16 defaultHRIR_rom_elevBsShape_Q_fx;

extern const Word16 defaultHRIR_rom_elevBsShape_fx[36]; /*Q30*/

extern const Word16 defaultHRIR_rom_elevBsLen[4];

extern const Word16 defaultHRIR_rom_elevBsStart[4];

extern const Word16 defaultHRIR_rom_elevBsShape_Q_fx;

extern const Word16 defaultHRIR_rom_elevBsShape_fx[36]; /*Q30*/

extern const Word16 defaultHRIR_rom_azimBsShape_Q_fx;

extern const Word16 defaultHRIR_rom_azimBsShape_fx[21]; /*Q30*/



extern const Word16 defaultHRIR_rom_ITD_W_Q_fx;

extern const Word16 defaultHRIR_rom_ITD_W_fx[658];

extern const Word16 defaultHRIR_rom_ITD_azimBsShape_Q_fx;

extern const Word16 defaultHRIR_rom_ITD_azimBsShape_fx[84];

extern const Word16 defaultHRIR_rom_ITD_azimKSeq_Q_fx;

extern const Word16 defaultHRIR_rom_ITD_azimKSeq_fx[19];

extern const Word16 defaultHRIR_rom_ITD_elevBsShape_Q_fx;

extern const Word16 defaultHRIR_rom_ITD_elevBsShape_fx[28];

extern const Word16 defaultHRIR_rom_ITD_elevKSeq_Q_fx;

extern const Word16 defaultHRIR_rom_ITD_elevKSeq_fx[16];

extern const Word16 defaultHRIR_rom_ITD_model_configuration[4];

extern const Word16 defaultHRIR_rom_ITD_elevBsLen[4];

extern const Word16 defaultHRIR_rom_ITD_elevBsStart[4];

extern const Word16 defaultHRIR_rom_ITD_azimBsLen[4];

extern const Word16 defaultHRIR_rom_ITD_azimBsStart[4];



#else /* USE_TDREND_16BIT_ROM */



extern const Word32 defaultHRIR_rom_latency_s_fx; /* Q31 */

#ifdef FIX_989_TD_REND_ROM

extern const Word16 defaultHRIR_rom_model_configuration[6];
@@ -86,4 +143,5 @@ extern const Word16 defaultHRIR_rom_ITD_elevBsStart[4]; 
extern const Word16 defaultHRIR_rom_ITD_azimBsLen[4];

extern const Word16 defaultHRIR_rom_ITD_azimBsStart[4];

#endif

#endif /* USE_TDREND_16BIT_ROM */

#endif

lib_rend/ivas_rom_TdBinauralRenderer_fx.c

+10167 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_binauralRenderer.h

+66 −1
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 


*******************************************************************************************************/



#ifndef _IVAS_ROM_BINAURAL_RENDERER_

#define _IVAS_ROM_BINAURAL_RENDERER_



#include <stdint.h>

#include "options.h"

#include "cnst.h"
@@ -39,8 +42,66 @@ 
 * Binaural rendering related ROM tables

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



#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM



extern const Word16 FASTCONV_factor_Q_HRIR_latency_s_fx;

extern const Word16 FASTCONV_factor_Q_FOA_latency_s_fx;

extern const Word16 FASTCONV_factor_Q_HOA2_latency_s_fx;

extern const Word16 FASTCONV_factor_Q_HOA3_latency_s_fx;

extern const Word16 FASTCONV_factor_Q_HRIR_fx;

extern const Word16 FASTCONV_factor_Q_FOA_fx;

extern const Word16 FASTCONV_factor_Q_HOA2_fx;

extern const Word16 FASTCONV_factor_Q_HOA3_fx;

extern const Word16 FASTCONV_factor_Q_BRIR_fx;

extern const Word16 FASTCONV_factor_Q_reverberationTimes_fx;

extern const Word16 FASTCONV_factor_Q_reverberationEneCorrections_fx;

extern const Word16 hrtfShCoeffs_factorQ_fx;

extern const Word16 parametricReverberationTimes_factorQ_fx;

extern const Word16 parametricReverberationEneCorrections_factorQ_fx;

extern const Word16 parametricEarlyPartEneCorrection_factorQ_fx;

extern Word16 leftHRIRReal_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];  /* Q29 */

extern Word16 leftHRIRImag_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];  /* Q29 */

extern Word16 rightHRIRReal_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA]; /* Q29 */

extern Word16 rightHRIRImag_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA]; /* Q29 */

extern Word16 leftHRIRReal_HOA2_fx[BINAURAL_CONVBANDS][HOA2_CHANNELS][BINAURAL_NTAPS_SBA];  /* Q29 */

extern Word16 leftHRIRImag_HOA2_fx[BINAURAL_CONVBANDS][HOA2_CHANNELS][BINAURAL_NTAPS_SBA];  /* Q29 */

extern Word16 rightHRIRReal_HOA2_fx[BINAURAL_CONVBANDS][HOA2_CHANNELS][BINAURAL_NTAPS_SBA]; /* Q29 */

extern Word16 rightHRIRImag_HOA2_fx[BINAURAL_CONVBANDS][HOA2_CHANNELS][BINAURAL_NTAPS_SBA]; /* Q29 */

extern Word16 leftHRIRReal_FOA_fx[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_SBA];    /* Q29 */

extern Word16 leftHRIRImag_FOA_fx[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_SBA];    /* Q29 */

extern Word16 rightHRIRReal_FOA_fx[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_SBA];   /* Q29 */

extern Word16 rightHRIRImag_FOA_fx[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_SBA];   /* Q29 */

extern Word16 leftHRIRReal_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];        /* Q29 */

extern Word16 leftHRIRImag_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];        /* Q29 */

extern Word16 rightHRIRReal_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];       /* Q29 */

extern Word16 rightHRIRImag_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];       /* Q29 */

extern Word16 hrtfShCoeffsRe_fx[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];        /* Q14 */

extern Word16 hrtfShCoeffsIm_fx[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];        /* Q14 */



extern Word32 FASTCONV_HOA3_latency_s_fx;

extern Word32 FASTCONV_HOA2_latency_s_fx;

extern Word32 FASTCONV_FOA_latency_s_fx;

/* Binaural rendering data set based on HRIRs */

extern const Word32 FASTCONV_HRIR_latency_s_fx;

/* Binaural rendering data set based on BRIRs */

extern const Word32 FASTCONV_BRIR_latency_s_fx;

extern const Word16 FASTCONV_factor_Q_BRIR_latency_s_fx;

extern Word16 leftBRIRReal_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX];  /* Q29 */

extern Word16 leftBRIRImag_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX];  /* Q29 */

extern Word16 rightBRIRReal_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; /* Q29 */

extern Word16 rightBRIRImag_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; /* Q29 */

/* Reverberation parameters based on BRIRs for fastconv */

extern Word16 fastconvReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX];          /* Q31 */

extern Word16 fastconvReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]; /* Q31 */



/* Binaural rendering data set based on BRIRs, to be used in a combined manner

 * with the above binaural rendering data set based on HRIRs for parametric

 * renderer */

extern const Word16 parametricReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX];          /* Q31 */

extern const Word16 parametricReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]; /* Q31 */

extern const Word16 parametricEarlyPartEneCorrection_fx[CLDFB_NO_CHANNELS_MAX];      /* Q28 */



#else

extern Word32 leftHRIRReal_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];  /* Q29 */

extern Word32 leftHRIRImag_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];  /* Q29 */

extern Word32 rightHRIRReal_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA]; /* Q29 */
@@ -63,7 +124,8 @@ extern Word32 FASTCONV_FOA_latency_s_fx; 
extern Word16 hrtfShCoeffsRe_fx[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; /* Q14 */

extern Word16 hrtfShCoeffsIm_fx[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; /* Q14 */





/* Binaural rendering data set based on HRIRs */

extern const Word32 FASTCONV_HRIR_latency_s_fx;

/* Binaural rendering data set based on BRIRs */

extern const Word32 FASTCONV_BRIR_latency_s_fx;

extern Word32 leftBRIRReal_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX];  /* Q29 */
@@ -81,3 +143,6 @@ extern Word32 fastconvReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]; /* 
extern const Word32 parametricReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX];          /* Q26 */

extern const Word32 parametricReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]; /* Q31 */

extern const Word32 parametricEarlyPartEneCorrection_fx[CLDFB_NO_CHANNELS_MAX];      /* Q28 */



#endif

#endif /* _IVAS_ROM_BINAURAL_RENDERER_ */

lib_rend/ivas_rom_binauralRenderer_fx.c

+47464 −0

File changed.

Preview size limit exceeded, changes collapsed.