Commit 17aeed49 authored by emerit's avatar emerit
Browse files

minor change to make matlab scripts generating rom tables running

parent 8cb72a92

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+5 −21
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 




#define FILE_HEADER

#define PARAMBIN_FILE_312



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

 * Constants
@@ -69,8 +68,7 @@ const RENDERER_TYPE rend_types[IVAS_NB_RENDERER_TYPE] = { 
    RENDERER_BINAURAL_PARAMETRIC,

    RENDERER_BINAURAL_MIXER_CONV,

    RENDERER_BINAURAL_MIXER_CONV_ROOM,

    RENDERER_BINAURAL_OBJECTS_TD,

    RENDERER_BINAURAL_REVERB_ALL

    RENDERER_BINAURAL_OBJECTS_TD

};



const BINAURAL_INPUT_AUDIO_CONFIG input_cfgs[IVAS_NB_AUDIO_CONFIG] = {
@@ -203,12 +201,6 @@ char *input_mixerconv_bin_brir_path = NULL; 
char *input_mixerconv_bin_hrir_file_name = NULL;

char *input_mixerconv_bin_brir_file_name = NULL;



#ifdef PARAMBIN_FILE_312

char *input_parambin_path = NULL;

char *input_parambin_file_name = NULL;

char *full_in_parambin_path = NULL;

#endif



int16_t nb_freq = IVAS_NB_SAMPLERATE;

const int32_t *freq_ptr = sample_rates;
@@ -1133,14 +1125,6 @@ char *create_hrtf_parametric( int32_t *hrtf_size ) 
    sprintf( full_in_param_bin_path, "%s/%s", input_param_bin_path, input_param_bin_file_name );

#endif



    float hrtfShCoeffsReFile[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];

    float hrtfShCoeffsImFile[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];



    float parametricReverberationTimesFile[CLDFB_NO_CHANNELS_MAX];

    float parametricReverberationEneCorrectionsFile[CLDFB_NO_CHANNELS_MAX];

    float parametricEarlyPartEneCorrectionFile[CLDFB_NO_CHANNELS_MAX];



    FILE *input_parambin_file = NULL;

    hrtf_data_size = 0;



    /* Binary file - block description :

scripts/binauralRenderer_interface/generate_ivas_binauralizer_tables_from_sofa.m

+1 −7
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ addpath(genpath('../td_object_renderer/modeling_tool/')); 


%% Set arguments

writeRomFileOutput = true; %% generation of rom files if true

writeBinaryOutput = true; %% generation of binary files if true. Always true for TD renderer

writeBinaryOutput = false; %% generation of binary files if true. Always true for TD renderer

writeEachRendererBinaryOutput = true; %% generation of binary split files each containing binary data for individual renderer 



%% Set ivas root path
@@ -98,8 +98,6 @@ if writeBinaryOutput == true 
end



command = [command ...

                    ' -compute_reverb_rom ' ...

                    hrir_file ' ' ...

                    ' 5 ' ...

                    hrir_file ' ' ...

                    erase(hrir_file,'.sofa') '_FOA.sofa ' ...
@@ -175,8 +173,6 @@ if writeBinaryOutput == true 
                    ' -input_mixerconv_hrir_file_name ' binary_name ...

                    ' -input_mixerconv_brir_file_path ' binary_path ...

                    ' -input_mixerconv_brir_file_name ' binary_name ...

                    ' -input_reverb_file_path ' binary_path ...

                    ' -input_reverb_file_name ' binary_name ...

                    ' -input_td_file_path ' fullfile(binary_path, 'IVAS_default') ...

                    ' -input_td_file_name ' td_binary_file ...

                    ' -input_param_file_path ' binary_path ...
@@ -204,8 +200,6 @@ if writeBinaryOutput == true && writeEachRendererBinaryOutput == true 
                " -input_mixerconv_hrir_file_name " binary_name , ...

                " -input_mixerconv_brir_file_path " binary_path ...

                " -input_mixerconv_brir_file_name " binary_name ,...

                " -input_reverb_file_path " binary_path ...

                " -input_reverb_file_name " binary_name ,...

                " -input_td_file_path " fullfile(binary_path, 'IVAS_default') ...

                " -input_td_file_name " td_binary_file ,...

                " -input_param_file_path " binary_path ...

scripts/binauralRenderer_interface/matlab_hrir_generation_scripts/generate_HOA_HRIRs_MOD_lens.m

+0 −3
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ Vs_hi_res = load("sphere_packing_2562.mat"); 
Vs_hi_res = Vs_hi_res.Vs_hi_res;

N = 512;



% Fetch the HRTFs, and figure out the ITD for every direction

% name = ['HRIR_', num2str(ir_len), '_Meth5_IRC_53_Q10_symL_Itrp1_48000'];

H = hrtf_library_loader();

H.readSOFA(char(fullfile(sofa_path, sofa_file_name)));
@@ -116,7 +114,6 @@ IR_HOA = IR_HOA(:,1:ir_len,:) .* sin(interp1([0,150/192*ir_len,ir_len+1],[1,1,0] 


IR = permute(IR_HOA, [2, 1, 3]);

HOAformat_str = ['HOA',num2str(order),'S'];

% save(fullfile(erase(sofa_file_name, ".sofa") + "_converted_" +  HOAformat_str + ".mat"), "IR")



IR_data = IR;

scripts/binauralRenderer_interface/matlab_hrir_generation_scripts/hrtf_library_loader.m

+0 −5
Original line number Diff line number Diff line
@@ -181,11 +181,6 @@ classdef hrtf_library_loader < handle 
            IR = permute(cat(3,HRTF_L,HRTF_R),[1,3,2]);

        end

        

        function IR = XYZ_to_IR_SD( this, XYZ )

            [HRTF_L, HRTF_R] = this.getHRTF_SD(XYZ);

            IR = permute(cat(3,HRTF_L,HRTF_R),[1,3,2]);

        end

        

        function discrete_HRTFs = get_Discrete_HRTFs(this)

            discrete_HRTFs = this.Discrete_HRTFs;

        end