Commit af1c179c authored by emerit's avatar emerit
Browse files

fix adams comments

parent 7141aa98

scripts/binauralRenderer_interface/matlab_hrir_generation_scripts/SD_2_ROM.m

+0 −49
Original line number Diff line number Diff line
@@ -70,53 +70,4 @@ IR_cldfb = IR_cldfb(:,1:max_band,:,:); 
FastConv_SD_IR.IR = IR_cldfb;

FastConv_SD_IR.latency_s = latency_s;



% if ~exist('rom_c_file','var') || isempty(rom_c_file)

%    rom_c_file = [thispath,'ivas_rom_binauralRenderer_combined.c']; % fullfile(thispath,'..','..','..','lib_rend',['ivas_rom_binauralRenderer_',order,'.c']);

% end



% fid = fopen(rom_c_file,'wt');



% fprintf(fid, 'const float FASTCONV_HRIR_latency_s = %10.9ff;\n', latency_s);

% write_one_ear( fid, 'const float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]=', real(IR_cldfb(1,:,:,:)));

% write_one_ear( fid, 'const float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]=', imag(IR_cldfb(1,:,:,:)));

% write_one_ear( fid, 'const float rightHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]=', real(IR_cldfb(2,:,:,:)));

% write_one_ear( fid, 'const float rightHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]=', imag(IR_cldfb(2,:,:,:)));



% fclose(fid);



% function write_one_ear( fid, first_line, IR_cldfb_rom)

% IR_cldfb_rom = squeeze(IR_cldfb_rom);

% [num_bands,num_chans, num_taps] = size(IR_cldfb_rom);

% num_spaces = 4;

% num_spaces_cur = 0;

% fprintf(fid,[first_line,'\n{\n']);

% num_spaces_cur = num_spaces_cur + num_spaces;

% for band = 1:num_bands

%    fprintf(fid,[blanks(num_spaces_cur),'{\n']);

%    num_spaces_cur = num_spaces_cur + num_spaces;

%    for chan = 1:num_chans

%       fprintf(fid,[blanks(num_spaces_cur),'{']);

%       for tap = 1:num_taps

%          if tap == num_taps

%             fprintf(fid,'%+ff',IR_cldfb_rom(band,chan,tap));

%          else

%             fprintf(fid,'%+ff, ',IR_cldfb_rom(band,chan,tap));

%          end

%       end

%       if chan == num_chans

%          fprintf(fid,'}\n');

%       else

%          fprintf(fid,'},\n');

%       end

%    end

%    num_spaces_cur = num_spaces_cur - num_spaces;

%    if band == num_bands

%       fprintf(fid,[blanks(num_spaces_cur),'}\n']);

%    else

%       fprintf(fid,[blanks(num_spaces_cur),'},\n']);

%    end

% end

% fprintf(fid,'};\n\n');



% end

end
 
 No newline at end of file

scripts/binauralRenderer_interface/matlab_hrir_generation_scripts/SHD_2_ROM.m

+3 −50
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
%

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

function FastConv_SHD_IR = SHD_2_ROM( sofa_file, ambi_order, hrir_len )

% SHD_2_ROM( rom_c_file, sofa_file, ambisonics_order, hrir_length )

% SHD_2_ROM( sofa_file, ambisonics_order, hrir_length )

%

% - converts sphere-sampled Head Related Impulse Responses (HRIRs) given in sofa_file 

%   to the Spherical Harmonics domain (SHD) using generate_HOA_HRIRs_MOD_lens.m
@@ -79,52 +79,5 @@ end 
FastConv_SHD_IR.IR = IR_cldfb_rom;

FastConv_SHD_IR.latency_s = latency_s;

FastConv_SHD_IR.order = order;

% if ~exist('rom_c_file','var') || isempty(rom_c_file)

%    rom_c_file = [thispath,'ivas_rom_binauralRenderer_',order,'.c']; % fullfile(thispath,'..','..','..','lib_rend',['ivas_rom_binauralRenderer_',order,'.c']);

% end

         

% fid = fopen(rom_c_file,'wt');



% fprintf(fid, ['const float FASTCONV_' order '_latency_s = %10.9ff;\n'], latency_s);

% write_one_ear( fid, ['const float leftHRIRReal_' order '[BINAURAL_CONVBANDS][' order '_CHANNELS][BINAURAL_NTAPS_SBA]='], real(IR_cldfb_rom(1,:,:,:)));

% write_one_ear( fid, ['const float leftHRIRImag_' order '[BINAURAL_CONVBANDS][' order '_CHANNELS][BINAURAL_NTAPS_SBA]='], imag(IR_cldfb_rom(1,:,:,:)));

% write_one_ear( fid, ['const float rightHRIRReal_' order '[BINAURAL_CONVBANDS][' order '_CHANNELS][BINAURAL_NTAPS_SBA]='], real(IR_cldfb_rom(2,:,:,:)));

% write_one_ear( fid, ['const float rightHRIRImag_' order '[BINAURAL_CONVBANDS][' order '_CHANNELS][BINAURAL_NTAPS_SBA]='], imag(IR_cldfb_rom(2,:,:,:)));



% fclose(fid);



% function write_one_ear( fid, first_line, IR_cldfb_rom)

% IR_cldfb_rom = squeeze(IR_cldfb_rom);

% [num_bands,num_chans, num_taps] = size(IR_cldfb_rom);

% num_spaces = 4;

% num_spaces_cur = 0;

% fprintf(fid,[first_line,'\n{\n']);

% num_spaces_cur = num_spaces_cur + num_spaces;

% for band = 1:num_bands

%    fprintf(fid,[blanks(num_spaces_cur),'{\n']);

%    num_spaces_cur = num_spaces_cur + num_spaces;

%    for chan = 1:num_chans

%       fprintf(fid,[blanks(num_spaces_cur),'{']);

%       for tap = 1:num_taps

%          if tap == num_taps

%             fprintf(fid,'%+ff',IR_cldfb_rom(band,chan,tap));

%          else

%             fprintf(fid,'%+ff, ',IR_cldfb_rom(band,chan,tap));

%          end

%       end

%       if chan == num_chans

%          fprintf(fid,'}\n');

%       else

%          fprintf(fid,'},\n');

%       end

%    end

%    num_spaces_cur = num_spaces_cur - num_spaces;

%    if band == num_bands

%       fprintf(fid,[blanks(num_spaces_cur),'}\n']);

%    else

%       fprintf(fid,[blanks(num_spaces_cur),'},\n']);

%    end

% end

% fprintf(fid,'};\n\n');

% end

end