From 28d03999fed31f1b4cc3b748701da0a035032b9c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Mon, 20 Jan 2025 11:07:21 +0100
Subject: [PATCH 1/2] Fix for renderer tests

---
 scripts/create_histogram_summary.py | 2 ++
 tests/renderer/utils.py             | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/create_histogram_summary.py b/scripts/create_histogram_summary.py
index add088d6b7..0b10b76b8d 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/tests/renderer/utils.py b/tests/renderer/utils.py
index 3f37729133..ac5e31c79a 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
-- 
GitLab


From fcb9eebf6a0f3ff4d053000561816d91a23c3a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=BCller?= <fabian.mueller@iis.fraunhofer.de>
Date: Mon, 20 Jan 2025 11:46:09 +0100
Subject: [PATCH 2/2] Make scripts compatible with Python 3.13

---
 scripts/pyivastest/IvasBaseClass.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/pyivastest/IvasBaseClass.py b/scripts/pyivastest/IvasBaseClass.py
index c7c734c5c9..75eddb2a8a 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):
-- 
GitLab