Commit 3aaff82d authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1365-sba-mono-detector-test-cases-stv-and-ltv-are-missing
parents d227b5c0 eb6212c5

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ IVAS_cod 
IVAS_dec

IVAS_rend

ISAR_post_rend

ambi_converter

obj/

*.a

*.o
@@ -18,6 +19,7 @@ IVAS_cod.exe 
IVAS_dec.exe

IVAS_rend.exe

ISAR_post_rend.exe

ambi_converter.exe

*.user

.vs/

Debug_*/

.gitlab-ci.yml

+354 −258

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab-ci/variables.yml

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ variables: 
      - 'ivas-conformance-linux'

      - 'check-clipping'

      - 'test-branch-vs-input-passthrough'

      - 'coverage'



  PYTEST_ARGS: ""

  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
@@ -28,3 +29,7 @@ variables: 
  TEST_SUITE: ""

  # note: currently overwrites default value from ci repo

  TESTCASE_TIMEOUT_STV_SANITIZERS: 240

  COVERAGE_OUTPUT_FILE_STV: "coverage-stv.info"

  COVERAGE_OUTPUT_FILE_LTV: "coverage-ltv.info"

  COVERAGE_OUTPUT_FILE_CONFORMANCE: "coverage-conformance.info"

  COVERAGE_OUTPUT_FILE_MERGED: "coverage-merged.info"

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ file(GLOB libDecSrcs "lib_dec/*.c") 
file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_com lib_rend lib_debug lib_isar)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar lib_util)



file(GLOB libUtilSrcs "lib_util/*.c")

file(GLOB libUtilHeaders "lib_util/*.h")

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ LDLIBS += -lm 


# Clang sanitizer compiler options

CCCLANG = clang

ifeq "$(CLANG)" "0"

CC       = $(CCCLANG)

endif

ifeq "$(CLANG)" "1"

CC       = $(CCCLANG)

CFLAGS  += -fsanitize=memory