From 187317fa86438768e913897b6b827fce076a8163 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Jul 2025 09:25:40 +0200 Subject: [PATCH 1/7] shorten filenames in split rendering tests --- tests/split_rendering/utils.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/split_rendering/utils.py b/tests/split_rendering/utils.py index 4fe7de3ae0..b13195bdd0 100644 --- a/tests/split_rendering/utils.py +++ b/tests/split_rendering/utils.py @@ -192,14 +192,17 @@ def run_full_chain_split_rendering( tmp_dir = Path(tmp_dir) cut_in_file = tmp_dir.joinpath("cut_input.wav") # ivas_bitstream = tmp_dir.joinpath("ivas.192") - ivas_bitstream_stem = f"{in_fmt}_{bitrate}bps_{renderer_fmt}_split_full_config_{render_config.stem}_prerfr_{pre_rend_fr}_postrfr_{post_rend_fr}_ivas.192" + + filename_base = f"{in_fmt}_{bitrate}_{renderer_fmt.replace("BINAURAL_", "")}_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}" + + ivas_bitstream_stem = f"{filename_base}_ivas.192" # split_bitstream = tmp_dir.joinpath("split.bit") - split_bitstream_stem = f"{in_fmt}_{bitrate}bps_{renderer_fmt}_split_full_config_{render_config.stem}_prerfr_{pre_rend_fr}_postrfr_{post_rend_fr}_split.bit" + split_bitstream_stem = f"{filename_base}_split.bit" if renderer_fmt == "BINAURAL_SPLIT_PCM": # split_md_file = tmp_dir.joinpath("split_md.bin") - split_md_file_stem = f"{in_fmt}_{bitrate}bps_{renderer_fmt}_split_full_config_{render_config.stem}_prerfr_{pre_rend_fr}_postrfr_{post_rend_fr}_split_md.bit" + split_md_file_stem = f"{filename_base}_split_md.bit" - out_file_stem = f"{in_fmt}_{bitrate}bps_{renderer_fmt}_split_full_config_{render_config.stem}_prerfr_{pre_rend_fr}_postrfr_{post_rend_fr}_.wav" + out_file_stem = f"{filename_base}.wav" if test_info.config.option.create_ref: output_path_base = OUTPUT_PATH_REF @@ -365,7 +368,8 @@ def run_external_split_rendering( split_bitstream = tmp_dir.joinpath("split.bit") if renderer_fmt == "BINAURAL_SPLIT_PCM": split_md_file = tmp_dir.joinpath("split_md.bin") - out_file_stem = f"{in_fmt}_{renderer_fmt}_split_ext_config_{render_config.stem}_postrfr_{pre_rend_fr}_prerfr_{post_rend_fr}.wav" + + out_file_stem = f"{in_fmt}_{renderer_fmt.replace("BINAURAL_", "")}_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}.wav" if test_info.config.option.create_ref: output_path_base = OUTPUT_PATH_REF @@ -450,7 +454,7 @@ def run_external_split_rendering( cut, cut_fs = readfile(out_file) - if get_mld == False: + if not get_mld: [diff_found, snr, gain_b, max_diff] = check_BE( test_info, ref, ref_fs, cut, cut_fs ) -- GitLab From da95aa54e2c7110ee4686ef75e2feb9b5ff80035 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Jul 2025 09:36:14 +0200 Subject: [PATCH 2/7] workaround for qoutes in f-string in old python version --- tests/split_rendering/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/split_rendering/utils.py b/tests/split_rendering/utils.py index b13195bdd0..199f4d673a 100644 --- a/tests/split_rendering/utils.py +++ b/tests/split_rendering/utils.py @@ -193,7 +193,8 @@ def run_full_chain_split_rendering( cut_in_file = tmp_dir.joinpath("cut_input.wav") # ivas_bitstream = tmp_dir.joinpath("ivas.192") - filename_base = f"{in_fmt}_{bitrate}_{renderer_fmt.replace("BINAURAL_", "")}_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}" + renderer_fmt_for_filename = renderer_fmt.replace("BINAURAL_", "") + filename_base = f"{in_fmt}_{bitrate}_{renderer_fmt_for_filename}_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}" ivas_bitstream_stem = f"{filename_base}_ivas.192" # split_bitstream = tmp_dir.joinpath("split.bit") -- GitLab From 525bb5035d090e2618b563cac4bb30126460b4cd Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Jul 2025 09:45:05 +0200 Subject: [PATCH 3/7] fix f-string issue in other place as well... --- tests/split_rendering/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/split_rendering/utils.py b/tests/split_rendering/utils.py index 199f4d673a..7a4db525af 100644 --- a/tests/split_rendering/utils.py +++ b/tests/split_rendering/utils.py @@ -370,7 +370,8 @@ def run_external_split_rendering( if renderer_fmt == "BINAURAL_SPLIT_PCM": split_md_file = tmp_dir.joinpath("split_md.bin") - out_file_stem = f"{in_fmt}_{renderer_fmt.replace("BINAURAL_", "")}_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}.wav" + renderer_fmt_for_filename = renderer_fmt.replace("BINAURAL_", "") + out_file_stem = f"{in_fmt}_{renderer_fmt_for_filename}_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}.wav" if test_info.config.option.create_ref: output_path_base = OUTPUT_PATH_REF -- GitLab From 76650794d9f46302f74d734489045f9d4baae327 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Jul 2025 10:24:01 +0200 Subject: [PATCH 4/7] add missing renaming of post renderer executable --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3376dc113..ba303836f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1251,6 +1251,7 @@ ivas-conformance: - cp -force IVAS_cod.exe IVAS_cod_ref.exe - cp -force IVAS_dec.exe IVAS_dec_ref.exe - cp -force IVAS_rend.exe IVAS_rend_ref.exe + - cp -force ISAR_post_rend.exe ISAR_post_rend_ref.exe # Reference creation - python scripts/prepare_combined_format_inputs.py @@ -1344,6 +1345,7 @@ ivas-conformance-linux: - cp IVAS_cod IVAS_cod_ref - cp IVAS_dec IVAS_dec_ref - cp IVAS_rend IVAS_rend_ref + - cp ISAR_post_rend ISAR_post_rend_ref # Reference creation - python3 scripts/prepare_combined_format_inputs.py -- GitLab From d7f37610400153a1d33baae48dbe8ffe4a71b7e4 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Jul 2025 10:58:53 +0200 Subject: [PATCH 5/7] keep "ext" and "full" to better match files to testcases --- tests/split_rendering/utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/split_rendering/utils.py b/tests/split_rendering/utils.py index 7a4db525af..1099d98fe1 100644 --- a/tests/split_rendering/utils.py +++ b/tests/split_rendering/utils.py @@ -194,14 +194,14 @@ def run_full_chain_split_rendering( # ivas_bitstream = tmp_dir.joinpath("ivas.192") renderer_fmt_for_filename = renderer_fmt.replace("BINAURAL_", "") - filename_base = f"{in_fmt}_{bitrate}_{renderer_fmt_for_filename}_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}" + filename_base = f"{in_fmt}_{bitrate}_{renderer_fmt_for_filename}_full_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}" - ivas_bitstream_stem = f"{filename_base}_ivas.192" + ivas_bitstream_stem = f"{filename_base}.192" # split_bitstream = tmp_dir.joinpath("split.bit") - split_bitstream_stem = f"{filename_base}_split.bit" + split_bitstream_stem = f"{filename_base}.splt" if renderer_fmt == "BINAURAL_SPLIT_PCM": # split_md_file = tmp_dir.joinpath("split_md.bin") - split_md_file_stem = f"{filename_base}_split_md.bit" + split_md_file_stem = f"{filename_base}.spltmd" out_file_stem = f"{filename_base}.wav" @@ -371,7 +371,7 @@ def run_external_split_rendering( split_md_file = tmp_dir.joinpath("split_md.bin") renderer_fmt_for_filename = renderer_fmt.replace("BINAURAL_", "") - out_file_stem = f"{in_fmt}_{renderer_fmt_for_filename}_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}.wav" + out_file_stem = f"{in_fmt}_{renderer_fmt_for_filename}_ext_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}.wav" if test_info.config.option.create_ref: output_path_base = OUTPUT_PATH_REF -- GitLab From c9269c6a4016ece75d122fca98070c97e2c294fb Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Thu, 24 Jul 2025 13:59:45 +0200 Subject: [PATCH 6/7] Add report_cmd.html for easier debugging of ivas-conformance --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba303836f5..a3a9e4706a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1317,6 +1317,7 @@ ivas-conformance: expire_in: 1 week when: always paths: + - report_cmd.html - report-junit.xml - report.html - Readme_IVAS_dec.txt -- GitLab From 3aa5bd732d2dcbe448cf9aca2f164e8d2e63d7b5 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Jul 2025 18:19:03 +0200 Subject: [PATCH 7/7] use .bit ext for split rend bitstream files conformance test depends on it --- tests/split_rendering/utils.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/split_rendering/utils.py b/tests/split_rendering/utils.py index 1099d98fe1..ccc6a9b5c8 100644 --- a/tests/split_rendering/utils.py +++ b/tests/split_rendering/utils.py @@ -191,17 +191,15 @@ def run_full_chain_split_rendering( with TemporaryDirectory() as tmp_dir: tmp_dir = Path(tmp_dir) cut_in_file = tmp_dir.joinpath("cut_input.wav") - # ivas_bitstream = tmp_dir.joinpath("ivas.192") renderer_fmt_for_filename = renderer_fmt.replace("BINAURAL_", "") filename_base = f"{in_fmt}_{bitrate}_{renderer_fmt_for_filename}_full_cfg_{render_config.stem}_fr_pre_{pre_rend_fr}_post_{post_rend_fr}" ivas_bitstream_stem = f"{filename_base}.192" - # split_bitstream = tmp_dir.joinpath("split.bit") - split_bitstream_stem = f"{filename_base}.splt" + # NOTE: the split bitstream files need to have ".bit" extension otherwise the conformance test breaks + split_bitstream_stem = f"{filename_base}.splt.bit" if renderer_fmt == "BINAURAL_SPLIT_PCM": - # split_md_file = tmp_dir.joinpath("split_md.bin") - split_md_file_stem = f"{filename_base}.spltmd" + split_md_file_stem = f"{filename_base}.spltmd.bit" out_file_stem = f"{filename_base}.wav" -- GitLab