From c4efdebabe05dc81a82a6c46feee0ad656f970ae Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 7 Jul 2025 16:28:55 +0200 Subject: [PATCH 1/4] exclude less testcases on main/float-pc --- ci/remove_unsupported_testcases.py | 47 +++++++++++++++++------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/ci/remove_unsupported_testcases.py b/ci/remove_unsupported_testcases.py index ed49c4f4d0..032a1dfceb 100644 --- a/ci/remove_unsupported_testcases.py +++ b/ci/remove_unsupported_testcases.py @@ -90,23 +90,33 @@ TESTCASES_MAIN = [ "4 ISM with metadata bitrate switching from 48 kbps to 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, JBM Prof 5", ] TESTCASES_MAIN_PC = [ - "SBA at 128 kbps, 32kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, HR", - "SBA at 128 kbps, 32kHZ in, 16kHz out, BINAURAL_ROOM_REVERB out (Model from file), HR", - "Planar SBA at 128 kbps, 48kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, HR", - "Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out default configuration", - "Multi-channel 5_1 at 80 kbps, 48kHz in, 32kHz out, BINAURAL_ROOM_REVERB out Config renderer, HR", - "OSBA planar 2OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM REVERB (Model from file) out", - "SBA 3OA 4ISM at 96 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out custom configuration", - "Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config recreation, HR", - "Multi-channel 5_1_2 at 64 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config renderer, HR", - "OSBA 3OA 4ISM at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out", - "OSBA 3ISM 3OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, BINAURAL ROOM REVERB out", - "Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM_REVERB out", - "OSBA 2OA 2ISM bitrate switching, 32kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, JBM Prof 5", -] -TESTCASES_MAIN_PC_REENABLE = [ - #"4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, rendconf dir w id", + "stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out", + "Multi-channel 5_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 32kHz out, EXT out", + "Multi-channel 7_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 16kHz out, EXT out", + "Multi-channel 5_1 at 512 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (CREND)", + "Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out", + "Multi-channel 5_1 at 64 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (FastConv)", + "Multi-channel 7_1_4 bitrate switching, 48kHz in, 48kHz out, BINAURAL out, HR, JBM Prof 5", + "Multi-channel 5_1 at 32 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (ParamBin)", + "Multi-channel 5_1_2 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, EXT out", + "Multi-channel 7_1 bitrate switching, 48kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, HR, JBM Prof 5", + "OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out", + "OMASA 2Dir2TC 2ISM at 96 kbps, 48kHz in, 48kHz out, FOA out, object editing, JBM Prof 5, DISC", + "OMASA 2Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out, default object editing, 1SEP-PARAM", + "OMASA 2Dir2TC 2ISM br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing", + "4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, PARAM_ISM", + "4 ISM with metadata bitrate switching from 32 kbps to 48 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_IR out, object editing", + "3 ISM with metadata at 384 kbps, 48 kHz in, 48 kHz out, FOA out, object editing, JBM Prof 5, DISC", + "OSBA 2OA 3ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing", + "OSBA 3OA 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, DISC", + "4 ISM with metadata bitrate switching from 48 kbps to 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, JBM Prof 5", + "3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, FOA out, object editing, JBM Prof 5, PARAM_ISM", + "OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, JBM Prof 5, DISC", + "OSBA 2OA 3ISM at 128 kbps, 48kHz in, 48kHz out, FOA out, object editing, JBM Prof 5, DISC", + "4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, DISC, FER at 5%", ] + + def remove_testcases(cfg: Path, testcases: list): """ Go through file line by line and copy all testcases except the given ones @@ -138,10 +148,7 @@ if __name__ == "__main__": testcases = TESTCASES_MAIN if args.use_main_pc_set: # Add further unsupported test cases - testcases.extend(TESTCASES_MAIN_PC) - # Re-enable test cases that are now supported - for case in TESTCASES_MAIN_PC_REENABLE: - testcases.remove(case) + testcases = TESTCASES_MAIN_PC for f in args.cfg_files: remove_testcases(f, testcases) -- GitLab From 0342eed76ea4d1f8b9cef3cb7763a9ecd984cf41 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 7 Jul 2025 16:41:24 +0200 Subject: [PATCH 2/4] add back OSBA FOA modes to the smoke test --- scripts/smoketest-basop-filter.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/scripts/smoketest-basop-filter.py b/scripts/smoketest-basop-filter.py index faa170f7e0..0a10d32f97 100644 --- a/scripts/smoketest-basop-filter.py +++ b/scripts/smoketest-basop-filter.py @@ -6,16 +6,20 @@ import logging import sys -logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s') +logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s") logger = logging.getLogger() def main(): parser = argparse.ArgumentParser() - parser.add_argument("input", help="input JSON", type=argparse.FileType('r')) - parser.add_argument("output", help="output JSON", type=argparse.FileType('w'), nargs="?") - parser.add_argument("--inline", "-i", help="patch input inline", action="store_true") + parser.add_argument("input", help="input JSON", type=argparse.FileType("r")) + parser.add_argument( + "output", help="output JSON", type=argparse.FileType("w"), nargs="?" + ) + parser.add_argument( + "--inline", "-i", help="patch input inline", action="store_true" + ) args = parser.parse_args() @@ -30,17 +34,14 @@ def main(): try: del modes[mode][encoder_config_name]["dec"]["EXT"] except KeyError: - logger.warning(f"No EXT dec in {mode} -> {encoder_config_name}, skipping") + logger.warning( + f"No EXT dec in {mode} -> {encoder_config_name}, skipping" + ) continue else: - logger.info(f"Found EXT dec in {mode} -> {encoder_config_name}, removing") - - for encoder_config_name in tuple(modes["OSBA"].keys()): - if not "FOA" in encoder_config_name: - continue - - logger.info(f"Removing OSBA FOA encoder config {encoder_config_name}") - del modes["OSBA"][encoder_config_name] + logger.info( + f"Found EXT dec in {mode} -> {encoder_config_name}, removing" + ) if args.inline: with open(args.input.name, "w") as f: -- GitLab From 5b6a09fe100b9e9686fa4690a1c9e8ac4d2afde7 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 7 Jul 2025 17:20:24 +0200 Subject: [PATCH 3/4] add to-be-removed testcases from ltv set --- ci/remove_unsupported_testcases.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/remove_unsupported_testcases.py b/ci/remove_unsupported_testcases.py index 032a1dfceb..1463a7bdd5 100644 --- a/ci/remove_unsupported_testcases.py +++ b/ci/remove_unsupported_testcases.py @@ -114,6 +114,12 @@ TESTCASES_MAIN_PC = [ "OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, JBM Prof 5, DISC", "OSBA 2OA 3ISM at 128 kbps, 48kHz in, 48kHz out, FOA out, object editing, JBM Prof 5, DISC", "4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, DISC, FER at 5%", + # following ones are for ltv only + "OMASA 2TC 2ISM br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing", + "OMASA 2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out", + "OMASA 2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out, default object editing, 1SEP-PARAM", + "OMASA 2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, JBM Prof 5, DISC", + "OMASA 2TC 2ISM at 96 kbps, 48kHz in, 48kHz out, FOA out, object editing, JBM Prof 5, DISC", ] -- GitLab From 5365d87d57de662e2c77bc4deb117d3206e22322 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 8 Jul 2025 10:34:25 +0200 Subject: [PATCH 4/4] add tests to ignore until fix is there --- ci/remove_unsupported_testcases.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/remove_unsupported_testcases.py b/ci/remove_unsupported_testcases.py index 1463a7bdd5..ec50bfda1e 100644 --- a/ci/remove_unsupported_testcases.py +++ b/ci/remove_unsupported_testcases.py @@ -120,6 +120,13 @@ TESTCASES_MAIN_PC = [ "OMASA 2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out, default object editing, 1SEP-PARAM", "OMASA 2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, JBM Prof 5, DISC", "OMASA 2TC 2ISM at 96 kbps, 48kHz in, 48kHz out, FOA out, object editing, JBM Prof 5, DISC", + # temporary only until BASOP issue 1808 is fixed + "Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out default configuration", + "OSBA 3ISM 3OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, BINAURAL ROOM REVERB out", + "OSBA 3OA 4ISM at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out", + "OSBA 2OA 2ISM bitrate switching, 32kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, JBM Prof 5", + "Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM_REVERB out", + "OSBA planar 2OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM REVERB (Model from file) out", ] -- GitLab