Commit 63f80df7 authored by emerit's avatar emerit
Browse files

merging

parent cf71ec22

lib_rend/ivas_rom_TdBinauralRenderer.c

+6 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
 *------------------------------------------------------------------------*/

/* TD renderer default HRIR model */

#ifdef DEBUGGING

/* Generated on 11-Sep-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */

/* Generated on 19-Dec-2024 with Matlab version 23.2.0.2668659 (R2023b) Update 9 by marcemerit on MACA64 */

#endif















#ifdef IVAS_FLOAT_FIXED










@@ -85,10 +85,15 @@ const int16_t defaultHRIR_rom_azimShapeIdx[15] = {













const int16_t defaultHRIR_rom_azimShapeSampFactor[15] = {















-1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 















};













const float defaultHRIR_rom_elevKSeq[13] = {













-90.000000f, -75.000000f, -60.000000f, -45.000000f, -30.000000f, -15.000000f, 0.000000f, 15.000000f, 30.000000f, 45.000000f, 60.000000f, 75.000000f, 90.000000f, 













};













#ifdef IVAS_FLOAT_FIXED















const Word16 defaultHRIR_rom_elevKSeq_Q_fx = 8;















const Word16 defaultHRIR_rom_elevKSeq_fx [13] = {















-23040, -19200, -15360, -11520, -7680, -3840, 0, 3840, 7680, 11520, 15360, 19200, 23040, 















};













#endif // IVAS_FLOAT_FIXED















const uint32_t defaultHRIR_rom_elevBsShape[36] = {















0x3f7ffe00,0x3ed80000,0x3e000000,0x3c800000,0x00000000,0x00000000,0x3efe0000,0x3f180000,0x3eea0000,0x3e800000,0x3dd80000,0x3d000000,0x3b800000,0x00000000,0x00000000,0x3da2b000,0x3e855400,0x3eea0000,0x3f155600,0x3f13aa00,0x3ef00000,0x3ea0ac00,0x3e2aa800,0x3d900000,0x3caac000,0x3b2a0000,0x00000000,0x00000000,0x3b2a0000,0x3caac000,0x3d900000,0x3e2aa800,0x3ea15400,0x3ef55400,0x3f1caa00,0x3f2aaa00,















};

























scripts/binauralRenderer_interface/CMakeLists.txt



+17
−18




























Original line number
Diff line number
Diff line













cmake_minimum_required(VERSION 3.5)













cmake_minimum_required(VERSION 3.10)































project(generate_crend_ivas_tables)

























@@ -11,7 +11,7 @@ set(IVAS_TRUNK_ENC_PATH ${IVAS_TRUNK_PATH}/lib_enc)













set(IVAS_TRUNK_COM_PATH ${IVAS_TRUNK_PATH}/lib_com)















set(IVAS_TRUNK_DEBUG_PATH ${IVAS_TRUNK_PATH}/lib_debug)





























set(Matlab_ROOT_DIR /Applications/MATLAB_R2024a.app)













set(Matlab_ROOT_DIR /Applications/MATLAB_R2023b.app)































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)










@@ -40,6 +40,7 @@ set(SOURCE_FILES_C













    ${PROJECT_SOURCE_DIR}/ivas_crend_binaural_filter_design.c















    ${PROJECT_SOURCE_DIR}/config_reader.c





























    ${IVAS_TRUNK_DEBUG_PATH}/wmc_auto.c















    ${IVAS_TRUNK_COM_PATH}/scale_mem_fx.c















    ${IVAS_TRUNK_COM_PATH}/fft_evs.c















    ${IVAS_TRUNK_COM_PATH}/mslvq_com_fx.c









@@ -47,34 +48,33 @@ set(SOURCE_FILES_C













    ${IVAS_TRUNK_COM_PATH}/enh32.c















    ${IVAS_TRUNK_COM_PATH}/enh64.c















    ${IVAS_TRUNK_COM_PATH}/enhUL32.c













    ${IVAS_TRUNK_COM_PATH}/basop_util.c













    ${IVAS_TRUNK_COM_PATH}/basop_lsf_tools.c













    ${IVAS_TRUNK_COM_PATH}/rom_basop_util.c













    ${IVAS_TRUNK_COM_PATH}/rom_basic_math.c



























    # ${IVAS_TRUNK_COM_PATH}/basop_util.c













    # ${IVAS_TRUNK_COM_PATH}/basop_lsf_tools.c













    # ${IVAS_TRUNK_COM_PATH}/rom_basop_util.c













    # ${IVAS_TRUNK_COM_PATH}/rom_basic_math.c















    ${IVAS_TRUNK_COM_PATH}/log2.c















    ${IVAS_TRUNK_COM_PATH}/enh1632.c















    ${IVAS_TRUNK_COM_PATH}/oper_32b.c















    ${IVAS_TRUNK_COM_PATH}/complex_basop.c













    ${IVAS_TRUNK_COM_PATH}/control.c















    ${IVAS_TRUNK_COM_PATH}/tools_fx.c















    ${IVAS_TRUNK_COM_PATH}/lpc_tools_fx.c















    ${IVAS_TRUNK_COM_PATH}/lsf_tools_fx.c















    ${IVAS_TRUNK_COM_PATH}/enh40.c















    ${IVAS_TRUNK_COM_PATH}/math_op.c













    ${IVAS_TRUNK_COM_PATH}/fft.c













    ${IVAS_TRUNK_COM_PATH}/fft_rel.c













    ${IVAS_TRUNK_COM_PATH}/ifft_rel.c













    ${IVAS_TRUNK_COM_PATH}/fft_fx.c













    ${IVAS_TRUNK_COM_PATH}/fft_rel_fx.c













    ${IVAS_TRUNK_COM_PATH}/ivas_mdft_imdft.c













    ${IVAS_TRUNK_COM_PATH}/rom_com.c













    ${PROJECT_SOURCE_DIR}/fft.c



























    ${PROJECT_SOURCE_DIR}/fft_rel.c













    ${PROJECT_SOURCE_DIR}/ifft_rel.c













    ${PROJECT_SOURCE_DIR}/ivas_mdft_imdft.c













    ${PROJECT_SOURCE_DIR}/rom_com.c















    ${IVAS_TRUNK_COM_PATH}/rom_com_fx.c













    ${IVAS_TRUNK_COM_PATH}/ivas_rom_com.c













    ${PROJECT_SOURCE_DIR}/ivas_rom_com.c















    ${IVAS_TRUNK_COM_PATH}/ivas_rom_com_fx.c













    ${IVAS_TRUNK_COM_PATH}/tools.c



























    # ${IVAS_TRUNK_COM_PATH}/tools.c















    ${IVAS_TRUNK_COM_PATH}/lpc_tools_fx.c















    ${IVAS_TRUNK_COM_PATH}/tns_base.c













    ${IVAS_TRUNK_COM_PATH}/tns_base_flt.c















    ${IVAS_TRUNK_COM_PATH}/mslvq_com.c















    ${IVAS_TRUNK_COM_PATH}/mslvq_com_fx.c

























@@ -96,7 +96,6 @@ set(SOURCE_FILES_H













    ${IVAS_TRUNK_COM_PATH}/ivas_prot.h















    ${IVAS_TRUNK_COM_PATH}/common_api_types.h















    ${IVAS_TRUNK_REND_PATH}/ivas_rom_rend.h













    ${IVAS_TRUNK_COM_PATH}/control.h















)































add_definitions(-DFIX_GEN_CREND_ROM)

































scripts/binauralRenderer_interface/clearButKeepNeededVariables.m



+1
−1




























Original line number
Diff line number
Diff line













clear -regexp ^((?!writeRomFileOutput|writeRomFileFx|writeBinaryOutput|generateBinaryFile|generateCustomBinaryFile|writeEachRendererBinaryOutput|rom_file|bin_file|hrir_file|brir_file|ivas_path|binary_path|output_bin_name|param_bin_file|fastconv_bin_file|td_binary_file|binary_name|rom_path).)*$












clear -regexp ^((?!writeRomFileOutput|writeBinaryOutput|generateBinaryFile|generateCustomBinaryFile|writeEachRendererBinaryOutput|rom_file|bin_file|hrir_file|brir_file|ivas_path|binary_path|output_bin_name|param_bin_file|fastconv_bin_file|td_binary_file|binary_name|rom_path).)*$
























scripts/binauralRenderer_interface/fastconv/get_ivas_binary_header.m



+1
−1




























Original line number
Diff line number
Diff line








@@ -67,7 +67,7 @@ else













end































ivas_cnst_path = fullfile(ivas_path, 'lib_com/ivas_cnst.h'); % must be replaced if this file is moved













c = fileread(ivas_cnst_path);













c = fileread(hrtf_file_reader_path);































% regex for BINAURAL_INPUT_AUDIO_CONFIG















ic_expr = '^\s+(BINAURAL_INPUT\w+)';

































scripts/binauralRenderer_interface/fft.c
0 → 100644



+6502
−0


























File added.
Preview size limit exceeded, changes collapsed.