diff --git a/ivas_processing_scripts/processing/ivas.py b/ivas_processing_scripts/processing/ivas.py index d1576d486944ef0c95c75ea861396507eae40922..4fe809869edc0dd976ab3f51570bd93f6890291b 100755 --- a/ivas_processing_scripts/processing/ivas.py +++ b/ivas_processing_scripts/processing/ivas.py @@ -256,11 +256,11 @@ class IVAS(Processing): delay_profile = self.tx["error_pattern"] len_pattern = length_pattern(delay_profile) - if not self.tx.get("errpat_late_loss_rate") and not self.tx.get( - "delay" + if not self.tx.get("errpatt_late_loss_rate") and not self.tx.get( + "errpatt_delay" ): raise KeyError( - "Either errpat_late_loss_rate or errpat_delay must be specified for converting a delay error profile to an error profile!" + f"Either errpatt_late_loss_rate or errpat_delay must be specified for converting a delay error profile to an error profile!\nGenerating {bitstream_processed}" ) errpat = bitstream.with_name( @@ -275,9 +275,9 @@ class IVAS(Processing): ) dlyerr_2_errpat( delay_profile, - delay=self.tx.get("errpat_delay"), + delay=self.tx.get("errpatt_delay"), fer_pattern=errpat, - late_loss_rate=self.tx.get("errpat_late_loss_rate"), + late_loss_rate=self.tx.get("errpatt_late_loss_rate"), shift=shift, ) eid_xor(errpat, bitstream, bitstream_processed) diff --git a/ivas_processing_scripts/processing/tx.py b/ivas_processing_scripts/processing/tx.py index 312b7e3e2ccc0f64f450e8fddf6595ebb1caafb1..4aab2d7f3cda40b48ffa5ba3b424c2cdec1f098a 100755 --- a/ivas_processing_scripts/processing/tx.py +++ b/ivas_processing_scripts/processing/tx.py @@ -50,26 +50,22 @@ def get_tx_cfg(cfg: TestConfig, cond_cfg: dict, is_EVS: bool = False) -> Optiona if tx_cfg_tmp.get("type", None) == "FER": tx_cfg = { "type": tx_cfg_tmp.get("type"), - "error_pattern": get_abs_path(tx_cfg_tmp.get("error_pattern", None)), - "error_rate": tx_cfg_tmp.get("error_rate", None), + "error_pattern": get_abs_path(tx_cfg_tmp.get("error_pattern")), + "error_rate": tx_cfg_tmp.get("error_rate"), "master_seed": cfg.master_seed, "prerun_seed": cfg.prerun_seed, } elif tx_cfg_tmp.get("type", None).startswith("JBM"): tx_cfg = { "type": tx_cfg_tmp.get("type"), - "error_pattern": get_abs_path(tx_cfg_tmp.get("error_pattern", None)), - "errpatt_seed": tx_cfg_tmp.get("errpatt_seed", None), - "error_profile": tx_cfg_tmp.get("error_profile", None), - "n_frames_per_packet": tx_cfg_tmp.get("n_frames_per_packet", None), + "error_pattern": get_abs_path(tx_cfg_tmp.get("error_pattern")), + "errpatt_seed": tx_cfg_tmp.get("errpatt_seed"), + "error_profile": tx_cfg_tmp.get("error_profile"), + "n_frames_per_packet": tx_cfg_tmp.get("n_frames_per_packet"), "master_seed": cfg.master_seed, + "errpatt_late_loss_rate": tx_cfg_tmp.get("errpatt_late_loss_rate"), + "errpatt_delay": tx_cfg_tmp.get("errpatt_delay"), } - # EVS specific keys - if is_EVS: - tx_cfg["errpatt_late_loss_rate"] = tx_cfg_tmp.get( - "errpatt_late_loss_rate", None - ) - tx_cfg["errpatt_delay"] = tx_cfg_tmp.get("errpatt_delay", None) else: raise ValueError("Type of bitstream procesing either missing or not valid")