Merge branch 'main' into 830-Enable-parallelized-test-runs-in-coverage-test (b36fdc62) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+37 −0

Original line number	Diff line number	Diff line
		@@ -337,6 +337,30 @@ build-codec-sanitizers-linux:
		# need to use the "\|\| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<
		- ci/check_for_warnings.py $BUILD_OUTPUT \|\| exit $?

		build-codec-include-split-linux-make:
		extends:
		- .build-job-with-check-for-warnings
		- .rules-basis
		script:
		- *print-common-info
		- make -j INCLUDE_SPLIT=1 2>&1 \| tee $BUILD_OUTPUT
		# need to use the "\|\| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<
		- ci/check_for_warnings.py $BUILD_OUTPUT \|\| exit $?

		build-codec-include-split-linux-cmake:
		extends:
		- .build-job-with-check-for-warnings
		- .rules-basis
		script:
		- *print-common-info
		- mkdir build
		- cd build
		- cmake .. -DINCLUDE_SPLIT=1
		- cd ..
		- make -C build -j 2>&1 \| tee $BUILD_OUTPUT
		# need to use the "\|\| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<
		- ci/check_for_warnings.py $BUILD_OUTPUT \|\| exit $?

		build-codec-windows-cmake:
		extends:
		- .build-job-windows-with-check-for-warnings
		@@ -350,6 +374,19 @@ build-codec-windows-cmake:
		- ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") \| Invoke-Expression
		- ("exit $LASTEXITCODE") \| Invoke-Expression

		build-codec-windows-include-split-cmake:
		extends:
		- .build-job-windows-with-check-for-warnings
		- .rules-basis
		script:
		- *print-common-info-windows
		- $winoutdata = $null
		- cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild
		- cmake --build build -j \| tee -variable winoutdata
		- $winoutdata \| Out-File $BUILD_OUTPUT -Encoding Utf8
		- ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") \| Invoke-Expression
		- ("exit $LASTEXITCODE") \| Invoke-Expression

		build-codec-windows-msbuild:
		extends:
		- .build-job-windows-with-check-for-warnings

CMakeLists.txt

+2 −10

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ if(UNIX)
		# C compiler flags
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long")
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes")
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter -Wno-unused-function")
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter")
		# CLANG
		if(CLANG)
		find_program(clangBin NAMES /home/amm-archiv/soft/Linux/clang/current/bin/clang clang REQUIRED)
		@@ -162,10 +162,6 @@ if(INCLUDE_SPLIT)
		endif()
		endif()

		if(INCLUDE_SPLIT)
		file(GLOB libCldfbTransCodecSrcs "lib_rend/ivas_cldfb_trans_codec/*.c")
		file(GLOB libCldfbTransCodecHeaders "lib_rend/ivas_cldfb_trans_codec/*.h")
		endif()
		file(GLOB libRendSrcs "lib_rend/*.c")
		file(GLOB libRendHeaders "lib_rend/*.h")
		if(NOT INCLUDE_SPLIT)
		@@ -184,11 +180,7 @@ if(NOT INCLUDE_SPLIT)
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.ivas_lcld_rom_tables.*\.h$")
		endif()

		if(INCLUDE_SPLIT)
		add_library(lib_rend ${libRendSrcs} ${libCldfbTransCodecSrcs} ${libRendHeaders} ${libCldfbTransCodecHeaders})
		else()
		add_library(lib_rend ${libRendSrcs} ${libRendHeaders})
		endif()
		target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.
		if(INCLUDE_SPLIT)
		target_link_libraries(lib_rend lib_lc3plus)

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ endif
		CFLAGS += -std=c99 -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long \
		-Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
		-Werror-implicit-function-declaration \
		-Wno-unused-function -Wno-implicit-fallthrough
		-Wno-implicit-fallthrough

		# libs to link
		LDLIBS += -lm

Workspace_msvc/lib_dec.vcxproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -264,7 +264,6 @@
		<ClCompile Include="..\lib_dec\ivas_svd_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_vbap.c" />
		<ClCompile Include="..\lib_dec\jbm_jb4sb.c" />
		<ClCompile Include="..\lib_dec\jbm_jb4_circularbuffer.c" />
		<ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −3

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
		<ItemGroup>
		<ClCompile Include="..\lib_dec\ivas_vbap.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_agc_dec.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>