Merge branch 'main' into mc_paramupmix_160_headrotation_fix (7e1d7ce3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+8 −5

Original line number	Diff line number	Diff line
		@@ -326,15 +326,18 @@ codec-smoke-test:
		- .rules-merge-request
		timeout: "10 minutes"
		stage: test
		needs: ["build-codec-linux-cmake"]
		needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]
		script:
		- *print-common-info
		- bash ci/smoke_test.sh
		### analyze for failures
		- if cat smoke_test_output.txt \| grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi
		- if cat smoke_test_output_plc.txt \| grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi
		- if cat smoke_test_output_jbm_noEXT.txt \| grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi
		- if cat smoke_test_output_hrtf.txt \| grep -c "failed"; then echo "Smoke test with external hrtf files failed"; exit 1; fi
		- if ! [ -s smoke_test_output.txt ] \|\| ! [ -s smoke_test_output_plc.txt ] \|\| ! [ -s smoke_test_output_jbm_noEXT.txt ] \|\| ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi
		- ret_val=0
		- if cat smoke_test_output.txt \| grep -c "failed"; then echo "Smoke test without PLC failed"; ret_val=1; fi
		- if cat smoke_test_output_plc.txt \| grep -c "failed"; then echo "Smoke test with PLC failed"; ret_val=1; fi
		- if cat smoke_test_output_jbm_noEXT.txt \| grep -c "failed"; then echo "Smoke test JBM part failed"; ret_val=1; fi
		- if cat smoke_test_output_hrtf.txt \| grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi
		- exit $ret_val
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		expire_in: 1 week

ci/run_evs_be_test.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ def main():

		result_dict = dict()
		# run first part in parallel
		with concurrent.futures.ThreadPoolExecutor(max_workers=4) as executor:
		with concurrent.futures.ThreadPoolExecutor() as executor:
		executor.map(
		run_file, README_FILES_PARALLEL, BIN_PATHS, [result_dict] * len(README_FILES_PARALLEL)
		)

ci/run_evs_be_win_test.py

+20 −14

Original line number	Diff line number	Diff line
		@@ -42,19 +42,24 @@ def run_condition(eval_cmd, diff_cmd, id_count):
		cmd = subprocess.run(eval_cmd.split(), capture_output=True, text=True, check=True)

		# diff
		diff_success = 1
		diff_fails = ''
		if ';' in diff_cmd:
		# JBM cases
		diff_cmd1, diff_cmd2 = diff_cmd.split(';')
		cmd1 = subprocess.run(diff_cmd1.split(), capture_output=True, text=True, check=True)
		cmd2 = subprocess.run(diff_cmd2.split(), capture_output=True, text=True, check=True)
		diff_success = cmd1.returncode + cmd2.returncode
		cmd1 = subprocess.run(diff_cmd1.split(), stdout=subprocess.DEVNULL, check=False)
		cmd2 = subprocess.run(diff_cmd2.split(), stdout=subprocess.DEVNULL, check=False)
		if cmd1.returncode != 0:
		diff_fails += f'{diff_cmd1}\n'
		if cmd2.returncode != 0:
		diff_fails += f'{diff_cmd2}\n'
		else:
		cmd = subprocess.run(diff_cmd.split(), capture_output=True, text=True, check=True)
		diff_success = cmd.returncode
		if diff_success == 0:
		return None
		cmd = subprocess.run(diff_cmd.split(), stdout=subprocess.DEVNULL, check=False)
		if cmd.returncode != 0:
		diff_fails += f'{diff_cmd}\n'
		if diff_fails:
		return diff_fails
		else:
		return f'[{str(id_count).rjust(3)}] FAIL: {" ".join(eval_cmd)}\n {diff_cmd}\n'
		return None


		def environment_is_correct(paths):
		@@ -116,6 +121,7 @@ if __name__ == '__main__':
		if os.path.exists(tmp_dir):
		shutil.rmtree(tmp_dir)
		os.makedirs(tmp_dir)
		line = line.replace('testv', f'{test_vec_dir}/testv')
		line = line if tmp_dir is None else line.replace(
		'$TMP/', f'{tmp_dir}/')
		if '$CUT_DEC_BIN' in line:
		@@ -138,11 +144,11 @@ if __name__ == '__main__':

		results = [r.get() for r in results if r.get()]
		if results:
		print(f'\n{len(results)} test conditions failed:')
		print('\n'.join(results))
		print(f'\n --- {len(results)} test conditions failed ---')
		print(''.join(results))
		with open('failed.txt', 'w') as f:
		print(f'\n{len(results)} test conditions failed:', file=f)
		print('\n'.join(results), file=f)
		print(f' --- {len(results)} test conditions failed ---', file=f)
		print(''.join(results), file=f)
		sys.exit(1)
		else:
		print('\n * All tests passed! *')

scripts/config/ivas_modes.json

+224 −45

Original line number	Diff line number	Diff line
		@@ -949,18 +949,42 @@
		16400,
		24400,
		32000,
		48000
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"swb": [
		13200,
		16400,
		24400,
		32000,
		48000
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"fb": [
		32000,
		48000
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		]
		}
		},
		@@ -1139,13 +1163,46 @@
		"mono": false,
		"bitrates": {
		"wb": [
		48000
		13200,
		16400,
		24400,
		32000,
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"swb": [
		48000
		13200,
		16400,
		24400,
		32000,
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"fb": [
		48000
		32000,
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		]
		}
		},
		@@ -1176,6 +1233,10 @@
		"mono": false,
		"bitrates": {
		"wb": [
		13200,
		16400,
		24400,
		32000,
		48000,
		64000,
		80000,
		@@ -1187,6 +1248,10 @@
		512000
		],
		"swb": [
		13200,
		16400,
		24400,
		32000,
		48000,
		64000,
		80000,
		@@ -1198,6 +1263,7 @@
		512000
		],
		"fb": [
		32000,
		48000,
		64000,
		80000,
		@@ -1242,18 +1308,42 @@
		16400,
		24400,
		32000,
		48000
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"swb": [
		13200,
		16400,
		24400,
		32000,
		48000
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"fb": [
		32000,
		48000
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		]
		}
		},
		@@ -1285,13 +1375,46 @@
		"mono": false,
		"bitrates": {
		"wb": [
		48000
		13200,
		16400,
		24400,
		32000,
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"swb": [
		48000
		13200,
		16400,
		24400,
		32000,
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"fb": [
		48000
		32000,
		48000,
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		]
		}
		},
		@@ -1323,18 +1446,46 @@
		"mono": false,
		"bitrates": {
		"wb": [
		13200,
		16400,
		24400,
		32000,
		48000,
		64000,
		80000
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"swb": [
		13200,
		16400,
		24400,
		32000,
		48000,
		80000
		64000,
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"fb": [
		32000,
		48000,
		64000,
		80000
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		]
		}
		},
		@@ -1366,18 +1517,46 @@
		"mono": false,
		"bitrates": {
		"wb": [
		13200,
		16400,
		24400,
		32000,
		48000,
		64000,
		80000
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"swb": [
		13200,
		16400,
		24400,
		32000,
		48000,
		64000,
		80000
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		],
		"fb": [
		32000,
		48000,
		64000,
		80000
		80000,
		96000,
		128000,
		192000,
		256000,
		384000,
		512000
		]
		}
		}

scripts/prepare_instrumentation.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ cp -R ../Makefile $targetdir
		cp -R ../CMakeLists.txt $targetdir
		cp -R ../Workspace_msvc $targetdir
		if [ $INCLUDE_SPLIT -eq 0 ]; then
		strip_split_rendering.sh $targetdir
		./strip_split_rendering.sh $targetdir
		fi

		# back up #ifdef-list