diff --git a/experiments/selection_isar/BS1534-1a/config/BS1534-1a.yml b/experiments/selection_isar/BS1534-1a/config/BS1534-1a.yml index 526748086d117cdf8f6a48023607fa2d035ecb93..b689ccd145cb9ea42ea1d3dcbf0e716d4d67cb4e 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 9503d0712f14ba68e142449685ef4eaac3070a75..84b9a51ee6183bcac70677462453d60ca00a3d2d 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: "7_1_4" fs: 48000 aligned_to: len: 20 @@ -47,7 +47,6 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR1" dec: fmt: "BINAURAL" c02: @@ -55,7 +54,6 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR1" dec: fmt: "BINAURAL" out_fc: 7000 @@ -64,7 +62,6 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR1" dec: fmt: "BINAURAL" trans_bitrate: 256000 @@ -77,13 +74,13 @@ conditions_to_generate: bitrates: - 512000 cod: - fmt: "MASA2DIR1" dec: 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 4d9102f3b93eb6b8eed4984424a7be73da673f02..ff6aef9d723446a2b79e4b72a7a84fd0e929057b 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 @@ -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 1873defa5816fdeccc613d8d9367b74216b00753..fc40c0dd590bc8b3148cb878e3d279d0a8abf309 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,12 +77,14 @@ conditions_to_generate: bitrates: - 512000 cod: + fmt: "MASA2DIR2" dec: 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 03d08932b9fc073f70fb4a6c165181f9d6777b99..fdcc787d960e795edd686db96d86422eb0de8b01 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 dcdbd3f377c821d17df6abc198ff44e05117677d..428017ebe7896a2dc228424c9b577bccc7ca984c 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")