Commit 1b1078a5 authored by emerit's avatar emerit
Browse files

fix linux issues

parent 5df984af

scripts/binauralRenderer_interface/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 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 ~/MATLAB/R2023b)



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)

message("Matlab_VERSION = ${Matlab_VERSION}")

scripts/binauralRenderer_interface/README.md

+2 −1
Original line number Diff line number Diff line
@@ -57,8 +57,9 @@ 
   - On Windows this executable requires DLL from MATLAB, you need to add to your path `*/matlab/version/bin/win64`

   - For more details on `generate_crend_ivas_tables` see [`mixer_conv_sofa_to_rom_table_converter_readme.txt`](mixer_conv_sofa_to_rom_table_converter_readme.txt).

   - On Apple Silicon Mac with Intel MATLAB, it is necessary to add `SET(CMAKE_OSX_ARCHITECTURES "x86_64")` in the `CMakeLists.txt` near the top of the file. This forces the compilation to use Intel architecture instead ofo the native one.

   - if find_package do not find matlab, at the beginning of the cmakelists.txt file you can set the search path with the folowing line set(Matlab_ROOT_DIR matlab_path), for example on liux set(Matlab_ROOT_DIR ~/MATLAB/R2023b) 



### Build `tables_format_converter` in `Release` or `RelWithDebugInfo` configuration. `Debug` configuration does not work calling NumPy

### Build `tables_format_converter`

   - Open a command line terminal

   - Goto  folder

   - Execute

scripts/binauralRenderer_interface/config_reader.c

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

static ivas_error read_txt_bool(

    const char *pLine, /* i  : String to read from  */

    uint32_t *pTarget  /* o  : Output pointer       */

    int32_t *pTarget   /* o  : Output pointer       */

)

{

    char value[8 + 1];

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+22 −22
Original line number Diff line number Diff line
@@ -1450,7 +1450,7 @@ static uint16_t get_fft_size( 
 *  and frequency-dependent IA coherence. Expects frequency-domain HRTF input

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



void static ivas_reverb_get_hrtf_set_properties(

void ivas_reverb_get_hrtf_set_properties(

    float **ppHrtf_set_L_re,

    float **ppHrtf_set_L_im,

    float **ppHrtf_set_R_re,