Commit 03fda937 authored by emerit's avatar emerit
Browse files

on going

parent 26346aad

lib_util/hrtf_file_reader.c

+5 −4
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ typedef struct ivas_hrtfs_file_header_t 


#define RESAMPLE_FACTOR_16_48    ( 16.0f / 48.0f )

#define RESAMPLE_FACTOR_32_48    ( 32.0f / 48.0f )

#define DEFAULT_BIN_FILE_FX_FLAG 0x1000



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

 * Local function declarations
@@ -233,10 +234,10 @@ static ivas_error read_hrtf_binary_header( 
    *is_fix_point = 0;

    if ( ( fread( &( hrtf_header->rend_type ), sizeof( int32_t ), 1, f_hrtf ) == 1 ) && ( fread( &( hrtf_header->input_cfg ), sizeof( int32_t ), 1, f_hrtf ) == 1 ) && ( fread( &( hrtf_header->frequency ), sizeof( int32_t ), 1, f_hrtf ) == 1 ) && ( fread( &( hrtf_header->data_size ), sizeof( int32_t ), 1, f_hrtf ) == 1 ) )

    {

        if ( hrtf_header->rend_type & 0x1000 )

        if ( hrtf_header->rend_type & DEFAULT_BIN_FILE_FX_FLAG )

        {

            *is_fix_point = 1;

            hrtf_header->rend_type = hrtf_header->rend_type - 0x1000;

            hrtf_header->rend_type = hrtf_header->rend_type - DEFAULT_BIN_FILE_FX_FLAG;

        }

        return IVAS_ERR_OK;

    }

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+4 −1
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ 


#define DEFAULT_BIN_FILE_EXT ".bin"



#define DEFAULT_BIN_FILE_FX_FLAG 0x1000





#define IVAS_NB_RENDERER_TYPE 7

#define IVAS_NB_AUDIO_CONFIG  4

#define IVAS_NB_SAMPLERATE    3
@@ -707,7 +710,7 @@ char *create_hrtf_crend( HRTF_READER_RENDERER_TYPE rend_type, BINAURAL_INPUT_AUD 
        // Get the HRTF header



        // Renderer type

        rend_type = rend_type + 0x1000;

        rend_type = rend_type + DEFAULT_BIN_FILE_FX_FLAG;

        memcpy( mixerconv_hrtf_wptr, &( rend_type ), sizeof( int32_t ) );

        mixerconv_hrtf_wptr += sizeof( int32_t );

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+316 −19

File changed.

Preview size limit exceeded, changes collapsed.

scripts/binauralRenderer_interface/generate_ivas_binauralizer_tables_from_sofa.m

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ if generateCustomBinaryFile 
else 

    hrir_file_name_init = 'HRIR_128_Meth5_IRC_53_Q10_symL_Itrp1_48000.sofa';

    hrir_file_name = 'HRIR_128_Meth5_IRC_53_Q10_symL_Itrp1_48000.sofa';

    output_bin_name = 'ivas_binaural';

    output_bin_name = 'ivas_binaural_fx';

end

brir_file_name = 'IIS_BRIR_officialMPEG_Combined.sofa';

hrir_path = fullfile ('.','HRIRs_sofa');

tests/hrtf_binary_loading/constants.py

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ RENDERER_CMD = [str(TESTS_DIR.parent.parent.joinpath("IVAS_rend"))] 
HRTF_BINARY_FILE_SAME_AS_ROM = "ivas_binaural_fx_{}kHz.bin"

HRTF_BINARY_FILE_DIFF_FROM_ROM = "ivas_binaural_51_brir-lc_{}kHz.bin"

HRTF_FILES = [HRTF_BINARY_FILE_SAME_AS_ROM, HRTF_BINARY_FILE_DIFF_FROM_ROM]

DEFAULT_BIN_FILE_FX_FLAG = 0x1000



HRTF_TAG_SAME_AS_ROM = "hrtf_same_as_rom"

HRTF_TAG_DIFF_FROM_ROM = "hrtf_diff_from_rom"