relative paths for metadata and additonal small function (a5b1a2f7) · Commits · IVAS Codec Public Collaboration / IVAS Processing Scripts

ivas_processing_scripts/audiotools/metadata.py

+4 −2

Original line number	Diff line number	Diff line
		@@ -498,7 +498,9 @@ def check_ISM_metadata(

		elif len(current_item) == num_objects:
		# just read out
		list_item = current_item
		list_item = []
		for c_item in current_item:
		list_item.append(Path(c_item).resolve())
		else:
		raise ValueError("Number of objects and metadata does not match.")
		list_meta.append(list_item)
		@@ -528,7 +530,7 @@ def metadata_search(
		)
		# check if file exists and add to list
		if file_name_meta.is_file():
		list_item.append(file_name_meta)
		list_item.append(Path(file_name_meta).resolve())
		else:
		raise ValueError(f"Metadata file {file_name_meta} not found.")
		if len(item_names) == 1:

ivas_processing_scripts/processing/chains.py

+19 −43

Original line number	Diff line number	Diff line
		@@ -134,14 +134,10 @@ def get_preprocessing_2(cfg: TestConfig) -> dict:
		pre2_cfg = cfg.preprocessing_2
		background_cfg = pre2_cfg.get("background_noise", None)
		if background_cfg:
		if background_cfg.get("background_noise_path", None) is not None:
		background_noise = Path(background_cfg.get("background_noise_path", None)).resolve()
		else:
		background_noise = None

		background = {
		"snr": background_cfg.get("snr", None),
		"background_noise_path": background_noise,
		"background_noise_path": get_abs_path(background_cfg.get("background_noise_path", None)),
		"seed_delay": background_cfg.get("seed_delay", 0),
		"master_seed": cfg.master_seed,
		"output_fmt": cfg.postprocessing["fmt"],
		@@ -252,15 +248,11 @@ def get_processing_chain(
		tx_cfg_tmp = cond_cfg["tx"]
		else:
		tx_cfg_tmp = cfg.tx
		if tx_cfg_tmp.get("error_pattern", None) is not None:
		error_pattern = Path(tx_cfg_tmp.get("error_pattern", None)).resolve()
		else:
		error_pattern = None

		if tx_cfg_tmp.get("type", None) == "FER":
		tx_cfg = {
		"type": tx_cfg_tmp.get("type", None),
		"error_pattern": error_pattern,
		"error_pattern": get_abs_path(tx_cfg_tmp.get("error_pattern", None)),
		"error_rate": tx_cfg_tmp.get("error_rate", None),
		"master_seed": cfg.master_seed,
		"prerun_seed": tx_cfg_tmp.get("prerun_seed", 0),
		@@ -268,7 +260,7 @@ def get_processing_chain(
		elif tx_cfg_tmp.get("type", None) == "JBM":
		tx_cfg = {
		"type": tx_cfg_tmp.get("type", None),
		"error_pattern": error_pattern,
		"error_pattern": get_abs_path(tx_cfg_tmp.get("error_pattern", None)),
		"error_profile": tx_cfg_tmp.get("error_profile", None),
		"n_frames_per_packet": tx_cfg_tmp.get("n_frames_per_packet", None),
		}
		@@ -283,14 +275,6 @@ def get_processing_chain(
		preamble = cfg.preprocessing_2.get("preamble", 0)
		else:
		preamble = 0
		if cod_cfg.get("bin", None) is not None:
		cod_bin = Path(cod_cfg.get("bin", None)).resolve()
		else:
		cod_bin = None
		if dec_cfg.get("bin", None) is not None:
		dec_bin = Path(dec_cfg.get("bin", None)).resolve()
		else:
		dec_bin = None

		chain["processes"].append(
		EVS(
		@@ -299,9 +283,9 @@ def get_processing_chain(
		"in_fs": tmp_in_fs,
		"out_fs": dec_cfg.get("fs", tmp_in_fs),
		"bitrate": bitrate,
		"cod_bin": cod_bin,
		"cod_bin": get_abs_path(cod_cfg.get("bin", None)),
		"cod_opts": cod_cfg.get("opts"),
		"dec_bin": dec_bin,
		"dec_bin": get_abs_path(dec_cfg.get("bin", None)),
		"dec_opts": dec_cfg.get("opts"),
		"multiprocessing": cfg.multiprocessing,
		"tx": tx_cfg,
		@@ -323,15 +307,11 @@ def get_processing_chain(
		tx_cfg_tmp = cond_cfg["tx"]
		else:
		tx_cfg_tmp = cfg.tx
		if tx_cfg_tmp.get("error_pattern", None) is not None:
		error_pattern = Path(tx_cfg_tmp.get("error_pattern", None)).resolve()
		else:
		error_pattern = None

		if tx_cfg_tmp.get("type", None) == "FER":
		tx_cfg = {
		"type": tx_cfg_tmp.get("type", None),
		"error_pattern": error_pattern,
		"error_pattern": get_abs_path(tx_cfg_tmp.get("error_pattern", None)),
		"error_rate": tx_cfg_tmp.get("error_rate", None),
		"master_seed": cfg.master_seed,
		"prerun_seed": tx_cfg_tmp.get("prerun_seed", 0),
		@@ -339,7 +319,7 @@ def get_processing_chain(
		elif tx_cfg_tmp.get("type", None) == "JBM":
		tx_cfg = {
		"type": tx_cfg_tmp.get("type", None),
		"error_pattern": error_pattern,
		"error_pattern": tx_cfg_tmp.get("error_rate", None),
		"error_profile": tx_cfg_tmp.get("error_profile", None),
		"n_frames_per_packet": tx_cfg_tmp.get("n_frames_per_packet", None),
		}
		@@ -354,14 +334,7 @@ def get_processing_chain(
		preamble = cfg.preprocessing_2.get("preamble", 0)
		else:
		preamble = 0
		if cod_cfg.get("bin", None) is not None:
		cod_bin = Path(cod_cfg.get("bin", None)).resolve()
		else:
		cod_bin = None
		if dec_cfg.get("bin", None) is not None:
		dec_bin = Path(dec_cfg.get("bin", None)).resolve()
		else:
		dec_bin = None

		chain["processes"].append(
		IVAS(
		{
		@@ -370,9 +343,9 @@ def get_processing_chain(
		"out_fmt": dec_cfg.get("fmt", tmp_out_fmt),
		"out_fs": dec_cfg.get("fs", tmp_in_fs),
		"bitrate": bitrate,
		"cod_bin": cod_bin,
		"cod_bin": get_abs_path(cod_cfg.get("bin", None)),
		"cod_opts": cod_cfg.get("opts"),
		"dec_bin": dec_bin,
		"dec_bin": get_abs_path(dec_cfg.get("bin", None)),
		"dec_opts": dec_cfg.get("opts"),
		"multiprocessing": cfg.multiprocessing,
		"tx": tx_cfg,
		@@ -388,11 +361,6 @@ def get_processing_chain(
		raise SystemExit(f"Unknown condition {condition}!")

		# add postprocessing step based on condition
		if post_cfg.get("trajectory", None) is not None:
		trajectory = Path(post_cfg.get("trajectory", None)).resolve()
		else:
		trajectory = None

		chain["processes"].append(
		Postprocessing(
		{
		@@ -406,7 +374,7 @@ def get_processing_chain(
		"bin_dataset": post_cfg.get("bin_dataset"),
		"bin_lfe_gain": post_cfg.get("bin_lfe_gain"),
		"limit": post_cfg.get("limit", True),
		"trajectory": trajectory,
		"trajectory": get_abs_path(post_cfg.get("trajectory", None)),
		"multiprocessing": cfg.multiprocessing,
		"mnru_q": tmp_mnru_q,
		"esdru_alpha": tmp_esdru_alpha,
		@@ -415,3 +383,11 @@ def get_processing_chain(
		)

		return chain


		def get_abs_path(rel_path):
		if rel_path is not None:
		abs_path = Path(rel_path).resolve()
		else:
		abs_path = None
		return abs_path