Commit 60c9a717 authored by emerit's avatar emerit
Browse files

version using libmysofa of python ok

parent b25b4e2b

scripts/binauralRenderer_interface/CMakeLists.txt

+29 −15
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ project(generate_crend_ivas_tables) 


message(${PROJECT_SOURCE_DIR})



option(USE_LIB_MYSOFA "dowload and use lib mysofa" OFF)



if (USE_LIB_MYSOFA)

set(EXTERNALS_PATH ${PROJECT_SOURCE_DIR}/Externals)

endif()

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

set(IVAS_TRUNK_UTIL_PATH ${IVAS_TRUNK_PATH}/lib_util)

set(IVAS_TRUNK_DEC_PATH ${IVAS_TRUNK_PATH}/lib_dec)
@@ -14,6 +18,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)



if (USE_LIB_MYSOFA)

find_path(SOFA_READER_DIR "libmysofa.pc.cmake" ${EXTERNALS_PATH}/libmysofa)



if(SOFA_READER_DIR)
@@ -23,17 +28,6 @@ else() 
    execute_process(COMMAND git clone ${GIT_URL} ${EXTERNALS_PATH}/libmysofa)

endif()



find_package(Python REQUIRED COMPONENTS Development Interpreter NumPy )







message("Python_LIBRARIES = ${Python_LIBRARIES}")

message("Python_LIBRARY_DIRS = ${Python_LIBRARY_DIRS}")

message("Python_INCLUDE_DIRS = ${Python_INCLUDE_DIRS}")

message("Python_NumPy_INCLUDE_DIRS = ${Python_NumPy_INCLUDE_DIRS}")







if(WIN32)

    find_path(ZLIB_DIR "zlib.h" ${EXTERNALS_PATH}/zlib/zlib-1.2.12)
@@ -76,14 +70,31 @@ endif() 


message(STATUS "Zlib configured")



include_directories(${Python_INCLUDE_DIRS} ${Python_NumPy_INCLUDE_DIRS} ${SOFA_READER_DIR}/src ${ZLIB_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_DEBUG_PATH})



option(BUILD_TESTS "Build test programs" OFF)

option(BUILD_SHARED_LIBS "Build shared library" OFF)

add_subdirectory(${SOFA_READER_DIR})



message(STATUS "libmysofa configured")





else()

find_package(Python REQUIRED COMPONENTS Development Interpreter NumPy )



message("Python_LIBRARIES = ${Python_LIBRARIES}")

message("Python_LIBRARY_DIRS = ${Python_LIBRARY_DIRS}")

message("Python_INCLUDE_DIRS = ${Python_INCLUDE_DIRS}")

message("Python_NumPy_INCLUDE_DIRS = ${Python_NumPy_INCLUDE_DIRS}")



add_definitions(-DNPY_NO_DEPRECATED_API)

add_definitions(-DFIX_REMOVE_MYSOFA)

endif()



if (USE_LIB_MYSOFA)

include_directories( ${SOFA_READER_DIR}/src ${ZLIB_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_DEBUG_PATH})

else()

include_directories(${Python_INCLUDE_DIRS} ${Python_NumPy_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_DEBUG_PATH})

endif()



set(SOURCE_FILES_C

    ${PROJECT_SOURCE_DIR}/ivas_crend_binaural_filter_design.c

    ${IVAS_TRUNK_COM_PATH}/basop32.c
@@ -101,7 +112,6 @@ set(SOURCE_FILES_C 


set(SOURCE_FILES_H

    ${PROJECT_SOURCE_DIR}/ivas_crend_binaural_filter_design.c

    ${SOFA_READER_DIR}/src/hrtf/mysofa.h

    ${IVAS_TRUNK_REND_PATH}/ivas_stat_rend.h

    ${IVAS_TRUNK_DEC_PATH}/ivas_stat_dec.h

    ${IVAS_TRUNK_DEC_PATH}/stat_dec.h
@@ -117,7 +127,11 @@ add_library(${PROJECT_NAME}_lib STATIC ${SOURCE_FILES_C} ${SOURCE_FILES_H}) 


add_executable(${PROJECT_NAME} generate_crend_ivas_tables_from_sofa.c)



target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib mysofa-static ${zlib} ${Python_LIBRARIES})

if (USE_LIB_MYSOFA)

target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib mysofa-static ${zlib})

else()

target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib ${Python_LIBRARIES})

endif()



if(WIN32)

    add_compile_definitions(_CRT_SECURE_NO_WARNINGS)

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+401 −58

File changed.

Preview size limit exceeded, changes collapsed.

scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.h

+2 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 
#ifndef IVAS_CREND_BIBAURAL_FILTER_DESIGN_H_

#define IVAS_CREND_BIBAURAL_FILTER_DESIGN_H_



#include <stdint.h>

#include <stdio.h>



#include "ivas_stat_dec.h"

#define IVAS_SOFA_MAX_VAL_M         ( 30 )

#define IVAS_SOFA_MAX_VAL_R         ( 2 )
@@ -45,7 +42,9 @@ typedef struct ivas_hrtf_t 
    double *latency_s[IVAS_SOFA_MAX_VAL_I];

    double *data_ir[IVAS_SOFA_MAX_VAL_M][IVAS_SOFA_MAX_VAL_M];

    int8_t *p_hrtf_data;

#ifndef FIX_REMOVE_MYSOFA

    int32_t I;

#endif

    int32_t R;

    int32_t N;

    int32_t m;

scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.c

+2 −2

File changed.

Contains only whitespace changes.