Merge branch '408-ism-metadata-not-used-in-python-based-tests' into 'main' (a79309f3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ codec-smoke-test:
		- *print-common-info
		- bash ci/smoke_test.sh
		### analyze for failures
		- cat out/logs/stv1MASA2TC48c_MASA_2TC_1DIR_b96_fb_cbr.enc.txt
		- 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

ci/run_scheduled_sanitizer_test.py

+18 −3

Original line number	Diff line number	Diff line
		@@ -63,8 +63,7 @@ def main(args):

		assert all([t in SUPPORTED_TESTS for t in tests])

		modes = get_modes(in_format)
		returncode = run_check(modes, out_formats, tests, run_fec=run_fec)
		returncode = run_check(in_format, out_formats, tests, run_fec=run_fec)

		collect_for_sanitizer_test(CONSOLE_OUT_FILE)

		@@ -92,7 +91,22 @@ def get_modes(in_format: str) -> list:
		return mode_list


		def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True):
		def get_md_file_command(in_format: str) -> list:

		cmd = list()
		if in_format.startswith("ISM"):
		cmd.append("--metadata_files")
		md_filename = "/usr/local/ltv/ltvISM{}.csv"
		n = int(in_format[-1])
		cmd.extend([md_filename.format(i) for i in range(1, n + 1)])

		return cmd


		def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = True):

		modes = get_modes(in_format)
		md_file_command = get_md_file_command(in_format)

		### always run encoder and decoder with no frameloss
		cmd_no_fec = [
		@@ -107,6 +121,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True)
		*modes,
		"--oc",
		*out_formats,
		*md_file_command,
		]

		print(

ci/smoke_test.sh

+6 −1

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ fi

		cfg=./scripts/config/ci_linux.json
		dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat
		ism_md_cmd="--metadata_files /usr/local/testv/stvISM1.csv /usr/local/testv/stvISM2.csv /usr/local/testv/stvISM3.csv /usr/local/testv/stvISM4.csv"

		if [ $BUILD -eq 1 ];then
		# Enable memory macros to find unbalanced memory allocations/deallocations
		@@ -74,7 +75,11 @@ if [ $BUILD -eq 1 ];then
		fi

		# run all modes vanilla-fashion
		./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS \| tee smoke_test_output.txt
		# treat ISM modes separately because passing the metadata files to MASA modes causes crashes
		ism_modes=$(./scripts/runIvasCodec.py -l \| grep ISM)
		non_ism_modes=$(./scripts/runIvasCodec.py -l \| grep -v ISM)
		./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg -U 1 $WORKERS \| tee smoke_test_output.txt
		./scripts/runIvasCodec.py -m $ism_modes -p $cfg -U 1 $WORKERS $ism_md_cmd \| tee smoke_test_output.txt
		# run the decoding again, but with 15% frame loss
		./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS -D="-fec 15" --decoder_only \| tee smoke_test_output_plc.txt

scripts/config/ci_linux.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@
		"SBA": "/usr/local/testv/stv3OA48c.wav",
		"MASA1TC1DIR": "/usr/local/testv/stv1MASA1TC48c.wav",
		"MASA1TC2DIR": "/usr/local/testv/stv2MASA1TC48c.wav",
		"MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav.wav",
		"MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav.wav",
		"MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav",
		"MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav",
		"5_1": "/usr/local/testv/stv51MC48c.wav",
		"5_1_2": "/usr/local/testv/stv512MC48c.wav",
		"5_1_4": "/usr/local/testv/stv514MC48c.wav",

scripts/config/ivas_modes.json

+8 −8

Original line number	Diff line number	Diff line
		@@ -1813,7 +1813,7 @@
		"table_name": "ISM1@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 1,
		"metadatafilenames": [
		"test_ISM_trajectory{mdi}.csv"
		"stvISM{mdi}.csv"
		],
		"rs": false,
		"amr": false,
		@@ -1868,7 +1868,7 @@
		"table_name": "ISM1@{table_bitrate} kbps DTX {bandwidth}",
		"nummetadata": 1,
		"metadatafilenames": [
		"test_ISM_trajectory{mdi}.csv"
		"stvISM{mdi}.csv"
		],
		"rs": false,
		"amr": false,
		@@ -1924,7 +1924,7 @@
		"table_name": "ISM2@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 2,
		"metadatafilenames": [
		"test_ISM_trajectory{mdi}.csv"
		"stvISM{mdi}.csv"
		],
		"rs": false,
		"amr": false,
		@@ -1986,7 +1986,7 @@
		"table_name": "ISM2@{table_bitrate} kbps DTX {bandwidth}",
		"nummetadata": 2,
		"metadatafilenames": [
		"test_ISM_trajectory{mdi}.csv"
		"stvISM{mdi}.csv"
		],
		"rs": false,
		"amr": false,
		@@ -2049,7 +2049,7 @@
		"table_name": "ISM3@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 3,
		"metadatafilenames": [
		"test_ISM_trajectory{mdi}.csv"
		"stvISM{mdi}.csv"
		],
		"rs": false,
		"amr": false,
		@@ -2112,7 +2112,7 @@
		"table_name": "ISM3@{table_bitrate} kbps DTX {bandwidth}",
		"nummetadata": 3,
		"metadatafilenames": [
		"test_ISM_trajectory{mdi}.csv"
		"stvISM{mdi}.csv"
		],
		"rs": false,
		"amr": false,
		@@ -2176,7 +2176,7 @@
		"table_name": "ISM4@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 4,
		"metadatafilenames": [
		"test_ISM_trajectory{mdi}.csv"
		"stvISM{mdi}.csv"
		],
		"rs": false,
		"amr": false,
		@@ -2242,7 +2242,7 @@
		"table_name": "ISM4@{table_bitrate} kbps DTX {bandwidth}",
		"nummetadata": 4,
		"metadatafilenames": [
		"test_ISM_trajectory{mdi}.csv"
		"stvISM{mdi}.csv"
		],
		"rs": false,
		"amr": false,