update to avoid diff with comited rom files (c08d1e25) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_rom_binaural_crend_head.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -643,9 +643,6 @@ const float CRendBin_Combined_HRIR_coeff_im_16kHz[15][BINAURAL_CHANNELS][80]={
		const float *CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
		const float *CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL};




		/******************** CRendBin_FOA_HRIR ********************/

		const float CRendBin_FOA_HRIR_latency_s = 0.000020834f;
		@@ -842,8 +839,6 @@ const float CRendBin_FOA_HRIR_coeff_im_16kHz[4][BINAURAL_CHANNELS][80]={
		const float *CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
		const float *CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL};



		/******************** CRendBin_HOA2_HRIR ********************/

		const float CRendBin_HOA2_HRIR_latency_s = 0.000020834f;
		@@ -1220,8 +1215,6 @@ const float CRendBin_HOA2_HRIR_coeff_im_16kHz[9][BINAURAL_CHANNELS][80]={
		const float *CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
		const float *CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL};



		/******************** CRendBin_HOA3_HRIR ********************/

		const float CRendBin_HOA3_HRIR_latency_s = 0.000020834f;
		@@ -1850,8 +1843,6 @@ const float CRendBin_HOA3_HRIR_coeff_im_16kHz[16][BINAURAL_CHANNELS][80]={
		const float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,NULL};
		const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL};



		/******************** CRendBin_Combined_BRIR ********************/

		const float CRendBin_Combined_BRIR_latency_s = 0.000145834f;
		@@ -7177,3 +7168,4 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][252
		};

		#undef WMC_TOOL_SKIP

lib_rend/ivas_rom_binaural_crend_head.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@
		#include "ivas_cnst.h"



		/******************** CRendBin_Combined_HRIR ********************/

		extern float CRendBin_Combined_HRIR_latency_s;
		@@ -95,9 +94,6 @@ extern float CRendBin_Combined_HRIR_coeff_im_16kHz[15][BINAURAL_CHANNELS][80];
		extern float *CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];
		extern float *CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];




		/******************** CRendBin_FOA_HRIR ********************/

		extern float CRendBin_FOA_HRIR_latency_s;
		@@ -144,8 +140,6 @@ extern float CRendBin_FOA_HRIR_coeff_im_16kHz[4][BINAURAL_CHANNELS][80];
		extern float *CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];
		extern float *CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];



		/******************** CRendBin_HOA2_HRIR ********************/

		extern float CRendBin_HOA2_HRIR_latency_s;
		@@ -192,8 +186,6 @@ extern float CRendBin_HOA2_HRIR_coeff_im_16kHz[9][BINAURAL_CHANNELS][80];
		extern float *CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];
		extern float *CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];



		/******************** CRendBin_HOA3_HRIR ********************/

		extern float CRendBin_HOA3_HRIR_latency_s;
		@@ -240,8 +232,6 @@ extern float CRendBin_HOA3_HRIR_coeff_im_16kHz[16][BINAURAL_CHANNELS][80];
		extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS];
		extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS];



		/******************** CRendBin_Combined_BRIR ********************/

		extern float CRendBin_Combined_BRIR_latency_s;

scripts/binauralRenderer_interface/CMakeLists.txt

+14 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,17 @@ 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)

		@@ -65,7 +76,7 @@ endif()

		message(STATUS "Zlib configured")

		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})
		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)
		@@ -105,7 +116,8 @@ set(SOURCE_FILES_H
		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})

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

		if(WIN32)
		add_compile_definitions(_CRT_SECURE_NO_WARNINGS)

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -382,14 +382,14 @@ int main( int argc, char *argv[] )
		{
		fprintf( fp, "\n#ifndef _%s_\n", to_upper( rom_file_name ) );
		fprintf( fp, "#define _%s_\n", to_upper( rom_file_name ) );
		fprintf( fp, "\n#include <stdint.h>\n#include \"cnst.h\"\n#include \"ivas_cnst.h\"\n" );
		fprintf( fp, "\n#include \"ivas_cnst.h\"\n" );
		fclose( fp );
		}

		fp = fopen( c_file_path, "a" );
		if ( fp )
		{
		fprintf( fp, "\n#include <stdint.h>\n#include <stddef.h>\n#include \"cnst.h\"\n#include \"ivas_cnst.h\"\n" );
		fprintf( fp, "\n#include <stddef.h>\n#include \"ivas_cnst.h\"\n\n/* clang-format off */\n\n#define WMC_TOOL_SKIP\n\n" );
		fclose( fp );
		}

		@@ -445,7 +445,7 @@ int main( int argc, char *argv[] )
		fp = fopen( c_file_path, "a" );
		if ( fp )
		{
		fprintf( fp, "\n\n" );
		fprintf( fp, "\n\n#undef WMC_TOOL_SKIP\n\n" );
		fclose( fp );
		}

		@@ -1032,8 +1032,7 @@ void update_c_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int
		{
		/* float latency_s; */
		fprintf( fp, "\n\n/******************** %s_%s ********************/\n", DECLARATION_NAME, lscfg.name );
		fprintf( fp, "\n#ifdef FIX_BINAURAL_DELAY_PRECISION\nconst float %s_%s_latency_s = %10.9ff;\n#else", DECLARATION_NAME, lscfg.name, hrtf->latency_s );
		fprintf( fp, "\nconst float %s_%s_latency_s = %16.15ff;\n#endif", DECLARATION_NAME, lscfg.name, hrtf->latency_s - 0.000000001f );
		fprintf( fp, "\nconst float %s_%s_latency_s = %10.9ff;", DECLARATION_NAME, lscfg.name, hrtf->latency_s );
		}

		fprintf( fp, "\n\n/* Sample Rate = %ld */\n", (long) samplerate );