Commit 5714ab5e authored by emerit's avatar emerit
Browse files

improve merge with float version

parent 73eeb573

lib_util/hrtf_file_reader.c

+172 −555

File changed.

Preview size limit exceeded, changes collapsed.

lib_util/hrtf_file_reader.h

+3 −34
Original line number Diff line number Diff line
@@ -35,25 +35,19 @@ 


#include "common_api_types.h"





typedef struct hrtfFileReader hrtfFileReader;



#ifdef FIX_POINT_HRTF_FILE_FORMAT

typedef enum

{

    HRTF_READER_RENDERER_BINAURAL_INVALID,

    HRTF_READER_RENDERER_BINAURAL_FASTCONV,

    HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM,

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC,

#ifndef FIX_POINT_HRTF_FILE_FORMAT

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM

#endif

    HRTF_READER_RENDERER_BINAURAL_OBJECTS_TD,

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV,

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM,

    HRTF_READER_RENDERER_BINAURAL_REVERB_ALL

} HRTF_READER_RENDERER_TYPE;

#endif



typedef struct ivas_hrtfs_header_t

{
@@ -96,7 +90,6 @@ ivas_error load_HRTF_binary( 
    const hrtfFileReader *hrtfReader /* i/o: pointer to hrtfFileReader handle    */

);



#ifdef FIX_POINT_HRTF_FILE_FORMAT

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

 * load_reverb_from_binary()

 *
@@ -108,9 +101,6 @@ ivas_error load_reverb_binary( 
    int32_t sampleRate,                              /* i  : sample rate                         */

    const hrtfFileReader *hrtfReader                 /* i/o: pointer to hrtfFileReader handle    */

);

#endif





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

 * create_SetOfHRTF_from_binary()

 *
@@ -123,21 +113,15 @@ ivas_error create_SetOfHRTF_from_binary( 
    int32_t output_Fs                      /* i  : Output sampling frequency            */

);





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

 * destroy_SetOfHRTF()

 *

 * Destroy the HRTF data set.

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

#ifdef FIX_POINT_HRTF_FILE_FORMAT



void destroy_SetOfHRTF(

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF /* i/o: Set of HRTF CRend handle              */

);

#else

ivas_error destroy_SetOfHRTF(

    IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF /* i/o: Set of HRTF CRend handle              */

);

#endif





/*---------------------------------------------------------------------*
@@ -151,7 +135,6 @@ ivas_error load_fastconv_HRTF_from_binary( 
    const hrtfFileReader *hrtfReader             /* i  : pointer to hrtfFileReader handle */

);



#ifdef FIX_POINT_HRTF_FILE_FORMAT

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

 * destroy_fastconv_hrtf()

 *
@@ -161,7 +144,6 @@ ivas_error load_fastconv_HRTF_from_binary( 
void destroy_fastconv_hrtf(

    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv /* i/o: FastConv HRTF handle               */

);

#endif



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

 * load_parambin_HRTF_from_binary()
@@ -175,7 +157,6 @@ ivas_error load_parambin_HRTF_from_binary( 
);





#ifdef FIX_POINT_HRTF_FILE_FORMAT

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

 * destroy_parambin_hrtf()

 *
@@ -202,20 +183,8 @@ void destroy_td_hrtf( 
 * free memory allocated for HRTF statistics binary data

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



ivas_error destroy_hrtf_statistics(

void destroy_hrtf_statistics(

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics /* i/o: HRTF statistics handle  */

);

#else

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

 * dealloc_HRTF_binary()

 *

 * Deallocated memory allocated by load_HRTF_binary

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



ivas_error dealloc_HRTF_binary(

    IVAS_DEC_HRTF_HANDLE hHrtf /* i/o: HRTF handle                         */

);



#endif



#endif /* IVAS_HRTF_FILE_READER_H */