Commit 4c0c556b authored by vaclav's avatar vaclav
Browse files

define BINAURAL_INPUT_AUDIO_CONFIG enum only at one place

parent 245b6294

lib_util/hrtf_file_reader.c

+0 −13
Original line number Diff line number Diff line
@@ -56,19 +56,6 @@ typedef struct ivas_hrtfs_file_header_t 


} ivas_hrtfs_file_header_t;



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

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 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA3,     /* HOA3 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA2,     /* HOA2 */

    BINAURAL_INPUT_AUDIO_CONFIG_FOA,      /* FOA */

    BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */



} BINAURAL_INPUT_AUDIO_CONFIG;



#endif



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

 * hrtfFileReader_open()

lib_util/hrtf_file_reader.h

+15 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


#include "common_api_types.h"





typedef struct hrtfFileReader hrtfFileReader;



typedef enum
@@ -47,8 +48,22 @@ typedef enum 
    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV,

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM,

    HRTF_READER_RENDERER_BINAURAL_REVERB_ALL



} HRTF_READER_RENDERER_TYPE;



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

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 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA3,     /* HOA3 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA2,     /* HOA2 */

    BINAURAL_INPUT_AUDIO_CONFIG_FOA,      /* FOA */

    BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */



} BINAURAL_INPUT_AUDIO_CONFIG;



#endif

typedef struct ivas_hrtfs_header_t

{

    int32_t rend_type;

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+0 −15
Original line number Diff line number Diff line
@@ -73,21 +73,6 @@ const HRTF_READER_RENDERER_TYPE rend_types[IVAS_NB_RENDERER_TYPE] = { 
    HRTF_READER_RENDERER_BINAURAL_REVERB_ALL

};



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

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 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA3,     /* HOA3 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA2,     /* HOA2 */

    BINAURAL_INPUT_AUDIO_CONFIG_FOA,      /* FOA */

    BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */



} BINAURAL_INPUT_AUDIO_CONFIG;



#endif





const BINAURAL_INPUT_AUDIO_CONFIG input_cfgs[IVAS_NB_AUDIO_CONFIG] = {

    BINAURAL_INPUT_AUDIO_CONFIG_COMBINED,

    BINAURAL_INPUT_AUDIO_CONFIG_HOA3,