Merge branch 'main' into b20220920_ParamISM_DTX_CNG (ca68222b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitattributes

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,5 +29,6 @@
		*.mat filter=lfs diff=lfs merge=lfs -text
		*.met filter=lfs diff=lfs merge=lfs -text
		*.pcm filter=lfs diff=lfs merge=lfs -text
		*.sofa filter=lfs diff=lfs merge=lfs -text
		*.wav filter=lfs diff=lfs merge=lfs -text
		*.zip filter=lfs diff=lfs merge=lfs -text

.gitignore

+14 −1

Original line number	Diff line number	Diff line
		@@ -41,16 +41,23 @@ scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe
		.cache
		*.log
		*.bak
		.\#*
		scripts/c-code_instrument/
		scripts/ifdef_instrument.list
		scripts/ref/
		scripts/test/
		scripts/out/
		scripts/self_test_summary.txt
		scripts/cppp/
		binary/
		tests/renderer/cut
		tests/renderer/ref
		tests/dut
		tests/ref
		scripts/testv/_cut.pcm
		# default reference binary name
		IVAS_cod_ref
		IVAS_dec_ref

		# Python files that pop up when running scripts
		__pycache__/
		@@ -59,3 +66,9 @@ __pycache__/

		# history
		.history/

		#externals
		Externals/

		# coan output files that are created when cleaning out switches
		coan_out_*

.gitlab-ci.yml

+253 −78

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+4 −15

Original line number	Diff line number	Diff line
		@@ -108,10 +108,6 @@ if(WMOPS)
		add_definitions("-DWMOPS=1")
		endif()

		if(DEC_TO_REND_FLOAT_DUMP)
		add_compile_definitions(DEC_TO_REND_FLOAT_DUMP)
		endif()

		project(stereo-evs)
		set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer
		include(CTest)
		@@ -145,7 +141,7 @@ target_link_libraries(lib_enc lib_com lib_debug)
		file(GLOB libRendSrcs "lib_rend/*.c")
		file(GLOB libRendHeaders "lib_rend/*.h")
		add_library(lib_rend ${libRendSrcs} ${libRendHeaders})
		target_link_libraries(lib_rend lib_com lib_debug)
		target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.

		file(GLOB libDecSrcs "lib_dec/*.c")
		file(GLOB libDecHeaders "lib_dec/*.h")
		@@ -156,14 +152,6 @@ file(GLOB libUtilSrcs "lib_util/*.c")
		file(GLOB libUtilHeaders "lib_util/*.h")
		add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})

		file(GLOB unitTestCRendSrcs "scripts/ivas_pytests/tests/unit_tests/crend/*.c")
		file(GLOB unitTestCRendHeaders "scripts/ivas_pytests/tests/unit_tests/crend/*.h")
		add_executable(IVAS_crend_unit_test ${unitTestCRendSrcs} ${unitTestCRendHeaders})
		target_link_libraries(IVAS_crend_unit_test lib_rend lib_dec lib_util lib_com lib_debug)

		add_executable(renderer_standalone "scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c")
		target_link_libraries(renderer_standalone lib_rend lib_dec lib_util lib_com lib_debug)

		add_executable(IVAS_cod apps/encoder.c)
		target_link_libraries(IVAS_cod lib_enc lib_util)
		if(WIN32)
		@@ -184,6 +172,7 @@ if(COPY_EXECUTABLES_FROM_BUILD_DIR)
		add_custom_command(TARGET IVAS_cod POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_cod>" "${CMAKE_CURRENT_SOURCE_DIR}/")
		add_custom_command(TARGET IVAS_dec POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_dec>" "${CMAKE_CURRENT_SOURCE_DIR}/")
		add_custom_command(TARGET IVAS_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")
		add_custom_command(TARGET IVAS_crend_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_crend_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/ivas_pytests/tests/unit_tests/crend/")
		add_custom_command(TARGET renderer_standalone POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:renderer_standalone>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/td_object_renderer/object_renderer_standalone/")
		endif()

		# Allow creating packages for CMake install
		install(TARGETS lib_enc lib_dec lib_rend lib_com lib_util ARCHIVE DESTINATION lib)

LICENSE.md

+1 −1

Original line number	Diff line number	Diff line
		/******************************************************************************************************

		(C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other