Unverified Commit 179ae51f authored by norvell's avatar norvell
Browse files

Merge branch 'main' into... 

Merge branch 'main' into float-1573-td-renderer-distance-attenuation-uses-20-ms-instead-of-5-ms-update
float-1573-td-renderer-distance-attenuation-uses-20-ms-instead-of-5-ms-update
Please enter a commit message to explain why this merge is necessary,
parents 59f78b85 fc799a89

scripts/binauralRenderer_interface/BRIRs_sofa/BRIR_dirac_deltas.sofa

0 → 100644LFS
+131 B

File added.

No diff preview for this file type.

View file

scripts/binauralRenderer_interface/CMakeLists.txt

+4 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.10) 
project(generate_crend_ivas_tables)



#set(CMAKE_OSX_ARCHITECTURES "x86_64")

#set(CMAKE_GENERATOR_PLATFORM x64)

set(CMAKE_BUILD_TYPE "Debug")

set(IVAS_TRUNK_PATH "${PROJECT_SOURCE_DIR}/../..")

set(IVAS_TRUNK_UTIL_PATH ${IVAS_TRUNK_PATH}/lib_util)
@@ -14,6 +15,8 @@ set(IVAS_TRUNK_COM_PATH ${IVAS_TRUNK_PATH}/lib_com) 
set(IVAS_TRUNK_ISAR_PATH ${IVAS_TRUNK_PATH}/lib_isar)

set(IVAS_TRUNK_LC3_PATH ${IVAS_TRUNK_PATH}/lib_lc3plus)

set(IVAS_TRUNK_DEBUG_PATH ${IVAS_TRUNK_PATH}/lib_debug)

#set(Matlab_ROOT_DIR "/Applications/MATLAB_R2020b.app")

#find_package(Matlab REQUIRED COMPONENTS MAT_LIBRARY MX_LIBRARY)



option(USE_MATLAB_ENG "Use matlab engine" OFF) # allows to use sofa file as input to the exe, but on windows requires to register matlab as a com server type in matlab "comserver('register')""

find_package(Matlab REQUIRED)

scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_dirac_deltas.sofa

0 → 100644LFS
+131 B

File added.

No diff preview for this file type.

View file

scripts/binauralRenderer_interface/fastconv/generate_BRIR_CLDFB_FASTCONV.m

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ for chIdx = 1:size(IR_in,3) 
end



prop_time = min(min_idx) - 15;

prop_time = max(prop_time, 1); % avoid negative values

in_struct.propogationTime = prop_time;

in_struct.latency_s = (min(min_idx) - 1 - prop_time)/in_struct.fs + 31/in_struct.fs;
@@ -322,6 +323,7 @@ for chIdx = 1:input_struct.num_channels 
        for bandIdx = 1:input_struct.num_bands

            % the computation of reverb parameters starts with some overlap

            s_idx = input_struct.NFft(bandIdx)-5;

            s_idx = max(s_idx, 1);

            

            % Determine the truncation point based on noise floor estimates

            end_idx = get_truncation_point(IR_CLDFB(bandIdx,s_idx:max_index,outChIdx,chIdx));

scripts/binauralRenderer_interface/gen_hrtf_diracs.m

0 → 100644
+12 −0
Original line number Diff line number Diff line 
make_dirac('HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa', 'HRIRs_sofa/HRIR_128_dirac_deltas.sofa');

make_dirac('BRIRs_sofa/IIS_BRIR_officialMPEG_Combined.sofa', 'BRIRs_sofa/BRIR_dirac_deltas.sofa');



function make_dirac(sofa_in, sofa_out)

    Obj = SOFAload(sofa_in);

    [M, R, N] = size(Obj.Data.IR);

    Obj.Data.IR = zeros(M, R, N);

    Obj.Data.IR(:, :, 1) = 1;

    SOFAsave(sofa_out, Obj);

end