Commit 93ef7ba8 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

consolidate HRTF_BINARY_[FASTCONV|PARAM] switches into HRTF_BINARY_FILE

parent 0cd6c866

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -509,8 +509,6 @@ int main( 
            fprintf( stderr, "\nError in loading HRTF binary file %s for CRend \n\n", arg.hrtfCRendFileName );

            goto cleanup;

        }

#endif

#ifdef HRTF_BINARY_FASTCONV

        IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv;

        IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv );
@@ -518,8 +516,6 @@ int main( 
        {

            fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfCRendFileName );

        }

#endif

#ifdef HRTF_BINARY_PARAM

        IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin;

        IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin );

lib_com/common_api_types.h

+1 −3
Original line number Diff line number Diff line
@@ -96,11 +96,9 @@ typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE; 
#ifdef HRTF_BINARY_FILE

typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;

#endif

#ifdef HRTF_BINARY_FASTCONV

#ifdef HRTF_BINARY_FILE

typedef struct ivas_hrtfs_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;

#endif



#ifdef HRTF_BINARY_PARAM

typedef struct ivas_hrtfs_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;

#endif

lib_com/ivas_cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -1353,14 +1353,14 @@ typedef enum 


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

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

#ifdef HRTF_BINARY_FASTCONV

#ifdef HRTF_BINARY_FILE

#define BINAURAL_NTAPS                           7

#endif

#define BINAURAL_NTAPS_MAX                      96



#define HRTF_SH_ORDER                           3

#define HRTF_SH_CHANNELS                        16

#ifdef HRTF_BINARY_FASTCONV

#ifdef HRTF_BINARY_FILE

#define HRTF_LS_CHANNELS                        15

#endif

#define HRTF_NUM_BINS                           60

lib_com/ivas_prot.h

+7 −12
Original line number Diff line number Diff line
@@ -3253,7 +3253,7 @@ void ivas_dirac_dec( 
    const int16_t i_sf

);



#ifdef HRTF_BINARY_PARAM

#ifdef HRTF_BINARY_FILE

ivas_error ivas_dirac_dec_init_binaural_data(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */

    HRTFS_PARAMBIN_HANDLE hHrtfParambin                         /* i  : HRTF structure for rendering            */
@@ -3268,7 +3268,7 @@ void ivas_dirac_dec_close_binaural_data( 
    DIRAC_DEC_BIN_HANDLE *hBinaural                             /* i/o: decoder DirAC binaural data handle      */

);



#ifdef HRTF_BINARY_PARAM

#ifdef HRTF_BINARY_FILE

ivas_error ivas_dirac_dec_binaural_copy_hrtfs(

    HRTFS_PARAMBIN_HANDLE *hHrtfParambin                        /* i/o: HRTF structure for rendering            */

);
@@ -3288,12 +3288,9 @@ ivas_error ivas_binaural_reverb_open( 
    const AUDIO_CONFIG output_config,                           /* i  : output audio configuration              */

    const int32_t sampling_rate,                                /* i  : sampling rate                           */

    const RENDERER_TYPE renderer_type                           /* i  : renderer type                           */

#ifdef HRTF_BINARY_FASTCONV

    ,

    const HRTFS_FASTCONV_HANDLE hHrtfFastConv                   /* i  : FastConv HRTF handle                    */

#endif

#ifdef HRTF_BINARY_PARAM

#ifdef HRTF_BINARY_FILE

    ,

    const HRTFS_FASTCONV_HANDLE hHrtfFastConv,                  /* i  : FastConv HRTF handle                    */

    const HRTFS_PARAMBIN_HANDLE hHrtfParambin                   /* i  : Parametric binauralizer HRTF handle     */

#endif

);
@@ -4565,7 +4562,7 @@ void ivas_binaural_add_LFE( 
    float output_f[][L_FRAME48k]                                /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#ifdef HRTF_BINARY_FASTCONV

#ifdef HRTF_BINARY_FILE

ivas_error ivas_HRTF_fastconv_binary_open(

    HRTFS_FASTCONV **hHrtfFastConv                              /* i/o: FASTCONV HRTF structure */

);
@@ -4573,9 +4570,7 @@ ivas_error ivas_HRTF_fastconv_binary_open( 
void ivas_HRTF_fastconv_binary_close(

    HRTFS_FASTCONV **hHrtfFastConv                              /* i/o: FASTCONV HRTF structure */

);

#endif



#ifdef HRTF_BINARY_PARAM

ivas_error ivas_HRTF_parambin_binary_open(

    HRTFS_PARAMBIN **hHrtfParambin                              /* i/o: Parametric binauralizer HRTF structure */

);
@@ -5584,7 +5579,7 @@ void ivas_reverb_calc_color_levels( 


void ivas_reverb_prepare_cldfb_params(

    ivas_roomAcoustics_t *pInput_params,

#ifdef HRTF_BINARY_FASTCONV

#ifdef HRTF_BINARY_FILE

    const HRTFS_FASTCONV_HANDLE hHrtfFastConv,

#endif

    const AUDIO_CONFIG input_audio_config,

lib_com/options.h

+0 −4
Original line number Diff line number Diff line
@@ -178,10 +178,6 @@ 




#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */

#ifdef HRTF_BINARY_FILE

#define HRTF_BINARY_FASTCONV                            /* Enable loading HRTF tables from file for FastConv renderer */

#define HRTF_BINARY_PARAM                               /* Enable loading HRTF tables from file for Parametric renderer */

#endif



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

/* clang-format on */