From 327f481820b71a2c51365a0c6ca8fb5502502945 Mon Sep 17 00:00:00 2001 From: rtyag Date: Fri, 8 Mar 2024 00:33:20 +1100 Subject: [PATCH 1/3] adding post renderer EXE support and updates to YML config files --- .../BS1534-1a/config/BS1534-1a.yml | 3 +- .../BS1534-2a/config/BS1534-2a.yml | 3 +- .../BS1534-3a/config/BS1534-3a.yml | 3 +- .../BS1534-4a/config/BS1534-4a.yml | 3 +- ivas_processing_scripts/processing/config.py | 11 +++-- ivas_processing_scripts/processing/ivas.py | 45 ++++++++++++------- 6 files changed, 46 insertions(+), 22 deletions(-) diff --git a/experiments/selection_isar/BS1534-1a/config/BS1534-1a.yml b/experiments/selection_isar/BS1534-1a/config/BS1534-1a.yml index 52674808..b689ccd1 100644 --- a/experiments/selection_isar/BS1534-1a/config/BS1534-1a.yml +++ b/experiments/selection_isar/BS1534-1a/config/BS1534-1a.yml @@ -78,8 +78,9 @@ conditions_to_generate: fmt: "BINAURAL_SPLIT_CODED" split_rend: fmt: "BINAURAL" - bitrate: 512000 + bitrate: 768000 dof: 3 + hqmode: 1 ################################################ ### Post-processing diff --git a/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml b/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml index 9503d071..4e354350 100644 --- a/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml +++ b/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml @@ -82,8 +82,9 @@ conditions_to_generate: fmt: "BINAURAL_SPLIT_CODED" split_rend: fmt: "BINAURAL" - bitrate: 512000 + bitrate: 768000 dof: 3 + hqmode: 1 ################################################ ### Post-processing diff --git a/experiments/selection_isar/BS1534-3a/config/BS1534-3a.yml b/experiments/selection_isar/BS1534-3a/config/BS1534-3a.yml index 4d9102f3..af64ac71 100644 --- a/experiments/selection_isar/BS1534-3a/config/BS1534-3a.yml +++ b/experiments/selection_isar/BS1534-3a/config/BS1534-3a.yml @@ -78,8 +78,9 @@ conditions_to_generate: fmt: "BINAURAL_SPLIT_CODED" split_rend: fmt: "BINAURAL" - bitrate: 512000 + bitrate: 768000 dof: 3 + hqmode: 1 ################################################ ### Post-processing diff --git a/experiments/selection_isar/BS1534-4a/config/BS1534-4a.yml b/experiments/selection_isar/BS1534-4a/config/BS1534-4a.yml index 1873defa..c498ded2 100644 --- a/experiments/selection_isar/BS1534-4a/config/BS1534-4a.yml +++ b/experiments/selection_isar/BS1534-4a/config/BS1534-4a.yml @@ -78,8 +78,9 @@ conditions_to_generate: fmt: "BINAURAL_SPLIT_CODED" split_rend: fmt: "BINAURAL" - bitrate: 512000 + bitrate: 768000 dof: 3 + hqmode: 1 ################################################ ### Post-processing diff --git a/ivas_processing_scripts/processing/config.py b/ivas_processing_scripts/processing/config.py index 03d08932..fdcc787d 100755 --- a/ivas_processing_scripts/processing/config.py +++ b/ivas_processing_scripts/processing/config.py @@ -69,13 +69,18 @@ def merge_dicts(base: dict, other: dict) -> None: def get_default_config_for_codecs(codec_name: str, ext_with_dot: str = "") -> dict: is_transcoding = "transcoding" in codec_name - is_splitrend = "split_rend" in codec_name + is_splitrend = "ISAR" in codec_name + + if is_splitrend: + post_rend_name = codec_name.split(" ")[1] + post_rend_bin = f"{post_rend_name}_post_rend{ext_with_dot}" codec_name = codec_name.split(" ")[0] cod_bin = f"{codec_name}_cod{ext_with_dot}" dec_bin = f"{codec_name}_dec{ext_with_dot}" rend_bin = f"{codec_name}_rend{ext_with_dot}" + cfg = { "cod": { "bin": find_binary(cod_bin, raise_error=False), @@ -93,7 +98,7 @@ def get_default_config_for_codecs(codec_name: str, ext_with_dot: str = "") -> di } if is_splitrend: cfg["split_rend"] = { - "bin": find_binary(rend_bin, raise_error=False), + "bin": find_binary(post_rend_bin, raise_error=False), } return cfg @@ -273,7 +278,7 @@ class TestConfig: ) elif type.startswith("ivas_split_rend"): merged_cfg = get_default_config_for_codecs( - "IVAS split_rend", codec_bin_extension + "IVAS ISAR", codec_bin_extension ) merge_dicts(merged_cfg, cond_cfg) cfg["conditions_to_generate"][cond_name] = merged_cfg diff --git a/ivas_processing_scripts/processing/ivas.py b/ivas_processing_scripts/processing/ivas.py index dcdbd3f3..428017eb 100755 --- a/ivas_processing_scripts/processing/ivas.py +++ b/ivas_processing_scripts/processing/ivas.py @@ -529,21 +529,36 @@ class IVAS_rend(Processing): elif self.out_fmt.name == "BINAURAL" and post_trj: cmd.extend(["-T", str(post_trj)]) - cmd.extend( - [ - "-q", - "-fs", - str(self.in_fs // 1000), - "-i", - str(in_file), - "-if", - self.in_fmt.name, - "-o", - str(out_file), - "-of", - self.out_fmt.name, - ] - ) + if self.in_fmt.name == "BINAURAL_SPLIT_CODED": + cmd.extend( + [ + "-q", + "-fs", + str(self.in_fs // 1000), + "-i", + str(in_file), + "-if", + self.in_fmt.name, + "-o", + str(out_file), + ] + ) + else: + cmd.extend( + [ + "-q", + "-fs", + str(self.in_fs // 1000), + "-i", + str(in_file), + "-if", + self.in_fmt.name, + "-o", + str(out_file), + "-of", + self.out_fmt.name, + ] + ) if in_meta: cmd.append("-im") -- GitLab From 7fce4f22b6dcf7e99a5331cd1704e38f7b6f176f Mon Sep 17 00:00:00 2001 From: rtyag Date: Fri, 8 Mar 2024 18:18:34 +1100 Subject: [PATCH 2/3] update MASA config file to read HOA2 and generate MASA2DIR2 --- .../selection_isar/BS1534-2a/config/BS1534-2a.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml b/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml index 4e354350..f678a1f5 100644 --- a/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml +++ b/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml @@ -16,7 +16,7 @@ condition_in_output_filename: true ### Input configuration ################################################ input: - fmt: "FOA" + fmt: "HOA2" fs: 48000 aligned_to: len: 20 @@ -47,7 +47,7 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR1" + fmt: "MASA2DIR2" dec: fmt: "BINAURAL" c02: @@ -55,7 +55,7 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR1" + fmt: "MASA2DIR2" dec: fmt: "BINAURAL" out_fc: 7000 @@ -64,7 +64,7 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR1" + fmt: "MASA2DIR2" dec: fmt: "BINAURAL" trans_bitrate: 256000 @@ -77,7 +77,7 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR1" + fmt: "MASA2DIR2" dec: fmt: "BINAURAL_SPLIT_CODED" split_rend: -- GitLab From 728f60a5292252e592b9268fb156b2916ece0304 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 8 Mar 2024 11:56:25 +0100 Subject: [PATCH 3/3] change formats in config files to reflect Test Plan correctly --- experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml | 6 +----- experiments/selection_isar/BS1534-3a/config/BS1534-3a.yml | 2 +- experiments/selection_isar/BS1534-4a/config/BS1534-4a.yml | 6 +++++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml b/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml index f678a1f5..84b9a51e 100644 --- a/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml +++ b/experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml @@ -16,7 +16,7 @@ condition_in_output_filename: true ### Input configuration ################################################ input: - fmt: "HOA2" + fmt: "7_1_4" fs: 48000 aligned_to: len: 20 @@ -47,7 +47,6 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR2" dec: fmt: "BINAURAL" c02: @@ -55,7 +54,6 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR2" dec: fmt: "BINAURAL" out_fc: 7000 @@ -64,7 +62,6 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR2" dec: fmt: "BINAURAL" trans_bitrate: 256000 @@ -77,7 +74,6 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR2" dec: fmt: "BINAURAL_SPLIT_CODED" split_rend: diff --git a/experiments/selection_isar/BS1534-3a/config/BS1534-3a.yml b/experiments/selection_isar/BS1534-3a/config/BS1534-3a.yml index af64ac71..ff6aef9d 100644 --- a/experiments/selection_isar/BS1534-3a/config/BS1534-3a.yml +++ b/experiments/selection_isar/BS1534-3a/config/BS1534-3a.yml @@ -16,7 +16,7 @@ condition_in_output_filename: true ### Input configuration ################################################ input: - fmt: "7_1_4" + fmt: "ISM4" fs: 48000 aligned_to: len: 20 diff --git a/experiments/selection_isar/BS1534-4a/config/BS1534-4a.yml b/experiments/selection_isar/BS1534-4a/config/BS1534-4a.yml index c498ded2..fc40c0dd 100644 --- a/experiments/selection_isar/BS1534-4a/config/BS1534-4a.yml +++ b/experiments/selection_isar/BS1534-4a/config/BS1534-4a.yml @@ -16,7 +16,7 @@ condition_in_output_filename: true ### Input configuration ################################################ input: - fmt: "ISM4" + fmt: "HOA2" fs: 48000 aligned_to: len: 20 @@ -47,6 +47,7 @@ conditions_to_generate: bitrates: - 512000 cod: + fmt: "MASA2DIR2" dec: fmt: "BINAURAL" c02: @@ -54,6 +55,7 @@ conditions_to_generate: bitrates: - 512000 cod: + fmt: "MASA2DIR2" dec: fmt: "BINAURAL" out_fc: 7000 @@ -62,6 +64,7 @@ conditions_to_generate: bitrates: - 512000 cod: + fmt: "MASA2DIR2" dec: fmt: "BINAURAL" trans_bitrate: 256000 @@ -74,6 +77,7 @@ conditions_to_generate: bitrates: - 512000 cod: + fmt: "MASA2DIR2" dec: fmt: "BINAURAL_SPLIT_CODED" split_rend: -- GitLab