remove libmysoga depencies (a47a76e1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_rom_TdBinauralRenderer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@

		*******************************************************************************************************/
		/*
		* Generated on 18-Oct-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
		* Generated on 19-Oct-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
		* Binaural rendering data set based on BRIRs
		* Tables derived from Mozart IIS BRIRs.*/

lib_rend/ivas_rom_binauralRenderer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@
		/* Tables generated by the script at "scripts/binauralRenderer_interface/fastconv/generate_tables_for_fastconv.m */
		/* Can be replaced by your own generated HRIR tables */
		/*
		* Generated on 18-Oct-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
		* Generated on 19-Oct-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
		*/


		@@ -46955,7 +46955,7 @@ const float fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX] =


		/*
		* Generated on 18-Oct-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
		* Generated on 19-Oct-2023 with Matlab version 23.2.0.2365128 (R2023b) by MUXE6256 on PCWIN64
		* Binaural rendering data set based on BRIRs
		Tables derived from Mozart IIS BRIRs.*/

lib_rend/ivas_rom_binaural_crend_head.c

+3937 −3945

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_binaural_crend_head.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -324,10 +324,10 @@ extern float CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[BINAURAL_CHANNELS][
		extern float CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[15];
		#endif
		extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[BINAURAL_CHANNELS][40];
		extern float CRendBin_Combined_BRIR_coeff_re_32kHz[15][BINAURAL_CHANNELS][2819];
		extern float CRendBin_Combined_BRIR_coeff_im_32kHz[15][BINAURAL_CHANNELS][2819];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS][2870];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS][2870];
		extern float CRendBin_Combined_BRIR_coeff_re_32kHz[15][BINAURAL_CHANNELS][2818];
		extern float CRendBin_Combined_BRIR_coeff_im_32kHz[15][BINAURAL_CHANNELS][2818];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS][2868];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS][2868];

		/* Sample Rate = 16000 */

		@@ -342,10 +342,10 @@ extern float CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[BINAURAL_CHANNELS][
		extern float CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[15];
		#endif
		extern uint16_t CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[BINAURAL_CHANNELS][40];
		extern float CRendBin_Combined_BRIR_coeff_re_16kHz[15][BINAURAL_CHANNELS][1774];
		extern float CRendBin_Combined_BRIR_coeff_im_16kHz[15][BINAURAL_CHANNELS][1774];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2522];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2522];
		extern float CRendBin_Combined_BRIR_coeff_re_16kHz[15][BINAURAL_CHANNELS][1799];
		extern float CRendBin_Combined_BRIR_coeff_im_16kHz[15][BINAURAL_CHANNELS][1799];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS][2474];
		extern float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][2474];


		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

scripts/binauralRenderer_interface/CMakeLists.txt

+23 −103

Original line number	Diff line number	Diff line
		@@ -2,14 +2,6 @@ cmake_minimum_required(VERSION 3.5)

		project(generate_crend_ivas_tables)

		message(${PROJECT_SOURCE_DIR})

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

		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)
		string(REPLACE "/binauralRenderer_interface" "" IVAS_TRUNK_SCRIPTS_PATH ${PROJECT_SOURCE_DIR})
		@@ -19,67 +11,6 @@ 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" PATHS ${EXTERNALS_PATH}/libmysofa NO_DEFAULT_PATH)

		if(SOFA_READER_DIR)
		else()
		set(SOFA_READER_DIR ${EXTERNALS_PATH}/libmysofa)
		set(GIT_URL https://github.com/hoene/libmysofa.git)
		execute_process(COMMAND git clone ${GIT_URL} ${EXTERNALS_PATH}/libmysofa)
		endif()

		if(WIN32)
		find_path(ZLIB_DIR "zlib.h" PATHS ${EXTERNALS_PATH}/zlib/zlib-1.2.12 NO_DEFAULT_PATH)

		if(ZLIB_DIR)
		else()
		find_package(Python3 REQUIRED)

		if(Python3_Interpreter_FOUND)
		execute_process(COMMAND ${Python3_EXECUTABLE} resolve_build_dep.py
		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
		RESULT_VARIABLE py_result OUTPUT_VARIABLE ZLIB_DIR)
		endif()

		string(STRIP "${ZLIB_DIR}" ZLIB_DIR)

		# set (ZLIB_DIR "./Externals/zlib/zlib-1.2.12")
		get_filename_component(COMBINED_PATH ${PROJECT_SOURCE_DIR}/${ZLIB_DIR} ABSOLUTE)
		set(ZLIB_DIR ${COMBINED_PATH})
		endif()
		endif()

		if(WIN32)
		message(STATUS " ZLIB_DIR: ${ZLIB_DIR}")
		set(ZLIB_INCLUDE_DIRS ${ZLIB_DIR} ${PROJECT_BINARY_DIR}/Externals/zlib/zlib-1.2.12)
		add_subdirectory(${ZLIB_DIR})
		set(zlib zlibstatic)
		target_include_directories(example PUBLIC ${ZLIB_INCLUDE_DIRS})
		target_include_directories(minigzip PUBLIC ${ZLIB_INCLUDE_DIRS})
		endif()

		if(UNIX)
		find_package(ZLIB)

		if(ZLIB_FOUND)
		message(${ZLIB_INCLUDE_DIRS})
		message(${ZLIB_LIBRARIES})
		set(zlib ${ZLIB_LIBRARIES})
		else()
		message(FATAL_ERROR "Zlib not found")
		endif()
		endif()

		message(STATUS "Zlib configured")

		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_EXECUTABLE = ${Python_EXECUTABLE}")
		@@ -104,14 +35,8 @@ else()
		endif()

		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
		@@ -152,16 +77,11 @@ add_library(${PROJECT_NAME}_lib STATIC ${SOURCE_FILES_C} ${SOURCE_FILES_H})

		add_executable(${PROJECT_NAME} generate_crend_ivas_tables_from_sofa.c)

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

		else()
		if(UNIX AND NOT APPLE)
		target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib ${Python_LIBRARIES} -lm -ldl)
		else()
		target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib ${Python_LIBRARIES})
		endif()
		endif()

		if(WIN32)
		add_compile_definitions(_CRT_SECURE_NO_WARNINGS)