Merge branch 'main' into deduplicate-renderer-tests (4bfcf0b6) · Commits · IVAS Codec Public Collaboration / IVAS Codec CI

includes/check-first-frame-is-sid.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@ check-first-frame-is-sid:
		- .rules-merge-request-to-main
		stage: test
		needs: ["build-codec-linux-clang-cmake"]
		tags:
		- ivas-linux-fast
		script:
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
		- \|

includes/complexity-jobs.yml

+49 −21

Original line number	Diff line number	Diff line
		@@ -13,7 +13,15 @@

		# this is a testing/maintenance mechanism to force getting the log history from a specific job id
		# see below in the concrete complexity jobs
		- if [ "$JOB_ID_INJECT" != "" ]; then job_id=$JOB_ID_INJECT; fi
		- \|
		if [ "$CI_PROJECT_ID" == "$PROJECT_ID_BASOP" ] && [ "$JOB_ID_INJECT_BASOP" != "" ]; then
		job_id=$JOB_ID_INJECT_BASOP
		fi

		- \|
		if [ "$CI_PROJECT_ID" == "$PROJECT_ID_FLOAT" ] && [ "$JOB_ID_INJECT_FLOAT" != "" ]; then
		job_id=$JOB_ID_INJECT_FLOAT
		fi

		- curl --silent --show-error --request GET "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts.zip
		- unzip -qq artifacts.zip \|\| true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html
		@@ -126,7 +134,8 @@ complexity-stereo-in-ext-out:
		rules:
		- if: $MANUAL_PIPELINE_TYPE == 'complexity' \|\| $MEASURE_COMPLEXITY_LINUX
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=stereo
		- out_format=ext
		@@ -143,7 +152,8 @@ complexity-ism-in-binaural-out:
		when: delayed
		start_in: 1 hour
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=ISM
		- out_format=BINAURAL
		@@ -160,7 +170,8 @@ complexity-ism-in-binaural_room_ir-out:
		when: delayed
		start_in: 2 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_IR
		@@ -177,7 +188,8 @@ complexity-ism-in-ext-out:
		when: delayed
		start_in: 3 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=ISM
		- out_format=EXT
		@@ -194,7 +206,8 @@ complexity-sba-hoa3-in-ext-out:
		when: delayed
		start_in: 4 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=HOA3
		- out_format=EXT
		@@ -211,7 +224,8 @@ complexity-sba-hoa3-in-binaural-out:
		when: delayed
		start_in: 5 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=HOA3
		- out_format=BINAURAL
		@@ -228,7 +242,8 @@ complexity-sba-hoa3-in-binaural_room_ir-out:
		when: delayed
		start_in: 6 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=HOA3
		- out_format=BINAURAL_ROOM_IR
		@@ -245,7 +260,8 @@ complexity-mc-in-ext-out:
		when: delayed
		start_in: 7 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=MC
		- out_format=EXT
		@@ -262,7 +278,8 @@ complexity-mc-in-binaural-out:
		when: delayed
		start_in: 10 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=MC
		- out_format=BINAURAL
		@@ -279,7 +296,8 @@ complexity-mc-in-binaural_room_ir-out:
		when: delayed
		start_in: 12 hours 30 minutes
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=MC
		- out_format=BINAURAL_ROOM_IR
		@@ -296,7 +314,8 @@ complexity-masa-in-ext-out:
		when: delayed
		start_in: 15 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=MASA
		- out_format=EXT
		@@ -313,7 +332,8 @@ complexity-masa-in-binaural-out:
		when: delayed
		start_in: 16 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=MASA
		- out_format=BINAURAL
		@@ -330,7 +350,8 @@ complexity-masa-in-hoa3-out:
		when: delayed
		start_in: 17 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=MASA
		- out_format=HOA3
		@@ -347,7 +368,8 @@ complexity-omasa-in-ext-out:
		when: delayed
		start_in: 18 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=OMASA
		- out_format=EXT
		@@ -364,7 +386,8 @@ complexity-omasa-in-binaural-out:
		when: delayed
		start_in: 20 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=OMASA
		- out_format=BINAURAL
		@@ -381,7 +404,8 @@ complexity-omasa-in-hoa3-out:
		when: delayed
		start_in: 22 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=OMASA
		- out_format=HOA3
		@@ -398,7 +422,8 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		when: delayed
		start_in: 24 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=StereoDmxEVS
		- out_format=mono
		@@ -415,7 +440,8 @@ complexity-osba-in-ext-out:
		when: delayed
		start_in: 25 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=OSBA
		- out_format=EXT
		@@ -432,7 +458,8 @@ complexity-osba-in-binaural-out:
		when: delayed
		start_in: 28 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=OSBA
		- out_format=BINAURAL
		@@ -449,7 +476,8 @@ complexity-osba-in-binaural_room_ir-out:
		when: delayed
		start_in: 31 hours
		variables:
		JOB_ID_INJECT: ""
		JOB_ID_INJECT_BASOP: ""
		JOB_ID_INJECT_FLOAT: ""
		script:
		- in_format=OSBA
		- out_format=BINAURAL_ROOM_IR

main-float.yml

+15 −9

Original line number	Diff line number	Diff line
		@@ -1041,12 +1041,18 @@ lc3plus-ensure-no-code-changes:
		needs: []
		timeout: "5 minutes"
		script:
		# Replace code commited to repo with code downloaded from ETSI
		- ./scripts/lc3plus_lib_setup/get_lc3plus.sh
		- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
		- lc3plus_update_flag=$(grep -c --ignore-case "\[lc3plus[ -]update\]" tmp.txt) \|\| true

		- git_diff_return_code=0
		- git diff --name-only --exit-code $CI_MERGE_REQUEST_TARGET_BRANCH_NAME -- lib_lc3plus \|\| git_diff_return_code=$?

		# Ensure git reports no changes
		- modified_files=$(git status -su lib_lc3plus)
		- if [[ $modified_files ]]; then printf 'LC3plus codebase was modified!\n\n'"$modified_files"'\n\n'; exit $EXIT_CODE_FAIL; fi
		- \|
		if [ $git_diff_return_code != 0 ] && [ $lc3plus_update_flag == 0 ]; then
		echo "Your MR modifies lib_lc3plus. That should not be done. If this MR is meant to update to a new LC3plus version, add '[lc3plus-update]' to your MR title."
		exit 1
		fi
		- exit 0

		check-bitexactness-hrtf-rom-and-file:
		extends:
		@@ -1300,7 +1306,7 @@ ivas-conformance:
		- mkdir testvec
		- mkdir testvec/binauralRenderer_interface
		- mkdir testvec/testv
		- mkdir testvec/testv/renderer_short
		- mkdir testvec/testv/renderer
		- mkdir testvec/testv/split_rendering
		- mkdir testvec/bin
		- cp -force -ErrorAction Ignore scripts/testv/* testvec/testv
		@@ -1310,7 +1316,7 @@ ivas-conformance:
		- cp -r -force -ErrorAction Ignore scripts/trajectories testvec
		- cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
		- cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref
		- cp -r -force -ErrorAction Ignore tests/renderer/ref testvec/testv/renderer_short/ref
		- cp -r -force -ErrorAction Ignore tests/renderer/ref testvec/testv/renderer/ref
		- cp -r -force -ErrorAction Ignore tests/split_rendering/ref testvec/testv/split_rendering/ref
		- cp -r -force -ErrorAction Ignore tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs
		- cp -r -force -ErrorAction Ignore tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns
		@@ -1390,7 +1396,7 @@ ivas-conformance-linux:
		- mkdir testvec
		- mkdir testvec/binauralRenderer_interface
		- mkdir testvec/testv
		- mkdir testvec/testv/renderer_short
		- mkdir testvec/testv/renderer
		- mkdir testvec/testv/split_rendering
		- mkdir testvec/bin
		- cp -r scripts/testv/* testvec/testv
		@@ -1400,7 +1406,7 @@ ivas-conformance-linux:
		- cp -r scripts/trajectories testvec
		- cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
		- cp -r tests/ref testvec/testv/ref
		- cp -r tests/renderer/ref testvec/testv/renderer_short/ref
		- cp -r tests/renderer/ref testvec/testv/renderer/ref
		- cp -r tests/split_rendering/ref testvec/testv/split_rendering/ref
		- cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs
		- cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns

snippets/basop/branch-is-up-to-date-with-target-pre.sh

+1 −8

Original line number	Diff line number	Diff line
		@@ -32,17 +32,10 @@ set -euxo pipefail

		float_ref_branchname_in_ivas_codec="main"

		# if the branch follows the naming conventions for parallel MRs and there is a branch of the same name in the float repo, set that branch as the float ref
		# otherwise we default to main

		exit_code_follows_naming_conventions=0
		# if branch does not follow the convention, there will be a printout which is irrelevant here, so redirect it to null
		bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/branch-follows-porting-naming-convention.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME >>/dev/null \|\| exit_code_follows_naming_conventions=$?

		exit_code_companion_branch_exists=0
		bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/check-for-parallel-branch-in-float-repo.sh \|\| exit_code_companion_branch_exists=$?

		if [[ "$exit_code_follows_naming_conventions" == "0" ]] && [[ "$exit_code_companion_branch_exists" == "0" ]]; then
		if [[ "$exit_code_companion_branch_exists" == "0" ]]; then
		float_ref_branchname_in_ivas_codec=$CI_COMMIT_REF_NAME
		fi

snippets/basop/check-for-parallel-branch-in-float-repo.sh

+2 −10

Original line number	Diff line number	Diff line
		@@ -28,21 +28,13 @@
		# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
		# the United Nations Convention on Contracts on the International Sales of Goods.

		MSG_NO_FLOAT_REF_BRANCH_FOUND="Your branch name %s conforms to the naming convention for parallel work on float and basop, but there is no corresponding branch of the same name in ivas-codec.
		If this is intended (no changes on ivas-codec main), simply ignore this warning.
		MSG_NO_FLOAT_REF_BRANCH_FOUND="There is no corresponding branch of the same name in ivas-codec, so no parallel float MR branch for this branch was found.
		If this is intended (no parallel changes on ivas-codec main), simply ignore this warning.
		If there should be a float ref branch for this MR, please check your spelling on your other branch and make sure that you pushed it.\n
		"

		set -euxo pipefail

		exit_code_is_porting_mr=0
		bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/branch-follows-porting-naming-convention.sh "$CI_COMMIT_REF_NAME" \|\| exit_code_is_porting_mr=$?

		# if this does not look like a porting branch, finish with success here - no need to check for a float companion
		if [ "$exit_code_is_porting_mr" == "1" ]; then
		exit 0
		fi

		# if this does indeed look like a porting branch, get the float companion branch - if that is the default, then warn about possible typo/missing branch
		float_ref_branchname=$CI_COMMIT_REF_NAME