Merge branch 'isar-updates_post_rend' into 'isar_selection' (c9903eb1) · Commits · IVAS Codec Public Collaboration / IVAS Processing Scripts

experiments/selection_isar/BS1534-1a/config/BS1534-1a.yml

+2 −1

+3 −6

Original line number	Diff line number	Diff line
		@@ -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

+3 −2

Original line number	Diff line number	Diff line
		@@ -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

+7 −2

Original line number	Diff line number	Diff line
		@@ -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

+8 −3

Original line number	Diff line number	Diff line
		@@ -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