Commit 70ba78ee authored by Jan Kiene's avatar Jan Kiene
Browse files

rename switch and move to right section in options.h

parent 4825557e

lib_com/ivas_cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -1519,12 +1519,12 @@ typedef enum 


#define BINAURAL_MAXBANDS                       60                          /* Max number of bands */

#define BINAURAL_CONVBANDS                      50                          /* Bands upto which convolution is performed */

#ifdef FIX_588_UPDATE_FASTCONV_SD

#ifdef NONBE_FIX_588_UPDATE_FASTCONV_SD

#define BINAURAL_NTAPS                           3

#else

#define BINAURAL_NTAPS                           5

#endif

#ifdef FIX_588_UPDATE_FASTCONV_SD

#ifdef NONBE_FIX_588_UPDATE_FASTCONV_SD

#define BINAURAL_NTAPS_SBA                       BINAURAL_NTAPS

#else

#define BINAURAL_NTAPS_SBA                       3

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ 
#define FIX_786_ERROR_ISM_METADATA_READ                 /* VA: fix error reading past the last line of .csv metadata files */



#define FIX_632_USAN_ERROR_NULL_POINTER                /* FhG: issue 632 USAN offset to null pointer proto_diffuse_buffer_f in dirac rendering*/

#define FIX_588_UPDATE_FASTCONV_SD                      /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */

/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */
@@ -193,6 +192,7 @@ 
#define NONBE_FIX_738_SBA_BR_SW_ASAN                          /* FhG: issue 738: fixes bug when switching to an MCT bitrate and previous frame was ACELP */

#define NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING             /* VA: Issue 735: Resolve "HP20 filtering bug in SBA/OSBA bitrate switching" */



#define NONBE_FIX_588_UPDATE_FASTCONV_SD                      /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */



/* ##################### End NON-BE switches ########################### */

lib_rend/ivas_rom_binauralRenderer.c

+1 −1
Original line number Diff line number Diff line
@@ -7113,7 +7113,7 @@ const float rightHRIRImag_FOA[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_S 




























const float FASTCONV_HRIR_latency_s = 0.000666667f;













#ifdef FIX_588_UPDATE_FASTCONV_SD













#ifdef NONBE_FIX_588_UPDATE_FASTCONV_SD















const float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]=















{















    {