Merge branch 'main' into 744-fix-sofa-to-rom-tables-and-binaural-binary-files (85b3c376) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+13 −10

Original line number	Diff line number	Diff line
		@@ -841,13 +841,16 @@ check-first-frame-is-sid:
		- make -j

		# TODO: for some MASA modes, we currently do not have testvectors that actually trigger DTX
		# SBA is run separately to use shorter part of file
		# SBA modes are run separately to use shorter part of file
		- exit_code_no_sba=0
		- exit_code_sba=0
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -v MASA \| grep -v SBA)
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 0:20 \|\| exit_code_no_sba=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep SBA)
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 70:80 \|\| exit_code_sba=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -v MASA \| grep -vE "FOA\|HOA" )
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 \|\| exit_code_no_sba=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -E "HOA")
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 \|\| exit_code_sba=$?
		# need to do FOA separately as VAD apparently behaves differently there
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep "FOA")
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 \|\| exit_code_sba=$?
		- if [ $exit_code_no_sba -ne 0 ] \|\| [ $exit_code_sba -ne 0 ]; then exit 1; fi
		artifacts:
		paths:
		@@ -1256,15 +1259,15 @@ sanitizer-test-mc-7_1_4:
		- .sanitizer-test-template
		timeout: 6 hours

		sanitizer-test-sba:
		sanitizer-test-hoa3:
		extends: .sanitizer-test-schedule-C
		rules:
		- if: $SANITIZER_SCHEDULE_C
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py SBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
		- python3 ci/run_scheduled_sanitizer_test.py HOA3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS

		sanitizer-test-planarsba:
		sanitizer-test-planarhoa3:
		extends: .sanitizer-test-schedule-C
		rules:
		- if: $SANITIZER_SCHEDULE_C
		@@ -1272,7 +1275,7 @@ sanitizer-test-planarsba:
		start_in: 6 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py PlanarSBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
		- python3 ci/run_scheduled_sanitizer_test.py PlanarHOA3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS

		### --- sanitizer schedule D ---

		@@ -1457,7 +1460,7 @@ complexity-sba-hoa3-in-hoa3-out:
		- *print-common-info
		- *update-ltv-repo
		- *complexity-measurements-setup
		- in_format=SBA
		- in_format=HOA3
		- out_format=HOA3
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?

ci/smoke_test.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ echo "\n======================= 5. JBM, modes with EXT =======================\n
		./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 \| tee -a smoke_test_output_jbm_noEXT.txt

		# run all modes with binaural output using external files
		modes_with_bin_out="SBA PlanarSBA MASA MC ISM1 ISM2 ISM3 ISM4"
		modes_with_bin_out="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4"
		bin_out_modes="BINAURAL BINAURAL_ROOM_IR"

		echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n"

scripts/config/ivas_modes.json

+684 −30

File changed.

Preview size limit exceeded, changes collapsed.

scripts/pyivastest/IvasModeCollector.py

+1 −8

Original line number	Diff line number	Diff line
		@@ -425,13 +425,6 @@ class IvasModeCollector(IvasBaseClass.IvasBaseClass):
		self.logger.info("Adding items to mode {}...".format(mode))
		in_config = self.flat_mode_list[mode]["cmd"]["in_config"]

		# hack to handle group B SBA bitrates
		if in_config == "SBA" and any(
		str(br) in mode for br in constants.SPAR_BITRATES
		):
		# group B SBA takes FOA only
		in_dir = self.in_dirs["FOA"]
		else:
		in_dir = self.in_dirs[in_config]
		in_files = []

scripts/pyivastest/IvasModeRunner.py

+0 −67

Original line number	Diff line number	Diff line
		@@ -49,68 +49,6 @@ from pyaudio3dtools.spatialaudioformat import Format as spformat
		import pyaudio3dtools.audiofile as af
		import pyaudio3dtools.audioarray as ar
		BW_TO_SR = {"nb": 8, "wb": 16, "swb": 32, "fb": 48}
		IN_CONFIG_TO_COPY_AUDIO = {
		"SBA": [],
		"HOA3": [],
		"MASA": [],
		"ISM": [],
		"MONO": ["--chanA=A"],
		"STEREO": ["--chanA=A", "--chanB=B"],
		"5_1": [
		"--chanA=A",
		"--chanB=B",
		"--chanC=C",
		"--chanD=D",
		"--chanE=E",
		"--chanF=F",
		],
		"7_1": [
		"--chanA=A",
		"--chanB=B",
		"--chanC=C",
		"--chanD=D",
		"--chanE=E",
		"--chanF=F",
		"--chanG=G",
		"--chanH=H",
		],
		"5_1_2": [
		"--chanA=A",
		"--chanB=B",
		"--chanC=C",
		"--chanD=D",
		"--chanE=E",
		"--chanF=F",
		"--chanG=G",
		"--chanH=H",
		],
		"5_1_4": [
		"--chanA=A",
		"--chanB=B",
		"--chanC=C",
		"--chanD=D",
		"--chanE=E",
		"--chanF=F",
		"--chanG=G",
		"--chanH=H",
		"--chanI=I",
		"--chanJ=J",
		],
		"7_1_4": [
		"--chanA=A",
		"--chanB=B",
		"--chanC=C",
		"--chanD=D",
		"--chanE=E",
		"--chanF=F",
		"--chanG=G",
		"--chanH=H",
		"--chanI=I",
		"--chanJ=J",
		"--chanK=K",
		"--chanL=L",
		],
		}


		class Error(Exception):
		@@ -631,11 +569,6 @@ class IvasModeRunner(IvasModeCollector.IvasModeCollector):
		af.convertfile(resamp_in_path, pcm_name_transformed, in_fs=fs, out_fs=out_fs)

		in_config = config["cmd"]["in_config"].upper()
		chn_arg = []
		if in_config in IN_CONFIG_TO_COPY_AUDIO:
		chn_arg = IN_CONFIG_TO_COPY_AUDIO[
		config["cmd"]["in_config"].upper()
		]

		pcm_log.flush()
		pcm_log.close()