Commit b50ec406 authored by emerit's avatar emerit
Browse files

merge with branch FhG/hrtf_binary_fasct_conf

parent 75d9b99f

lib_com/ivas_cnst.h

+6 −0
Original line number Diff line number Diff line
@@ -1448,7 +1448,13 @@ typedef enum 
{

    BINAURAL_INPUT_AUDIO_CONFIG_INVALID,

    BINAURAL_INPUT_AUDIO_CONFIG_COMBINED,       /* 5_1, 5_1_2, 5_1_4, 7_1, 7_1_4 */

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS    

    BINAURAL_INPUT_AUDIO_CONFIG_HOA3,            /*  HOA3 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA2,            /* HOA2 */

    BINAURAL_INPUT_AUDIO_CONFIG_FOA,            /* FOA */

#else    

    BINAURAL_INPUT_AUDIO_CONFIG_HOA,            /* FOA, HOA2, HOA3 */

#endif    

    BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED       /* Not used */



} BINAURAL_INPUT_AUDIO_CONFIG;

lib_rend/ivas_rom_binauralRenderer.h

+10 −0
Original line number Diff line number Diff line
@@ -48,6 +48,16 @@ extern float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NT 
extern float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];

extern float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];

extern float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

extern float leftHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS];

extern float leftHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS];

extern float rightHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS];

extern float rightHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS];

extern float leftHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS];

extern float leftHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS];

extern float rightHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS];

extern float rightHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS];

#endif



extern float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];

extern float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];