Merge branch 'main' into 1053-reverb-reconfiguration-runtime-test (d1709711) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+22 −0

Original line number	Diff line number	Diff line
		@@ -1188,6 +1188,28 @@ check-bitexactness-hrtf-rom-and-file:
		expose_as: "logs-hrtf-loading"
		expire_in: "5 days"

		check-bitexactness-ext-and-transport-format:
		extends:
		- .test-job-linux
		- .rules-merge-request
		stage: test
		needs: ["build-codec-linux-cmake"]
		timeout: "5 minutes"
		script:
		- *print-common-info
		- cmake .
		- make -j
		- python3 tests/create_short_testvectors.py --cut_len 1.0
		- python3 -m pytest tests/test_be_for_ext_outputs.py --html=report.html --junit-xml=report-junit.xml --self-contained-html
		artifacts:
		paths:
		- report.html
		- report-junit.xml
		when: always
		name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_ID--sha-$CI_COMMIT_SHA--ext-sanity-check"
		expose_as: "logs-ext-sanity-check"
		expire_in: "5 days"


		# ---------------------------------------------------------------
		# Test jobs for main branch

ci/remove_unsupported_testcases.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ import argparse
		TESTCASES = [
		"OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out",
		"OSBA planar FOA 2ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out",
		"4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, combined render config, directivity configuration with identifiers",
		"4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, rendconf dir w id",
		"OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out",
		"Multi-channel 5_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 10%, bandwidth switching",
		"OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 5%, bandwidth switching",
		@@ -43,8 +43,8 @@ TESTCASES = [
		"OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out",
		"OSBA planar FOA 2ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out",
		"OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out",
		"SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB combined renderer configuration with selected acoustic environment",
		"OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching",
		"SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB rendconf sel acoustic env",
		"OSBA FOA 4ISM at br sw 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching",
		"stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out",
		"SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 32kHz in, 32kHz out, DTX on, EXT out",
		"SBA 2OA bitrate switching from 13.2 kbps to 128 kbps, 32kHz in, 32kHz out, DTX on, EXT out",

scripts/check-format.sh

+12 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,16 @@ cl-format-apply() {
		${CLANG_FORMAT} -i $1
		}

		ensure-one-newline()
		{
		# first command adds a newline at the end of the file if there might be none
		# -> clang-format-13 does not add them and warnings e.g. on MacOS are triggered by them
		sed -i -e '$a\' $1
		# second command removes multiple newlines at the end of a file so that there is only one left
		# -> clang-format-13 does not do that, but complains about it
		sed -i -e :a -e '/^\n*$/{$d;N;ba' -e '}' $1
		}

		cl-format-check() {
		local I=$1
		local COLOR=$2
		@@ -197,6 +207,7 @@ if [[ $NUMPROCS -lt 2 ]]; then
		RET=$?
		((NUMFAILS+=RET))
		if [ $FORMAT ]; then
		ensure-one-newline $i
		cl-format-apply $i
		fi
		done
		@@ -218,6 +229,7 @@ else
		fi
		((NUMFAILS+=RET))
		if [ $FORMAT ]; then
		ensure-one-newline $i
		cl-format-apply $i
		fi ) &
		while [[ $(jobs -r -p \| wc -l) -ge $NUMPROCS ]];do

tests/cmp_pcm.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,8 @@ def cmp_pcm(file1, file2, out_config, fs, get_mld=False, mld_lim=0, abs_tol=0) -
		print("=====================")

		out_config = "MONO" if out_config == "" else out_config
		if out_config.upper() not in pyivastest.constants.OC_TO_NCHANNELS:
		# out_config may be a string or a Path. Wrap in str() to avoid error in case it is a Path.
		if str(out_config).upper() not in pyivastest.constants.OC_TO_NCHANNELS:
		out_config_in_file_names = os.path.splitext(os.path.basename(out_config))[0]
		nchannels = (
		pyivastest.IvasScriptsCommon.IvasScript.get_n_channels_from_ls_layout(

tests/codec_be_on_mr_nonselection/init.py

+0 −2

Original line number	Diff line number	Diff line
		MLD_PATTERN = r"MLD: ([\d\.]*)"
		MAX_DIFF_PATTERN = r"MAXIMUM ABS DIFF: (\d*)"