Merge branch 'main' into add-plc-conditions-for-OSBA-in-self-test (5c47cda6) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+418 −89

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+5 −12

Original line number	Diff line number	Diff line
		@@ -57,9 +57,10 @@ if(UNIX)
		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m64")
		endif()
		# C compiler flags
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffp-contract=off") # disable floating point operation contraction
		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)
		@@ -89,8 +90,8 @@ if(UNIX)
		endif()
		# GCOV
		if(GCOV)
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage -fprofile-update=atomic")
		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -fprofile-update=atomic")
		endif()
		# STRIP
		if(STRIP)
		@@ -162,10 +163,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 +181,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

+3 −3

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 -ffp-contract=off

		# libs to link
		LDLIBS += -lm
		@@ -96,8 +96,8 @@ LDFLAGS += -g3
		endif

		ifeq "$(GCOV)" "1"
		CFLAGS += -fprofile-arcs -ftest-coverage
		LDFLAGS += -fprofile-arcs -ftest-coverage
		CFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic
		LDFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic
		endif

		ifeq "$(STRIP)" "1"

Workspace_msvc/lib_com.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -217,7 +217,6 @@
		<ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c" />
		<ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c" />
		<ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c" />
		<ClCompile Include="..\lib_com\ivas_td_decorr.c" />
		<ClCompile Include="..\lib_com\ivas_tools.c" />
		<ClCompile Include="..\lib_com\ivas_transient_det.c" />
		<ClCompile Include="..\lib_com\lag_wind.c" />
		@@ -283,7 +282,6 @@
		<ClInclude Include="..\lib_com\basop_util.h" />
		<ClInclude Include="..\lib_com\cnst.h" />
		<ClInclude Include="..\lib_com\common_api_types.h" />
		<ClInclude Include="..\lib_com\control.h" />
		<ClInclude Include="..\lib_com\enh1632.h" />
		<ClInclude Include="..\lib_com\enh40.h" />
		<ClInclude Include="..\lib_com\ivas_cnst.h" />

Workspace_msvc/lib_com.vcxproj.filters

+0 −6

Original line number	Diff line number	Diff line
		@@ -460,9 +460,6 @@
		<ClCompile Include="..\lib_com\ivas_mdct_imdct.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_td_decorr.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_ism_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		@@ -489,9 +486,6 @@
		<ClInclude Include="..\lib_com\basop32.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\control.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\cnst.h">
		<Filter>common_h</Filter>
		</ClInclude>