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

[cleanup] merge USE_HRIR_128_48000_DOLBY_SBA{1,2,3} into UPDATE_SBA_FILTER

parent 7799edff

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -175,9 +175,6 @@ 
#define USE_HRIR_128_METH5_IRC_53_Q10_SYML_ITRP1_48000

#define UPDATE_SBA_FILTER

#define UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#define USE_HRIR_128_48000_DOLBY_SBA1

#define USE_HRIR_128_48000_DOLBY_SBA2

#define USE_HRIR_128_48000_DOLBY_SBA3



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_rend/ivas_rom_binauralRenderer.c

+3 −3
Original line number Diff line number Diff line
@@ -3675,7 +3675,7 @@ const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NT 














#endif



























#ifdef USE_HRIR_128_48000_DOLBY_SBA3













#ifdef UPDATE_SBA_FILTER





























const float FASTCONV_HOA3_latency_s = 0.000666667f;















const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][16][BINAURAL_NTAPS]=










@@ -7296,7 +7296,7 @@ const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][16][BINAURAL_NTAPS]=



























#endif



























#ifdef USE_HRIR_128_48000_DOLBY_SBA2













#ifdef UPDATE_SBA_FILTER





























const float FASTCONV_HOA2_latency_s = 0.000666667f;















const float leftHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]=










@@ -9517,7 +9517,7 @@ const float rightHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS]=



























#endif



























#ifdef USE_HRIR_128_48000_DOLBY_SBA1













#ifdef UPDATE_SBA_FILTER





























const float FASTCONV_FOA_latency_s = 0.000666667f;















const float leftHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]=

























lib_rend/ivas_rom_binaural_crend_head.c



+6
−6




























Original line number
Diff line number
Diff line








@@ -1605,7 +1605,7 @@ const float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,













const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL};















#endif /* UPDATE_SBA_FILTER */



























#ifdef USE_HRIR_128_48000_DOLBY_SBA1













#ifdef UPDATE_SBA_FILTER











































/********************** CRendBin_FOA_HRIR **********************/










@@ -1807,9 +1807,9 @@ const float CRendBin_FOA_HRIR_coeff_im_16kHz[4][BINAURAL_CHANNELS][80]={













};















const float *CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,NULL};















const float *CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL};













#endif /* USE_HRIR_128_48000_DOLBY_SBA1 */













#endif /* UPDATE_SBA_FILTER */



























#ifdef USE_HRIR_128_48000_DOLBY_SBA2













#ifdef UPDATE_SBA_FILTER











































/********************** CRendBin_HOA2_HRIR **********************/










@@ -2191,9 +2191,9 @@ const float CRendBin_HOA2_HRIR_coeff_im_16kHz[9][BINAURAL_CHANNELS][80]={













};















const float *CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,NULL};















const float *CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL};













#endif /* USE_HRIR_128_48000_DOLBY_SBA2 */













#endif /* UPDATE_SBA_FILTER */



























#ifdef USE_HRIR_128_48000_DOLBY_SBA3













#ifdef UPDATE_SBA_FILTER











































/********************** CRendBin_HOA3_HRIR **********************/










@@ -2827,7 +2827,7 @@ const float CRendBin_HOA3_HRIR_coeff_im_16kHz[16][BINAURAL_CHANNELS][80]={













};















const float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,NULL};















const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL};













#endif /* USE_HRIR_128_48000_DOLBY_SBA3 */













#endif /* UPDATE_SBA_FILTER */



































































lib_rend/ivas_rom_binaural_crend_head.h



+6
−6




























Original line number
Diff line number
Diff line








@@ -147,7 +147,7 @@ extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];













extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];















#endif /* UPDATE_SBA_FILTER */





























#ifdef USE_HRIR_128_48000_DOLBY_SBA1













#ifdef UPDATE_SBA_FILTER















































/********************** CRendBin_FOA_HRIR **********************/










@@ -195,9 +195,9 @@ extern float CRendBin_FOA_HRIR_coeff_re_16kHz[4][BINAURAL_CHANNELS][80];













extern float CRendBin_FOA_HRIR_coeff_im_16kHz[4][BINAURAL_CHANNELS][80];















extern float *CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];















extern float *CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];













#endif /* USE_HRIR_128_48000_DOLBY_SBA1 */













#endif /* UPDATE_SBA_FILTER */





























#ifdef USE_HRIR_128_48000_DOLBY_SBA2













#ifdef UPDATE_SBA_FILTER















































/********************** CRendBin_HOA2_HRIR **********************/










@@ -245,9 +245,9 @@ extern float CRendBin_HOA2_HRIR_coeff_re_16kHz[9][BINAURAL_CHANNELS][80];













extern float CRendBin_HOA2_HRIR_coeff_im_16kHz[9][BINAURAL_CHANNELS][80];















extern float *CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];















extern float *CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];













#endif /* USE_HRIR_128_48000_DOLBY_SBA2 */













#endif /* UPDATE_SBA_FILTER */





























#ifdef USE_HRIR_128_48000_DOLBY_SBA3













#ifdef UPDATE_SBA_FILTER















































/********************** CRendBin_HOA3_HRIR **********************/










@@ -295,7 +295,7 @@ extern float CRendBin_HOA3_HRIR_coeff_re_16kHz[16][BINAURAL_CHANNELS][80];













extern float CRendBin_HOA3_HRIR_coeff_im_16kHz[16][BINAURAL_CHANNELS][80];















extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];















extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];













#endif /* USE_HRIR_128_48000_DOLBY_SBA3 */













#endif /* UPDATE_SBA_FILTER */