integration of contributions 21 and 35 as per working assumption from (ac2fb24d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe
		.DS_Store
		.vscode
		.cache
		.idea
		*.log
		*.bak
		.\#*

.gitlab-ci-custom.yml

+1 −1

Original line number	Diff line number	Diff line
		include:
		- project: $CUSTOM_CI_PROJECT
		ref: $CUSTOM_CI_REF
		ref: lc3plus-integration-with-unit-tests
		file: $CUSTOM_CI_FILE

.gitlab-ci.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -406,7 +406,7 @@ renderer-asan:
		needs: ["build-codec-linux-cmake"]
		stage: test
		script:
		- python3 ci/disable_ram_counting.py
		- python3 ci/comment_defines.py -d RAM_COUNTING_TOOL -f lib_com/options.h
		- cmake -B cmake-build -G "Unix Makefiles" -DCLANG=asan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- cmake --build cmake-build -- -j
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		@@ -429,7 +429,7 @@ renderer-msan:
		needs: ["build-codec-linux-cmake"]
		stage: test
		script:
		- python3 ci/disable_ram_counting.py
		- python3 ci/comment_defines.py -d RAM_COUNTING_TOOL -f lib_com/options.h
		- cmake -B cmake-build -G "Unix Makefiles" -DCLANG=msan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- cmake --build cmake-build -- -j
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

CMakeLists.txt

+30 −3

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ file(GLOB libComSrcs "lib_com/*.c")
		file(GLOB libComHeaders "lib_com/*.h")
		add_library(lib_com ${libComSrcs} ${libComHeaders})
		if(UNIX)
		target_link_libraries(lib_com m)
		target_link_libraries(lib_com PRIVATE m)
		endif()
		target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug)

		@@ -132,12 +132,30 @@ add_library(lib_enc ${libEncSrcs} ${libEncHeaders})
		target_link_libraries(lib_enc lib_com lib_debug)
		target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend)

		set(lc3plus_floating_point_dir ${CMAKE_CURRENT_SOURCE_DIR}/lib_rend/lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point)
		if(NOT EXISTS ${lc3plus_floating_point_dir})
		MESSAGE(FATAL_ERROR "${lc3plus_floating_point_dir} does not exist. Please follow instructions in lib_rend/lc3plus_codec/README.md and download the LC3plus codec")
		endif()
		file(GLOB libLC3plusSrcs "${lc3plus_floating_point_dir}/*.c")
		file(GLOB libLC3plusHeaders "${lc3plus_floating_point_dir}/*.h")
		file(GLOB libLC3plusFftSrcs "${lc3plus_floating_point_dir}/fft/*.c")
		file(GLOB libLC3plusFftHeaders "${lc3plus_floating_point_dir}/fft/*.h")
		add_library(lc3plus ${libLC3plusSrcs} ${libLC3plusFftSrcs} ${libLC3plusHeaders} ${libLC3plusFftHeaders})
		target_include_directories(lc3plus PUBLIC ${floating_point_dir} PRIVATE ${floating_point_dir}/fft )
		target_link_libraries(lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly
		if(WMOPS)
		target_link_libraries(lc3plus lib_debug)
		endif()

		file(GLOB libCldfbTransCodecSrcs "lib_rend/ivas_cldfb_trans_codec/*.c")
		file(GLOB libCldfbTransCodecHeaders "lib_rend/ivas_cldfb_trans_codec/*.h")
		file(GLOB libRendSrcs "lib_rend/*.c")
		file(GLOB libRendHeaders "lib_rend/*.h")
		add_library(lib_rend ${libRendSrcs} ${libRendHeaders})
		target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.
		add_library(lib_rend ${libRendSrcs} ${libCldfbTransCodecSrcs} ${libRendHeaders} ${libCldfbTransCodecHeaders})
		target_link_libraries(lib_rend lib_dec lib_com lib_debug lc3plus) # Todo refactor: This dependency on lib_dec should be removed.
		target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc)


		file(GLOB libDecSrcs "lib_dec/*.c")
		file(GLOB libDecHeaders "lib_dec/*.h")
		add_library(lib_dec ${libDecSrcs} ${libDecHeaders})
		@@ -149,6 +167,12 @@ file(GLOB libUtilHeaders "lib_util/*.h")
		add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})
		target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug)

		if(NOT WMOPS)
		file(GLOB unitTestIvasLc3plusSrcs "scripts/split_rendering/lc3plus/*.c")
		add_executable(ivas_lc3plus_unit_test ${unitTestIvasLc3plusSrcs})
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug)
		endif()

		add_executable(IVAS_cod apps/encoder.c)
		target_link_libraries(IVAS_cod lib_enc lib_util)
		if(WIN32)
		@@ -170,6 +194,9 @@ 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}/")
		if (NOT WMOPS)
		add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ivas_lc3plus_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus")
		endif()
		endif()

		# Allow creating packages for CMake install

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ SRC_LIBCOM = lib_com
		SRC_LIBDEBUG = lib_debug
		SRC_LIBDEC = lib_dec
		SRC_LIBENC = lib_enc
		SRC_LIBREND = lib_rend
		SRC_LIBREND = lib_rend lib_rend/lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point lib_rend/lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft
		SRC_LIBUTIL = lib_util
		SRC_APP = apps
		BUILD = build