fixes to ISAR conformance tests (dc307c3e) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+14 −8

Original line number	Diff line number	Diff line
		@@ -1387,8 +1387,9 @@ ivas-conformance:
		# Reference creation
		- python tests/create_short_testvectors.py
		- python scripts/prepare_combined_format_inputs.py
		- python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
		- python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
		- python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
		- python -m pytest tests/split_rendering/test_split_rendering.py -v -n auto --create_ref --keep_files
		- python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

		# Output creation
		- python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		@@ -1406,7 +1407,7 @@ ivas-conformance:
		- mkdir testvec/binauralRenderer_interface
		- mkdir testvec/testv
		- mkdir testvec/testv/renderer
		- mkdir testvec/testv/split_renderer
		- mkdir testvec/testv/split_rendering
		- mkdir testvec/bin
		- cp -force -ErrorAction Ignore scripts/testv/* testvec/testv
		- cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec
		@@ -1416,7 +1417,9 @@ ivas-conformance:
		- cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref
		- cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref
		- cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref
		- cp -r -force -ErrorAction Ignore tests/split_renderer/cut testvec/testv/split_renderer/ref
		- cp -r -force -ErrorAction Ignore tests/split_rendering/cut 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

		# Remove redundant files
		- python scripts/cleanup_26252.py
		@@ -1478,12 +1481,13 @@ ivas-conformance-linux:
		# Reference creation
		- python3 tests/create_short_testvectors.py
		- python3 scripts/prepare_combined_format_inputs.py
		- TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py"
		- TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py"
		- python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
		- python3 -m pytest tests/split_rendering/test_split_rendering.py -v -n auto --create_ref --keep_files
		- python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

		# Output creation
		- python3 -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		- python3 -m pytest $TEST_SET tests/split_rendering/test_split_rendering.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		- python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt

		# Copy input data and output ref data
		@@ -1492,7 +1496,7 @@ ivas-conformance-linux:
		- mkdir testvec/binauralRenderer_interface
		- mkdir testvec/testv
		- mkdir testvec/testv/renderer
		- mkdir testvec/testv/split_renderer
		- mkdir testvec/testv/split_rendering
		- mkdir testvec/bin
		- cp -r scripts/testv/* testvec/testv
		- cp -r scripts/ls_layouts testvec
		@@ -1502,7 +1506,9 @@ ivas-conformance-linux:
		- cp -r tests/ref testvec/testv/ref
		- cp -r tests/dut/* testvec/testv/ref
		- cp -r tests/renderer/cut testvec/testv/renderer/ref
		- cp -r tests/split_renderer/cut testvec/testv/split_renderer/ref
		- cp -r tests/split_rendering/cut 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

		# Remove redundant files
		- python3 scripts/cleanup_26252.py

scripts/cleanup_26252.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ from pathlib import Path
		import os
		import glob

		files = ['Readme_IVAS_JBM_dec.txt','Readme_IVAS_dec.txt','Readme_IVAS_enc.txt','Readme_IVAS_rend.txt'];
		files = ['Readme_IVAS_JBM_dec.txt','Readme_IVAS_dec.txt','Readme_IVAS_enc.txt','Readme_IVAS_rend.txt', 'Readme_IVAS_ISAR_dec.txt', 'Readme_IVAS_ISAR_post_rend.txt'];

		used_files = []
		kept = 0

scripts/dec_isar_header.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,5 +16,6 @@ LOG_FILE=Readme_IVAS_ISAR_dec_log.txt
		rm -rf tmp
		rm -rf $CUT_PATH
		mkdir -p $CUT_PATH
		mkdir -p $CUT_PATH/dut/isar/pre_rend_out
		mkdir -p $CUT_PATH/split_rendering/cut

scripts/isar_post_rend_header.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ LOG_FILE=Readme_IVAS_isar_post_rend_log.txt

		rm -rf tmp
		rm -rf $CUT_PATH
		mkdir -p $CUT_PATH/split_renderer/cut
		mkdir -p $CUT_PATH/split_renderer/data
		mkdir -p $CUT_PATH/split_rendering/cut

scripts/parse_commands.py

+21 −6

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ if __name__ == '__main__':
		enc_cmd = False
		dec_cmd = False
		rend_cmd = False
		isar_post_rend_cmd = False
		for line in infile.readlines():
		if enc_cmd:
		cmds_enc.append(line)
		@@ -57,9 +58,9 @@ if __name__ == '__main__':
		elif rend_cmd:
		cmds_rend.append(line)
		rend_cmd = False
		elif cmds_isar_post_rend:
		elif isar_post_rend_cmd:
		cmds_isar_post_rend.append(line)
		cmds_isar_post_rend = False
		isar_post_rend_cmd = False
		else:
		if "DUT encoder command" in line:
		enc_cmd = True
		@@ -68,13 +69,12 @@ if __name__ == '__main__':
		elif "Running command" in line:
		rend_cmd = True
		elif "Running ISAR post renderer command" in line:
		cmds_isar_post_rend = True
		isar_post_rend_cmd = True

		# Sort lists to keep deterministic order between runs
		cmds_enc.sort()
		cmds_dec.sort()
		cmds_rend.sort()
		cmds_ivas_isar_dec.sort()
		cmds_isar_post_rend.sort()

		with open(txt_file.replace('.','_enc.'),'w', newline='\n') as outfile:
		@@ -117,10 +117,15 @@ if __name__ == '__main__':
		arg = re.sub('IVAS_dec(.exe)?', '$CUT_DEC_BIN', arg)
		arg = re.sub('scripts', TESTV_PATH, arg)
		arg = re.sub('tests/ref', REF_PATH + r'/ref', arg) # For .fer cases the bitstream is in ref
		arg = re.sub('tests/split_rendering/renderer_configs', REF_PATH + r'/split_rendering/renderer_configs', arg)
		if re.search("^tests.*192$",arg):
		arg = re.sub('tests/split_rendering/cut', REF_PATH + r'/split_rendering/ref', arg)
		if re.search("\.wav$",arg):
		arg = re.sub('tests', CUT_PATH, arg) # Output argument for decoder ends with .wav
		else:
		arg = re.sub('tests/dut', REF_PATH + r'/ref', arg) # Input argument
		if re.search("^tests.*bit$",arg):
		arg = re.sub('tests', CUT_PATH, arg) # Output argument for decoder ends with .wav
		args.append(arg)
		cmd = ' '.join(args)

		@@ -133,6 +138,8 @@ if __name__ == '__main__':

		outfile.write(cmd+'\n')
		out = re.search(r"\s(([\S]+)(.wav))$", cmd)
		isar_out = re.search(r"\s(([\S]+)(.bit))$", cmd)
		isar_md_out = re.search(r"-om\s(([\S]+)(.bit))", cmd)
		if out:
		diff_cmds=[]
		for output in glob.glob(absolute_out.group(1) + '*'):
		@@ -140,11 +147,18 @@ if __name__ == '__main__':
		output = re.sub('tests', CUT_PATH, output)
		diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'/dut',REF_PATH + r'/ref')+' '+output+' >> $LOG_FILE 2>&1')
		outfile.write(('; ').join(diff_cmds))
		if isar_out and "cut" in isar_out.group(1):
		outfile.write('$DIFF_BIN '+isar_out.group(1).replace(CUT_PATH + r'/split_rendering/cut',REF_PATH + r'/split_rendering/ref')+' '+isar_out.group(1)+' >> $LOG_FILE 2>&1\n')
		if isar_md_out and "cut" in isar_md_out.group(1):
		outfile.write('$DIFF_BIN '+isar_md_out.group(1).replace(CUT_PATH + r'/split_rendering/cut',REF_PATH + r'/split_rendering/ref')+' '+isar_md_out.group(1)+' >> $LOG_FILE 2>&1\n')

		outfile.write('\n\n')
		with open('scripts/script_footer.txt','r') as footer:
		outfile_dec.write(footer.read())
		footer.seek(0)
		outfile_jbm.write(footer.read())
		footer.seek(0)
		outfile_isar.write(footer.read())

		with open(txt_file.replace('.','_rend.'),'w', newline='\n') as outfile:
		with open('scripts/rend_header.txt','r') as header:
		@@ -182,7 +196,8 @@ if __name__ == '__main__':
		arg = path.relpath(arg).replace('\\','/')
		arg = re.sub('ISAR_post_rend(.exe)?', '$CUT_ISAR_POST_REND_BIN', arg)
		arg = re.sub('scripts', TESTV_PATH, arg)
		arg = re.sub('tests/split_renderer/data', TESTV_PATH + r'split_renderer/data/', arg)
		if re.search("^tests.*bit$",arg):
		arg = re.sub('tests/split_rendering/cut', REF_PATH + r'/split_rendering/ref', arg)
		arg = re.sub('tests', CUT_PATH, arg)
		args.append(arg)
		cmd = ' '.join(args)
		@@ -191,7 +206,7 @@ if __name__ == '__main__':
		outfile.write(cmd+'\n')
		out = re.search(r"-o\s(([\S]+)(.wav\|.raw\|.pcm))", cmd)
		if out and "cut" in out.group(1):
		outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'/split_renderer/cut',REF_PATH + r'/split_renderer/ref')+' '+out.group(1)+' >> $LOG_FILE 2>&1\n')
		outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'/split_rendering/cut',REF_PATH + r'/split_rendering/ref')+' '+out.group(1)+' >> $LOG_FILE 2>&1\n')
		outfile.write('\n')
		with open('scripts/script_footer.txt','r') as footer:
		outfile.write(footer.read())
		No newline at end of file