Merge remote-tracking branch 'remotes/origin/main' into FhG/object_editing_interface (1ac962c3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitignore

+4 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		IVAS_cod
		IVAS_dec
		IVAS_rend
		ISAR_post_rend
		obj/
		*.a
		*.o
		@@ -16,6 +17,7 @@ build//
		IVAS_cod.exe
		IVAS_dec.exe
		IVAS_rend.exe
		ISAR_post_rend.exe
		*.user
		.vs/
		Debug_*/
		@@ -54,10 +56,12 @@ scripts/testv/stvOMASA_*.met
		scripts/testv/stvOMASA_*.csv
		scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav
		scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav
		scripts/testv/stvO*
		# default reference binary name
		IVAS_cod_ref*
		IVAS_dec_ref*
		IVAS_rend_ref*
		ISAR_post_rend_ref*

		# Python files that pop up when running scripts
		__pycache__/

.gitlab-ci.yml

+20 −14

Original line number	Diff line number	Diff line
		@@ -379,6 +379,17 @@ branch-is-up-to-date-with-main-pre:
		- echo $commits_behind_count
		- if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, run 'git merge origin/main' to update."; exit 1; fi;

		check-self-test-names-pre:
		extends:
		- .rules-merge-request
		stage: prevalidate
		needs: []
		tags:
		- ivas-linux
		script:
		- python3 ci/check_self_test_names.py scripts/config/self_test.prm 135


		branch-is-up-to-date-with-main-post:
		extends:
		- .rules-merge-request
		@@ -420,7 +431,7 @@ build-codec-instrumented-linux:
		extends:
		- .build-job-linux
		- .rules-basis
		timeout: "7 minutes"
		timeout: "10 minutes"
		script:
		- *print-common-info
		- *activate-Werror-linux
		@@ -558,6 +569,8 @@ codec-asan:
		codec-usan:
		extends:
		- .sanitizer-selftest-on-mr
		tags:
		- ivas-linux-fast
		before_script:
		- CLANG_NUM=3
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS
		@@ -1338,22 +1351,17 @@ ivas-conformance:
		timeout: "60 minutes"
		rules:
		- if: ($CI_PIPELINE_SOURCE == 'web' \|\| $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
		# - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
		allow_failure:
		exit_codes:
		- 123
		script:
		- *print-common-info-windows
		# Prepare reference exec, use tests and scripts from reference
		- $source_branch_commit_sha = $(git rev-parse HEAD)
		- git checkout main # This should be set to a relevant reference
		- git pull # Ensure to get the latest version
		- python .\scripts\strip_split_rendering.py
		- MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug
		- cp -force IVAS_cod.exe IVAS_cod_ref.exe
		- cp -force IVAS_dec.exe IVAS_dec_ref.exe
		- cp -force IVAS_rend.exe IVAS_rend_ref.exe
		- git restore .
		- git checkout $source_branch_commit_sha

		# Reference creation
		- python tests/create_short_testvectors.py
		@@ -1368,12 +1376,16 @@ ivas-conformance:

		# Copy input data and output ref data
		- if (Test-Path testvec) {rm -r -force testvec}
		- if (Test-Path TMP_DEC) {rm -r -force TMP_DEC}
		- if (Test-Path TMP_ENC) {rm -r -force TMP_ENC}
		- if (Test-Path TMP_JBM) {rm -r -force TMP_JBM}
		- if (Test-Path TMP_REND) {rm -r -force TMP_REND}
		- mkdir testvec
		- mkdir testvec/binauralRenderer_interface
		- mkdir testvec/testv
		- mkdir testvec/testv/renderer
		- mkdir testvec/bin
		- cp -r -force -ErrorAction Ignore scripts/testv/* testvec/testv
		- cp -force -ErrorAction Ignore scripts/testv/* testvec/testv
		- cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec
		- cp -r -force -ErrorAction Ignore scripts/switchPaths testvec
		- cp -r -force -ErrorAction Ignore scripts/trajectories testvec
		@@ -1423,16 +1435,10 @@ ivas-conformance-linux:
		- 123
		script:
		- *print-common-info
		# Prepare reference exec, use tests and scripts from reference
		- source_branch_commit_sha=$(git rev-parse HEAD)
		- git checkout main # This should be set to a relevant reference

		- make -j
		- cp IVAS_cod IVAS_cod_ref
		- cp IVAS_dec IVAS_dec_ref
		- cp IVAS_rend IVAS_rend_ref
		- git restore .
		- git checkout $source_branch_commit_sha

		# Reference creation
		- python3 tests/create_short_testvectors.py

.gitlab/issue_templates/asan_ltv_error.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ Link to test pipeline: XXX
		Using the [scripts](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/Software-development/pyivastest-howto#how-to-reproduce-tests):
		<!--- check correct sanitizer type -->
		<!--- add error pattern if needed -->
		<!--- copy as needed: -J dly_profile.dat -T head_rot_traj.csv -exof exof_traj.csv -->
		```
		python3 scripts/IvasBuildAndRunChecks.py --checks CLANG2 -m MODE -p /path/to/my/local/ci_linux_ltv_local.json
		```

.gitlab/issue_templates/msan_ltv_error.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ in the `Makefile` at lines 71 and 72. Note that this may increase runtime heavil
		Using the [scripts](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/Software-development/pyivastest-howto#how-to-reproduce-tests):
		<!--- check correct sanitizer type -->
		<!--- add error pattern if needed -->
		<!--- copy as needed: -J dly_profile.dat -T head_rot_traj.csv -exof exof_traj.csv -->

		```
		python3 scripts/IvasBuildAndRunChecks.py --checks CLANG1 -m MODE -p /path/to/my/local/ci_linux_ltv_local.json

.gitlab/issue_templates/usan_ltv_error.md

+4 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ Link to test pipeline: XXX
		Using the [scripts](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/Software-development/pyivastest-howto#how-to-reproduce-tests):
		<!--- check correct sanitizer type -->
		<!--- add error pattern if needed -->
		<!--- copy as needed: -J dly_profile.dat -T head_rot_traj.csv -exof exof_traj.csv -->

		```
		python3 scripts/IvasBuildAndRunChecks.py --checks CLANG3 -m MODE -p /path/to/my/local/ci_linux_ltv_local.json --usan_supp_file scripts/ubsan.supp
		```
		@@ -27,9 +29,9 @@ or directly:
		```
		make clean
		make -j CLANG=3
		./IVAS_cod ...
		UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,log_path=usan_log_catchall ./IVAS_cod ...
		networkSimulator_g192 dly_profile.dat bit bit_err trace_dump 1
		./IVAS_dec ...
		UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,log_path=usan_log_catchall ./IVAS_dec ...
		```

		<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.