diff --git a/scripts/create_histogram_summary.py b/scripts/create_histogram_summary.py index add088d6b7ef63d71a8a790ab7a6d6a2529d04ca..0b10b76b8d2ba3c2aebcabd9927276b4e7245c3c 100644 --- a/scripts/create_histogram_summary.py +++ b/scripts/create_histogram_summary.py @@ -143,6 +143,8 @@ if __name__ == "__main__": ax.set_title(fmt) ax.legend(loc="best") ax.set_xlabel(measure_label) + if "DIFF" in measure_label: + ax.set_xticks(range(len(limits_labels)), limits_labels, rotation=35) ax.set_ylabel("Number of test cases") fig.set_figheight(4) diff --git a/scripts/pyivastest/IvasBaseClass.py b/scripts/pyivastest/IvasBaseClass.py index c7c734c5c9733dc64da7b89bc891175d9d384462..75eddb2a8a620fdd28b014d936706056335f450d 100644 --- a/scripts/pyivastest/IvasBaseClass.py +++ b/scripts/pyivastest/IvasBaseClass.py @@ -134,15 +134,25 @@ class IvasLogger(logging.Logger): def getIvasLogger(name=None): + try: + # Python 3.13+ + acquireLock, releaseLock = logging._prepareFork, logging._afterFork + except AttributeError: + # Python <= 3.12 + acquireLock, releaseLock = logging._acquireLock, logging._releaseLock + logging_class = logging.getLoggerClass() - logging._acquireLock() + + acquireLock() + try: logging.setLoggerClass(IvasLogger) logger = logging.getLogger(name) logging.setLoggerClass(logging_class) return logger + finally: - logging._releaseLock() + releaseLock() class IvasBaseClass(object): diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index 3f37729133aac3f15f654e14393e3ba217be970b..ac5e31c79ab084b8b123ef06af3703e2a3c9be3a 100644 --- a/tests/renderer/utils.py +++ b/tests/renderer/utils.py @@ -325,12 +325,16 @@ def run_renderer( odg_ref = out_file_ref[0:-4] + ".BINAURAL.wav" if out_fmt not in PEAQ_SUPPORTED_FMT: + if in_fmt in PEAQ_SUPPORTED_FMT: + new_fmt = in_fmt # MONO or STEREO + else: + new_fmt = "BINAURAL" # Render test to BINAURAL cmd2 = RENDERER_CMD[:] cmd2[2] = str(out_file) # in_file cmd2[4] = str(out_fmt) # in_fmt cmd2[6] = odg_test # out_file - cmd2[8] = "BINAURAL" # out_fmt + cmd2[8] = new_fmt # out_fmt cmd2[10] = str(sr) cmd2[0] += BIN_SUFFIX_MERGETARGET # Use IVAS_rend_ref for re-rendering cmd2[0] += binary_suffix @@ -340,7 +344,7 @@ def run_renderer( cmd2[2] = str(out_file_ref) # in_file cmd2[6] = odg_ref # out_file run_cmd(cmd2, env) - out_fmt_bin = "BINAURAL" + out_fmt_bin = new_fmt else: out_fmt_bin = out_fmt odg_test = out_file