From 6c7d6113de2d78e9b6c04954788dd70b7ec93368 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Mon, 15 May 2023 13:08:17 +0200
Subject: [PATCH 1/5] printout commit SHA after pulling from codec repo

---
 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5da8fcf..35eb37ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,10 +24,10 @@ stages:
 
 # print some info on the runner setup
 .print-common-info: &print-common-info
-  - echo "--------------------------------------------\n"
+  - printf "--------------------------------------------\n"
   - python3 --version
   - pip3 freeze | grep "numpy\|scipy\|YAML\|pytest\|black\|isort\|flake8"
-  - echo "--------------------------------------------\n\n"
+  - printf "--------------------------------------------\n\n"
 
 
 # script anchor for updating the codec repo
@@ -37,6 +37,9 @@ stages:
   - cd $CODEC_DIR
   # make sure that we are at latest main
   - git pull
+  - printf "--------------------------------------------\n"
+  - echo "Building codec on commit $(git rev-parse HEAD --short)"
+  - printf "--------------------------------------------\n"
   # only builds if code has actually changed
   - make -j
   - cd $dir
-- 
GitLab


From b4fcef4db16c537e55c86fbacce56f9d43224fe3 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Mon, 15 May 2023 13:10:41 +0200
Subject: [PATCH 2/5] echo instead of printf

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35eb37ed..b969c91f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,10 +24,10 @@ stages:
 
 # print some info on the runner setup
 .print-common-info: &print-common-info
-  - printf "--------------------------------------------\n"
+  - echo "--------------------------------------------"
   - python3 --version
   - pip3 freeze | grep "numpy\|scipy\|YAML\|pytest\|black\|isort\|flake8"
-  - printf "--------------------------------------------\n\n"
+  - echo "--------------------------------------------"
 
 
 # script anchor for updating the codec repo
@@ -37,9 +37,9 @@ stages:
   - cd $CODEC_DIR
   # make sure that we are at latest main
   - git pull
-  - printf "--------------------------------------------\n"
+  - echo "--------------------------------------------"
   - echo "Building codec on commit $(git rev-parse HEAD --short)"
-  - printf "--------------------------------------------\n"
+  - echo "--------------------------------------------"
   # only builds if code has actually changed
   - make -j
   - cd $dir
-- 
GitLab


From 7db76616029bf209ede74e9261a5a15b98a42fd5 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Mon, 15 May 2023 14:12:07 +0200
Subject: [PATCH 3/5] increase max MD file columns to 8

---
 ivas_processing_scripts/audiotools/audio.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ivas_processing_scripts/audiotools/audio.py b/ivas_processing_scripts/audiotools/audio.py
index 3bc10c53..fc46fd0e 100755
--- a/ivas_processing_scripts/audiotools/audio.py
+++ b/ivas_processing_scripts/audiotools/audio.py
@@ -308,7 +308,7 @@ class ObjectBasedAudio(Audio):
             if pos.shape[1] < 5:
                 raise ValueError("Metadata incomplete. Columns are missing.")
             elif pos.shape[1] > 5:
-                if pos.shape[1] == 7:
+                if pos.shape[1] == 8:
                     pos = pos[:, :5]
                 else:
                     raise ValueError(
-- 
GitLab


From e588a64c66213c4347139f2e044b91957b079d51 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Mon, 15 May 2023 15:28:39 +0200
Subject: [PATCH 4/5] use fixed IVAS commit for codec

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b969c91f..ecbbadd1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,9 @@ stages:
   # NOTE: CODEC_DIR has to be in PATH
   - cd $CODEC_DIR
   # make sure that we are at latest main
-  - git pull
+  # TODO: temporarily use the RC1a tag
+  - git restore .
+  - git checkout 20230511-RC1a-listening-tests
   - echo "--------------------------------------------"
   - echo "Building codec on commit $(git rev-parse HEAD --short)"
   - echo "--------------------------------------------"
-- 
GitLab


From eb3cf44c53a76ae5dc1174f75837e683a5fbff5e Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Mon, 15 May 2023 15:48:14 +0200
Subject: [PATCH 5/5] allow 5-8 MD columns

---
 ivas_processing_scripts/audiotools/audio.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ivas_processing_scripts/audiotools/audio.py b/ivas_processing_scripts/audiotools/audio.py
index fc46fd0e..0922ae38 100755
--- a/ivas_processing_scripts/audiotools/audio.py
+++ b/ivas_processing_scripts/audiotools/audio.py
@@ -308,7 +308,8 @@ class ObjectBasedAudio(Audio):
             if pos.shape[1] < 5:
                 raise ValueError("Metadata incomplete. Columns are missing.")
             elif pos.shape[1] > 5:
-                if pos.shape[1] == 8:
+                if pos.shape[1] <= 8:
+                    # TODO: FIXME
                     pos = pos[:, :5]
                 else:
                     raise ValueError(
-- 
GitLab