From 33fca880d10c46d74746961d7434bcb2708bcd42 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 09:32:24 +0100
Subject: [PATCH 001/163] Add ivas-conformance job

---
 .gitlab-ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27212c8646..2104d12c7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ variables:
       - 'default'
       - 'test-be-release'
       - 'test-long-self-test'
+      - 'ivas-conformance'
 
 
 default:
@@ -50,6 +51,9 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'
       variables:
         IVAS_PIPELINE_NAME: 'Test long self-test against main pipeline: $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
+      variables:
+        IVAS_PIPELINE_NAME: 'Draft IVAS Conformance test: $CI_COMMIT_BRANCH'        
     - if: $CI_PIPELINE_SOURCE == 'trigger'
 
 stages:
@@ -201,6 +205,8 @@ stages:
       when: never
     - if: $MANUAL_PIPELINE_TYPE == 'test-long-self-test' # Skip all the normal jobs when testing manually against release codec
       when: never
+    - if: $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
+      when: never      
     - when: on_success
 
 .rules-merge-request:
@@ -1187,6 +1193,43 @@ test-be-to-release:
     expose_as: "test-be-to-release results"
 
 
+ivas-conformance:
+  tags:
+    - ivas-linux-fast
+  stage: test
+  timeout: "60 minutes"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'
+  allow_failure:
+    exit_codes:
+      - 123
+  script:
+    - *print-common-info
+    # Prepare reference exec, TBD
+    - make -j
+    - cp IVAS_cod IVAS_cod_ref
+    - cp IVAS_dec IVAS_dec_ref
+    - cp IVAS_rend IVAS_rend_ref
+
+    # Reference creation
+    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref 
+    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2
+    - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref
+
+    # Output creation
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html
+
+  artifacts:
+    name: "ivas-conformance-$CI_COMMIT_SHORT_SHA"
+    expire_in: 1 week
+    when: always
+    paths:
+      - report-junit.xml
+      - report.html
+    expose_as: "Draft IVAS conformance"
+    reports:
+      junit: report-junit.xml
+
 test-long-self-test:
   tags:
     - ivas-linux-fast
-- 
GitLab


From 3d3579ca2328dec58035d1062608156397a4f493 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 09:37:07 +0100
Subject: [PATCH 002/163] Fix manual trigger

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2104d12c7b..9257028c1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1199,7 +1199,7 @@ ivas-conformance:
   stage: test
   timeout: "60 minutes"
   rules:
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
   allow_failure:
     exit_codes:
       - 123
-- 
GitLab


From 3ce5512096396418fb3b596b4913ec176142db38 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 10:14:45 +0100
Subject: [PATCH 003/163] Add create_cut for renderer test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9257028c1a..41c831885b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1217,7 +1217,7 @@ ivas-conformance:
     - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --create_cut --junit-xml=report-junit.xml --html=report.html --self-contained-html
 
   artifacts:
     name: "ivas-conformance-$CI_COMMIT_SHORT_SHA"
-- 
GitLab


From 29bf5319ab298b2afbf2ec0f921213600fc41af5 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 10:25:51 +0100
Subject: [PATCH 004/163] Revert the create_cut for renderer, since it seemed
 to reduce the number of tests run

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41c831885b..9257028c1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1217,7 +1217,7 @@ ivas-conformance:
     - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --create_cut --junit-xml=report-junit.xml --html=report.html --self-contained-html
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html
 
   artifacts:
     name: "ivas-conformance-$CI_COMMIT_SHORT_SHA"
-- 
GitLab


From 40f4b16cbaff9046746a55cf7fb84db0acfeee47 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 11:13:32 +0100
Subject: [PATCH 005/163] Added command line extraction script

---
 dec_header.txt    |  20 +++++++++
 enc_header.txt    |  21 ++++++++++
 parse_commands.py | 104 ++++++++++++++++++++++++++++++++++++++++++++++
 rend_header.txt   |  19 +++++++++
 4 files changed, 164 insertions(+)
 create mode 100644 dec_header.txt
 create mode 100644 enc_header.txt
 create mode 100644 parse_commands.py
 create mode 100644 rend_header.txt

diff --git a/dec_header.txt b/dec_header.txt
new file mode 100644
index 0000000000..729186d351
--- /dev/null
+++ b/dec_header.txt
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -e
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <CUT_DEC_BIN>"
+    exit -1
+fi            
+
+CUT_DEC_BIN=$1
+DIFF_BIN="diff"
+
+REF_PATH="./tests"
+CUT_PATH="./TMP_DEC"
+
+rm -rf $CUT_PATH
+mkdir -p $CUT_PATH
+mkdir -p $CUT_PATH/ref/masa_test/dec_output
+mkdir -p $CUT_PATH/ref/param_file/dec
+mkdir -p $CUT_PATH/ref/sba_bs/raw
+
diff --git a/enc_header.txt b/enc_header.txt
new file mode 100644
index 0000000000..5208a95a6e
--- /dev/null
+++ b/enc_header.txt
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -e
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <CUT_ENC_BIN>"
+    exit -1
+fi
+
+CUT_ENC_BIN=$1
+DIFF_BIN="diff"
+
+TESTV_PATH="./scripts"
+REF_PATH="./tests"
+CUT_PATH="./TMP_ENC"
+
+rm -rf $CUT_PATH
+mkdir -p $CUT_PATH
+mkdir -p $CUT_PATH/ref/masa_test/bitstreams
+mkdir -p $CUT_PATH/ref/param_file/enc
+mkdir -p $CUT_PATH/ref/sba_bs/pkt
+
diff --git a/parse_commands.py b/parse_commands.py
new file mode 100644
index 0000000000..30d8d27a13
--- /dev/null
+++ b/parse_commands.py
@@ -0,0 +1,104 @@
+#!/usr/bin/python3
+
+import argparse
+import re
+from os import path
+from pathlib import Path
+
+# Main routine
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Parse HTML reports to extract commands')
+    parser.add_argument('input',type=str,help='Path to HTML report or directory')
+    parser.add_argument('txt_file',type=str,help='Output txt file, e.g. output.txt')
+    args = parser.parse_args()
+    input = args.input
+    txt_file    = args.txt_file
+
+    TESTV_PATH='$TESTV_PATH/'
+    REF_PATH='$REF_PATH/'
+    CUT_PATH='$CUT_PATH/'
+    
+    cmds_enc=[]
+    cmds_dec=[]
+    cmds_rend=[]
+
+
+    if path.isdir(input):
+        input = Path(input).rglob('*.html')
+    else:
+        input = [input]
+    for html_report in input:
+        
+        with open(html_report,'r') as infile:
+            for line in infile.readlines():
+                    cmds_enc.extend(re.findall(r"DUT encoder command:\\n\\t(.*?)\\n", line))
+                    cmds_dec.extend(re.findall(r"DUT decoder command:\\n\\t(.*?)\\n", line))
+                    cmds_rend.extend(re.findall(r"Running command\\n(.*?)\\n", line))
+
+    with open(txt_file.replace('.','_enc.'),'w', newline='\n') as outfile:
+        with open('enc_header.txt','r') as header:
+            outfile.write(header.read())
+        for cmd in cmds_enc:
+            arg1 = cmd.split()[0]
+            root_folder = arg1[0:arg1.find("ivas-codec/")+10]
+            cmd = cmd.replace(root_folder + r'/IVAS_cod', '$CUT_ENC_BIN')
+            cmd = cmd.replace(r'\\', '/')
+            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
+            cmd = cmd.replace(root_folder + r'/tests/',CUT_PATH)
+                       
+                        
+            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/scripts/', TESTV_PATH)
+            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/',CUT_PATH)
+            #cmd = cmd.replace('/home/ejatoma/ivas-codec/scripts', TESTV_PATH)
+            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref',CUT_PATH)
+            outfile.write(cmd+'\n')
+            bts = re.search(r"\s(([\S]+)(.bts|.192))$", cmd)
+            if bts:
+                outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH,REF_PATH)+' '+bts.group(1)+'\n')
+            outfile.write('\n')
+
+    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile:
+        with open('dec_header.txt','r') as header:
+            outfile.write(header.read())
+        for cmd in cmds_dec:
+            arg1 = cmd.split()[0]
+            root_folder = arg1[0:arg1.find("ivas-codec/")+10]
+            cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
+            cmd = cmd.replace(r'\\', '/')
+            cmd = cmd.replace(root_folder + r'/tests/', REF_PATH)
+            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
+                        
+            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/', REF_PATH, 1)
+            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/', CUT_PATH)            
+            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', REF_PATH, 1)
+            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', CUT_PATH)
+            outfile.write(cmd+'\n')
+            out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
+            if out:
+                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH,REF_PATH)+' '+out.group(1)+'\n')
+            outfile.write('\n')
+
+    with open(txt_file.replace('.','_rend.'),'w', newline='\n') as outfile:
+        with open('rend_header.txt','r') as header:
+            outfile.write(header.read())
+        for cmd in cmds_rend:
+            arg1 = cmd.split()[0]
+            root_folder = arg1[0:arg1.find("ivas-codec/")+10]
+        
+            cmd = cmd.replace(r'\\', '/')
+  
+            cmd = cmd.replace(root_folder + r'/IVAS_rend', '$CUT_REND_BIN')
+            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH, 1)
+            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            
+
+  
+            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/IVAS_rend_ref', '$CUT_REND_BIN')
+            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/scripts/', TESTV_PATH, 1)
+            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/', CUT_PATH)            
+            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', REF_PATH, 1)
+            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', CUT_PATH)
+            outfile.write(cmd+'\n')
+            out = re.search(r"-o\s(([\S]+)(.wav|.raw|.pcm))", cmd)
+            if out:
+                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH,REF_PATH)+' '+out.group(1)+'\n')
+            outfile.write('\n')            
\ No newline at end of file
diff --git a/rend_header.txt b/rend_header.txt
new file mode 100644
index 0000000000..9102429eed
--- /dev/null
+++ b/rend_header.txt
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <CUT_REND_BIN>"
+    exit -1
+fi            
+
+CUT_REND_BIN=$1
+DIFF_BIN="diff"
+
+TESTV_PATH="./scripts"
+REF_PATH="./tests"
+CUT_PATH="./TMP_REND"
+
+rm -rf $CUT_PATH
+mkdir -p $CUT_PATH/renderer/ref
+
+
-- 
GitLab


From de94331fd7c1cf3e6ef05066617937f002eb0bbe Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 11:15:19 +0100
Subject: [PATCH 006/163] Added parsing of command lines in job

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9257028c1a..9b4769b687 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1218,6 +1218,7 @@ ivas-conformance:
 
     # Output creation
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html
+    - python3 parse_commands.py report.html Readme_IVAS.txt
 
   artifacts:
     name: "ivas-conformance-$CI_COMMIT_SHORT_SHA"
@@ -1226,6 +1227,9 @@ ivas-conformance:
     paths:
       - report-junit.xml
       - report.html
+      - Readme_IVAS_dec.txt  
+      - Readme_IVAS_enc.txt  
+      - Readme_IVAS_rend.txt
     expose_as: "Draft IVAS conformance"
     reports:
       junit: report-junit.xml
-- 
GitLab


From 939a1e10a8c9d71786a299c539c261724233e5b0 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 12:12:45 +0100
Subject: [PATCH 007/163] Change ref to 20230815_RC02_SA4#125_delivery

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b4769b687..186fe88bc2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1206,10 +1206,12 @@ ivas-conformance:
   script:
     - *print-common-info
     # Prepare reference exec, TBD
+    - git checkout 20230815_RC02_SA4#125_delivery
     - make -j
     - cp IVAS_cod IVAS_cod_ref
     - cp IVAS_dec IVAS_dec_ref
     - cp IVAS_rend IVAS_rend_ref
+    - git restore . 
 
     # Reference creation
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref 
-- 
GitLab


From 8e66f5428f368f001da6f5d10b5c4a5c8d60a2d3 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 12:26:20 +0100
Subject: [PATCH 008/163] Fix restoring source branch

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 186fe88bc2..cdf5157068 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1206,12 +1206,14 @@ ivas-conformance:
   script:
     - *print-common-info
     # Prepare reference exec, TBD
+    - source_branch_commit_sha=$(git rev-parse HEAD)
     - git checkout 20230815_RC02_SA4#125_delivery
     - make -j
     - cp IVAS_cod IVAS_cod_ref
     - cp IVAS_dec IVAS_dec_ref
     - cp IVAS_rend IVAS_rend_ref
-    - git restore . 
+    - git restore .
+    - git checkout $source_branch_commit_sha
 
     # Reference creation
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref 
-- 
GitLab


From dcb5371749380aa85c645991d763c22dc90edab1 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 12:40:21 +0100
Subject: [PATCH 009/163] Fix for failing for errors

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdf5157068..88711eeb89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1221,8 +1221,11 @@ ivas-conformance:
     - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report.html Readme_IVAS.txt
+    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
+
+    - *merge-request-comparison-check
 
   artifacts:
     name: "ivas-conformance-$CI_COMMIT_SHORT_SHA"
-- 
GitLab


From d4149f147b8dc7775123eadb8e496f23474a7698 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 12:47:23 +0100
Subject: [PATCH 010/163] Fix for failing for errors

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88711eeb89..f2add62447 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1216,11 +1216,13 @@ ivas-conformance:
     - git checkout $source_branch_commit_sha
 
     # Reference creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref 
-    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2
-    - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref
+    - exit_code=0
+    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
+    - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref || exit_code=$?
 
     # Output creation
+    - exit_code=0
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
-- 
GitLab


From 88b659bd5f02f2874edc827a733b0800fd682345 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 13:14:33 +0100
Subject: [PATCH 011/163] Remove unsupported test cases from prm file

---
 .gitlab-ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2add62447..43ef442a43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1215,6 +1215,17 @@ ivas-conformance:
     - git restore .
     - git checkout $source_branch_commit_sha
 
+    # remove unsupported testcases, in reverse row order 
+    - sed -i '1623,1625d' scripts/config/self_test.prm
+    - sed -i '1307,1321d' scripts/config/self_test.prm
+    - sed -i '1205,1213d' scripts/config/self_test.prm
+    - sed -i '849,851d' scripts/config/self_test.prm
+    - sed -i '805,807d' scripts/config/self_test.prm
+    - sed -i '684,686d' scripts/config/self_test.prm
+    - sed -i '420,422d' scripts/config/self_test.prm
+    - sed -i '377,383d' scripts/config/self_test.prm
+    - sed -i '321,329d' scripts/config/self_test.prm
+
     # Reference creation
     - exit_code=0
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
-- 
GitLab


From 8b9984c148a22ebfc7558d0c2a121c458c5ea39f Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 13:30:23 +0100
Subject: [PATCH 012/163] Remove unsupported -fr option from renderer tests

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43ef442a43..9c5eaebe4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1225,6 +1225,8 @@ ivas-conformance:
     - sed -i '420,422d' scripts/config/self_test.prm
     - sed -i '377,383d' scripts/config/self_test.prm
     - sed -i '321,329d' scripts/config/self_test.prm
+    # Remove unsupported -fr option from renderer tests
+    - sed -i '206,207d' tests/renderer/utils.py 
 
     # Reference creation
     - exit_code=0
-- 
GitLab


From 59bd040e49a9af71b72a51d42b4efb7f772beaec Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 13:49:34 +0100
Subject: [PATCH 013/163] Revert to -tf for IVAS_rend

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c5eaebe4f..55ef9b209f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1227,6 +1227,8 @@ ivas-conformance:
     - sed -i '321,329d' scripts/config/self_test.prm
     # Remove unsupported -fr option from renderer tests
     - sed -i '206,207d' tests/renderer/utils.py 
+    # Revert to -tf option used in old IVAS_rend
+    - sed -i '187s/-T/-tf/' tests/renderer/utils.py 
 
     # Reference creation
     - exit_code=0
-- 
GitLab


From d89f012278069362e97c196f8bca9fa76512bb4a Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 14:03:40 +0100
Subject: [PATCH 014/163] Use scripts and tests from reference

---
 .gitlab-ci.yml | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55ef9b209f..ca751cc9d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1205,39 +1205,28 @@ ivas-conformance:
       - 123
   script:
     - *print-common-info
-    # Prepare reference exec, TBD
+    # Prepare reference exec, use tests and scripts from reference
     - source_branch_commit_sha=$(git rev-parse HEAD)
     - git checkout 20230815_RC02_SA4#125_delivery
     - make -j
     - cp IVAS_cod IVAS_cod_ref
     - cp IVAS_dec IVAS_dec_ref
     - cp IVAS_rend IVAS_rend_ref
+    - cp -r tests tests_ref
+    - cp -r scripts scripts_ref
     - git restore .
     - git checkout $source_branch_commit_sha
-
-    # remove unsupported testcases, in reverse row order 
-    - sed -i '1623,1625d' scripts/config/self_test.prm
-    - sed -i '1307,1321d' scripts/config/self_test.prm
-    - sed -i '1205,1213d' scripts/config/self_test.prm
-    - sed -i '849,851d' scripts/config/self_test.prm
-    - sed -i '805,807d' scripts/config/self_test.prm
-    - sed -i '684,686d' scripts/config/self_test.prm
-    - sed -i '420,422d' scripts/config/self_test.prm
-    - sed -i '377,383d' scripts/config/self_test.prm
-    - sed -i '321,329d' scripts/config/self_test.prm
-    # Remove unsupported -fr option from renderer tests
-    - sed -i '206,207d' tests/renderer/utils.py 
-    # Revert to -tf option used in old IVAS_rend
-    - sed -i '187s/-T/-tf/' tests/renderer/utils.py 
+    - mv tests_ref tests 
+    - mv scripts_ref scripts 
 
     # Reference creation
+    - non_be_flag=0
     - exit_code=0
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
     - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref || exit_code=$?
 
     # Output creation
-    - exit_code=0
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
-- 
GitLab


From 82998040f0e94c682475c8f00360bdec92906e75 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 14:09:53 +0100
Subject: [PATCH 015/163] Use scripts and tests from reference

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca751cc9d9..c3bd63e386 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1213,11 +1213,10 @@ ivas-conformance:
     - cp IVAS_dec IVAS_dec_ref
     - cp IVAS_rend IVAS_rend_ref
     - cp -r tests tests_ref
-    - cp -r scripts scripts_ref
     - git restore .
     - git checkout $source_branch_commit_sha
+    - rm -r tests 
     - mv tests_ref tests 
-    - mv scripts_ref scripts 
 
     # Reference creation
     - non_be_flag=0
-- 
GitLab


From 318e2b489ed9e7b918441f7dff10d9755ca70161 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 14:17:54 +0100
Subject: [PATCH 016/163] Revert to old renderer test

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3bd63e386..774d4496d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1223,10 +1223,9 @@ ivas-conformance:
     - exit_code=0
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
-    - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref || exit_code=$?
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
 
-- 
GitLab


From db0207a9103542d8f537c6c92693ab935723ae16 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 14:24:10 +0100
Subject: [PATCH 017/163] Revert to old self_test.prm

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 774d4496d9..d915c6a8cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1213,10 +1213,12 @@ ivas-conformance:
     - cp IVAS_dec IVAS_dec_ref
     - cp IVAS_rend IVAS_rend_ref
     - cp -r tests tests_ref
+    - cp scripts/config/self_test.prm scripts/config/self_test_ref.prm 
     - git restore .
     - git checkout $source_branch_commit_sha
-    - rm -r tests 
+    - rm -r tests scripts
     - mv tests_ref tests 
+    - cp scripts/config/self_test_ref.prm scripts/config/self_test.prm 
 
     # Reference creation
     - non_be_flag=0
-- 
GitLab


From 8af2db12ea4cef335070bef6a40983f47c5f381d Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 14:26:33 +0100
Subject: [PATCH 018/163] Revert to old self_test.prm

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d915c6a8cc..0fe4413259 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1216,7 +1216,7 @@ ivas-conformance:
     - cp scripts/config/self_test.prm scripts/config/self_test_ref.prm 
     - git restore .
     - git checkout $source_branch_commit_sha
-    - rm -r tests scripts
+    - rm -r tests 
     - mv tests_ref tests 
     - cp scripts/config/self_test_ref.prm scripts/config/self_test.prm 
 
-- 
GitLab


From b30db7142f73e48183ca24a744340668b15229d9 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 14:30:57 +0100
Subject: [PATCH 019/163] Revert to old scripts folder

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fe4413259..8b5489d0d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1213,12 +1213,12 @@ ivas-conformance:
     - cp IVAS_dec IVAS_dec_ref
     - cp IVAS_rend IVAS_rend_ref
     - cp -r tests tests_ref
-    - cp scripts/config/self_test.prm scripts/config/self_test_ref.prm 
+    - cp -r scripts scripts_ref
     - git restore .
     - git checkout $source_branch_commit_sha
-    - rm -r tests 
+    - rm -r tests scripts
     - mv tests_ref tests 
-    - cp scripts/config/self_test_ref.prm scripts/config/self_test.prm 
+    - mv scripts_ref scripts
 
     # Reference creation
     - non_be_flag=0
-- 
GitLab


From 3d73bd4cfa5968f2d75d39813421956b40bd0c16 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 16:19:42 +0100
Subject: [PATCH 020/163] Correct script generation

---
 .gitlab-ci.yml    |  2 ++
 parse_commands.py | 32 +++++++++-----------------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b5489d0d2..4ba8acb476 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1225,6 +1225,8 @@ ivas-conformance:
     - exit_code=0
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
+    - python3 -m test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored
+    - rm -r tests/renderer/cut
 
     # Output creation
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
diff --git a/parse_commands.py b/parse_commands.py
index 30d8d27a13..a93c7a5e1a 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -44,17 +44,12 @@ if __name__ == '__main__':
             cmd = cmd.replace(root_folder + r'/IVAS_cod', '$CUT_ENC_BIN')
             cmd = cmd.replace(r'\\', '/')
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            cmd = cmd.replace(root_folder + r'/tests/',CUT_PATH)
+            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH )
                        
-                        
-            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/scripts/', TESTV_PATH)
-            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/',CUT_PATH)
-            #cmd = cmd.replace('/home/ejatoma/ivas-codec/scripts', TESTV_PATH)
-            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref',CUT_PATH)
             outfile.write(cmd+'\n')
             bts = re.search(r"\s(([\S]+)(.bts|.192))$", cmd)
             if bts:
-                outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH,REF_PATH)+' '+bts.group(1)+'\n')
+                outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+'\n')
             outfile.write('\n')
 
     with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile:
@@ -65,17 +60,13 @@ if __name__ == '__main__':
             root_folder = arg1[0:arg1.find("ivas-codec/")+10]
             cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
             cmd = cmd.replace(r'\\', '/')
-            cmd = cmd.replace(root_folder + r'/tests/', REF_PATH)
+            cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', 1)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
                         
-            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/', REF_PATH, 1)
-            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/', CUT_PATH)            
-            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', REF_PATH, 1)
-            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', CUT_PATH)
             outfile.write(cmd+'\n')
             out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
             if out:
-                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH,REF_PATH)+' '+out.group(1)+'\n')
+                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+out.group(1)+'\n')
             outfile.write('\n')
 
     with open(txt_file.replace('.','_rend.'),'w', newline='\n') as outfile:
@@ -91,14 +82,9 @@ if __name__ == '__main__':
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH, 1)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            
 
-  
-            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/IVAS_rend_ref', '$CUT_REND_BIN')
-            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/scripts/', TESTV_PATH, 1)
-            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/', CUT_PATH)            
-            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', REF_PATH, 1)
-            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', CUT_PATH)
-            outfile.write(cmd+'\n')
+            if "cut" in cmd:
+                outfile.write(cmd+'\n')
             out = re.search(r"-o\s(([\S]+)(.wav|.raw|.pcm))", cmd)
-            if out:
-                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH,REF_PATH)+' '+out.group(1)+'\n')
-            outfile.write('\n')            
\ No newline at end of file
+            if out and "cut" in out.group(1):
+                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'renderer/cut',REF_PATH + r'renderer/ref')+' '+out.group(1)+'\n')
+                outfile.write('\n')            
\ No newline at end of file
-- 
GitLab


From 639036a67674fb71795c2c0340bd73db27f97298 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 16:27:29 +0100
Subject: [PATCH 021/163] Fix renderer ref creation

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ba8acb476..229ea31708 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1225,7 +1225,7 @@ ivas-conformance:
     - exit_code=0
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
-    - python3 -m test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored
+    - python3 -m tests/renderer/test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored
     - rm -r tests/renderer/cut
 
     # Output creation
-- 
GitLab


From f08c585c7fb174f524bf7efe6b7ae5f7b354ce85 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 16:53:53 +0100
Subject: [PATCH 022/163] Fixes

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 229ea31708..d6f155e513 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1225,11 +1225,11 @@ ivas-conformance:
     - exit_code=0
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
-    - python3 -m tests/renderer/test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored
+    - python3 -m tests/renderer/test_renderer_be_comparison # This run is needed for reference creation. renderer/cut/ can be ignored
     - rm -r tests/renderer/cut
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
 
-- 
GitLab


From 7022cf4ef0553af4545f7f2b848f12fcfa9d43d1 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 16:55:41 +0100
Subject: [PATCH 023/163] Fixes

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6f155e513..2f9b14a128 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1225,11 +1225,11 @@ ivas-conformance:
     - exit_code=0
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
-    - python3 -m tests/renderer/test_renderer_be_comparison # This run is needed for reference creation. renderer/cut/ can be ignored
+    - python3 -m pytest tests/renderer/test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored
     - rm -r tests/renderer/cut
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
 
-- 
GitLab


From 83c51156651bbad53ae1abedcf8049b788c0ccf8 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 17:20:06 +0100
Subject: [PATCH 024/163] Fixes

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f9b14a128..6c4925e56f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1226,7 +1226,6 @@ ivas-conformance:
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
     - python3 -m pytest tests/renderer/test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored
-    - rm -r tests/renderer/cut
 
     # Output creation
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
@@ -2089,3 +2088,4 @@ pull-from-3gpp-forge:
 
     # Push to mirror, include tags. Option `-o ci.skip` tells GitLab to skip CI for the pushed commits (assumed already tested upstream)
     - git push --tags -o ci.skip "https://${GITLAB_USER_LOGIN}:${MIRROR_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_BRANCH}"
+
\ No newline at end of file
-- 
GitLab


From aa556ad34633b9854daab11ba4124f0f321b1919 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 17:25:28 +0100
Subject: [PATCH 025/163] Fix strange character in .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c4925e56f..1f0e4b231d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2088,4 +2088,3 @@ pull-from-3gpp-forge:
 
     # Push to mirror, include tags. Option `-o ci.skip` tells GitLab to skip CI for the pushed commits (assumed already tested upstream)
     - git push --tags -o ci.skip "https://${GITLAB_USER_LOGIN}:${MIRROR_ACCESS_TOKEN}@${CI_REPOSITORY_URL#*@}" "HEAD:${CI_COMMIT_BRANCH}"
-
\ No newline at end of file
-- 
GitLab


From 5cc223590980ac98fafef85d6f5fd4ddf5e6e8b1 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 17:56:41 +0100
Subject: [PATCH 026/163] Use Nokia runner which has a later pytest version

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f0e4b231d..9ab99ee86c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1196,6 +1196,7 @@ test-be-to-release:
 ivas-conformance:
   tags:
     - ivas-linux-fast
+    - test-nokia-linux-runner
   stage: test
   timeout: "60 minutes"
   rules:
-- 
GitLab


From d678a90bce7f746f40d3a7750c7be8cd68f48015 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 18:10:18 +0100
Subject: [PATCH 027/163] Add 26252 test

---
 dec_header.txt      |   6 +--
 enc_header.txt      |   6 +--
 rend_header.txt     |   2 +-
 tests/test_26252.py | 128 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 135 insertions(+), 7 deletions(-)
 create mode 100644 tests/test_26252.py

diff --git a/dec_header.txt b/dec_header.txt
index 729186d351..bc7cf89a33 100644
--- a/dec_header.txt
+++ b/dec_header.txt
@@ -14,7 +14,7 @@ CUT_PATH="./TMP_DEC"
 
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH
-mkdir -p $CUT_PATH/ref/masa_test/dec_output
-mkdir -p $CUT_PATH/ref/param_file/dec
-mkdir -p $CUT_PATH/ref/sba_bs/raw
+mkdir -p $CUT_PATH/dut/masa_test/dec_output
+mkdir -p $CUT_PATH/dut/param_file/dec
+mkdir -p $CUT_PATH/dut/sba_bs/raw
 
diff --git a/enc_header.txt b/enc_header.txt
index 5208a95a6e..efd391d1bc 100644
--- a/enc_header.txt
+++ b/enc_header.txt
@@ -15,7 +15,7 @@ CUT_PATH="./TMP_ENC"
 
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH
-mkdir -p $CUT_PATH/ref/masa_test/bitstreams
-mkdir -p $CUT_PATH/ref/param_file/enc
-mkdir -p $CUT_PATH/ref/sba_bs/pkt
+mkdir -p $CUT_PATH/dut/masa_test/bitstreams
+mkdir -p $CUT_PATH/dut/param_file/enc
+mkdir -p $CUT_PATH/dut/sba_bs/pkt
 
diff --git a/rend_header.txt b/rend_header.txt
index 9102429eed..9e31939a5f 100644
--- a/rend_header.txt
+++ b/rend_header.txt
@@ -14,6 +14,6 @@ REF_PATH="./tests"
 CUT_PATH="./TMP_REND"
 
 rm -rf $CUT_PATH
-mkdir -p $CUT_PATH/renderer/ref
+mkdir -p $CUT_PATH/renderer/cut
 
 
diff --git a/tests/test_26252.py b/tests/test_26252.py
new file mode 100644
index 0000000000..603793c900
--- /dev/null
+++ b/tests/test_26252.py
@@ -0,0 +1,128 @@
+__copyright__ = """
+(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+contributors to this repository. All Rights Reserved.
+
+This software is protected by copyright law and by international treaties.
+The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
+Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+contributors to this repository retain full ownership rights in their respective contributions in
+the software. This notice grants no license of any kind, including but not limited to patent
+license, nor is any license granted by implication, estoppel or otherwise.
+
+Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
+contributions.
+
+This software is provided "AS IS", without any express or implied warranties. The software is in the
+development stage. It is intended exclusively for experts who have experience with such software and
+solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
+and fitness for a particular purpose are hereby disclaimed and excluded.
+
+Any dispute, controversy or claim arising under or in relation to providing this software shall be
+submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
+accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
+the United Nations Convention on Contracts on the International Sales of Goods.
+"""
+
+__doc__ = """
+Execute tests specified via a parameter file.
+"""
+
+import os
+from pathlib import Path
+import filecmp
+import subprocess
+import pytest
+
+def replace_paths(instr, testv_path, ref_path, cut_path):  
+    outstr = instr
+    tmp = testv_path.split('=')
+    if len(tmp)>1:
+        outstr = instr.replace("$"+tmp[0], tmp[1].replace("\"","").strip())
+    tmp = ref_path.split('=')
+    if len(tmp)>1:
+        outstr = outstr.replace("$"+tmp[0], tmp[1].replace("\"","").strip())
+    tmp = cut_path.split('=')
+    if len(tmp)>1:
+        outstr = outstr.replace("$"+tmp[0], tmp[1].replace("\"","").strip()) 
+    return outstr
+
+test_dict = {}
+TEST_DIR = "."
+scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt"]
+
+for s in scripts:
+    with open(os.path.join(TEST_DIR, s), "r", encoding="UTF-8") as fp:
+        tag = ""
+        enc_opts = ""
+        dec_opts = ""
+        diff_opts = ""
+        rend_opts = ""
+        testv_path = ""
+        ref_path = ""
+        cut_path = ""
+        preproc = []
+        for line in fp.readlines():
+            if line.startswith("rm") or line.startswith("mkdir"):
+                preproc.append(line.strip())
+            if line.startswith("TESTV_PATH"):
+                testv_path = line
+            if line.startswith("REF_PATH"):
+                ref_path = line
+            if line.startswith("CUT_PATH"):
+                cut_path = line                
+            if line.startswith("$CUT_ENC_BIN"):
+                enc_opts = line
+            if line.startswith("$CUT_DEC_BIN"):
+                dec_opts = line
+            if line.startswith("$CUT_REND_BIN"):
+                rend_opts = line                
+            if line.startswith("$DIFF_BIN"):
+                diff_opts = line[9:]
+                tag = s + "--" + diff_opts.split()[1].split('/')[-1]
+                if tag in test_dict:
+                    print("non-unique tag found - ignoring new entry")
+                    continue                
+                test_dict[tag] = (enc_opts, dec_opts, rend_opts, diff_opts, testv_path, ref_path, cut_path)
+                tag = ""
+                enc_opts = ""
+                dec_opts = ""
+                rend_opts = ""
+                diff_opts  = ""
+        for proc in preproc:
+            proc = replace_paths(proc, testv_path, ref_path, cut_path)
+            subprocess.run(proc.split())
+
+@pytest.mark.parametrize("test_tag", list(test_dict.keys()))
+def test_26252(test_tag):
+
+    enc_opts, dec_opts, rend_opts, diff_opts, testv_path, ref_path, cut_path = test_dict[test_tag]
+
+    if enc_opts:
+        enc_opts = replace_paths(enc_opts, testv_path, ref_path, cut_path)
+        subprocess.run(["./IVAS_cod","-q"] + enc_opts.split()[1:])
+    if dec_opts:
+        dec_opts = replace_paths(dec_opts, testv_path, ref_path, cut_path)
+        subprocess.run(["./IVAS_dec","-q"] + dec_opts.split()[1:])    
+    if rend_opts:
+        rend_opts = replace_paths(rend_opts, testv_path, ref_path, cut_path)
+        subprocess.run(["./IVAS_rend","-q"] + rend_opts.split()[1:])    
+
+    diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
+    if ';' in diff_opts:
+        cmd1, cmd2 = diff_opts.split(';')
+        cmd1 = cmd1.split()
+        cmd2 = cmd2.split()        
+        result1 = filecmp.cmp(cmd1[0], cmd1[1])
+        result2 = filecmp.cmp(cmd2[2], cmd2[3])
+    else:
+        cmd1 = diff_opts.split()
+        result1 = filecmp.cmp(cmd1[0], cmd1[1])
+        result2 = True
+    if not (result1 and result2):
+        assert False, "Output differs" 
+
-- 
GitLab


From 16b10e2bd0469618c21f4a6f8b8947ab36ffc29f Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 18:12:36 +0100
Subject: [PATCH 028/163] Activate 26.252-test in job

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ab99ee86c..6d28be77c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1232,6 +1232,9 @@ ivas-conformance:
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
+    
+    # Test run generated scripts
+    - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
 
     - *merge-request-comparison-check
 
-- 
GitLab


From a41236be24df5c19a751ba6edb721d6f5eefb64f Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 18:29:30 +0100
Subject: [PATCH 029/163] Check failure in 26.252

---
 .gitlab-ci.yml    | 5 +++--
 parse_commands.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d28be77c9..9d628be9b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1224,6 +1224,7 @@ ivas-conformance:
     # Reference creation
     - non_be_flag=0
     - exit_code=0
+    - python3 tests/create_short_testvectors.py
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
     - python3 -m pytest tests/renderer/test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored
@@ -1234,8 +1235,8 @@ ivas-conformance:
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
     # Test run generated scripts
-    - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
-
+    #- python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest tests/test_26252.py 
     - *merge-request-comparison-check
 
   artifacts:
diff --git a/parse_commands.py b/parse_commands.py
index a93c7a5e1a..a670bd7c69 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -47,7 +47,7 @@ if __name__ == '__main__':
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH )
                        
             outfile.write(cmd+'\n')
-            bts = re.search(r"\s(([\S]+)(.bts|.192))$", cmd)
+            bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt))$", cmd)
             if bts:
                 outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+'\n')
             outfile.write('\n')
-- 
GitLab


From a59aae17483ecec22a4ef016772d5b09e7b6d6d2 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 18:43:22 +0100
Subject: [PATCH 030/163] Debug output

---
 tests/test_26252.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_26252.py b/tests/test_26252.py
index 603793c900..5f21260245 100644
--- a/tests/test_26252.py
+++ b/tests/test_26252.py
@@ -67,6 +67,7 @@ for s in scripts:
         cut_path = ""
         preproc = []
         for line in fp.readlines():
+            print(line)
             if line.startswith("rm") or line.startswith("mkdir"):
                 preproc.append(line.strip())
             if line.startswith("TESTV_PATH"):
-- 
GitLab


From 92d5e9872da478a87a09b7a4744a1bba3cd1bd9e Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 18:45:42 +0100
Subject: [PATCH 031/163] Debug output

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d628be9b0..52c5e31c90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1236,6 +1236,7 @@ ivas-conformance:
     
     # Test run generated scripts
     #- python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 tests/test_26252.py
     - python3 -m pytest tests/test_26252.py 
     - *merge-request-comparison-check
 
-- 
GitLab


From e3918c05d54d2d2293b80ce13434dbe0c78988b5 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 18:52:29 +0100
Subject: [PATCH 032/163] Remove Nokia tag

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52c5e31c90..8684f22862 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1196,7 +1196,6 @@ test-be-to-release:
 ivas-conformance:
   tags:
     - ivas-linux-fast
-    - test-nokia-linux-runner
   stage: test
   timeout: "60 minutes"
   rules:
-- 
GitLab


From 51f3dfaaca170516140449ed1b5edc6a273df038 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 18:56:21 +0100
Subject: [PATCH 033/163] Hack to keep 26.252-test

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8684f22862..8dfbe3c647 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1216,6 +1216,7 @@ ivas-conformance:
     - cp -r scripts scripts_ref
     - git restore .
     - git checkout $source_branch_commit_sha
+    - cp tests/test_26252.py tests_ref/test_26252.py
     - rm -r tests scripts
     - mv tests_ref tests 
     - mv scripts_ref scripts
-- 
GitLab


From 097f64881ead733c560638f85fcbb294d2aada9f Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 18:57:00 +0100
Subject: [PATCH 034/163] Enable 26.252-test

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8dfbe3c647..a14aae28a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1235,9 +1235,7 @@ ivas-conformance:
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
     # Test run generated scripts
-    #- python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
-    - python3 tests/test_26252.py
-    - python3 -m pytest tests/test_26252.py 
+    - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - *merge-request-comparison-check
 
   artifacts:
-- 
GitLab


From 6914ef5a59ab8abcc9df7934a8c31371ca968275 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 19:23:49 +0100
Subject: [PATCH 035/163] Remove double -q

---
 tests/test_26252.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/test_26252.py b/tests/test_26252.py
index 5f21260245..d284cc4343 100644
--- a/tests/test_26252.py
+++ b/tests/test_26252.py
@@ -67,7 +67,6 @@ for s in scripts:
         cut_path = ""
         preproc = []
         for line in fp.readlines():
-            print(line)
             if line.startswith("rm") or line.startswith("mkdir"):
                 preproc.append(line.strip())
             if line.startswith("TESTV_PATH"):
@@ -105,13 +104,13 @@ def test_26252(test_tag):
 
     if enc_opts:
         enc_opts = replace_paths(enc_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./IVAS_cod","-q"] + enc_opts.split()[1:])
+        subprocess.run(["./IVAS_cod"] + enc_opts.split()[1:])
     if dec_opts:
         dec_opts = replace_paths(dec_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./IVAS_dec","-q"] + dec_opts.split()[1:])    
+        subprocess.run(["./IVAS_dec"] + dec_opts.split()[1:])    
     if rend_opts:
         rend_opts = replace_paths(rend_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./IVAS_rend","-q"] + rend_opts.split()[1:])    
+        subprocess.run(["./IVAS_rend"] + rend_opts.split()[1:])    
 
     diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
     if ';' in diff_opts:
-- 
GitLab


From 16f0088c00b65209cfe7d399606eb27d688e0c89 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 19:46:54 +0100
Subject: [PATCH 036/163] Use new SBA tests

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a14aae28a2..eb8e28571d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1217,6 +1217,7 @@ ivas-conformance:
     - git restore .
     - git checkout $source_branch_commit_sha
     - cp tests/test_26252.py tests_ref/test_26252.py
+    - cp tests/codec_be_on_mr_nonselection/test_sba_bs_* tests_ref/codec_be_on_mr_nonselection
     - rm -r tests scripts
     - mv tests_ref tests 
     - mv scripts_ref scripts
-- 
GitLab


From 61605ad458b2bf1795c607040032dfd46ce854b3 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 19:52:31 +0100
Subject: [PATCH 037/163] Exclude sba plc

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb8e28571d..d9d753b94a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1217,7 +1217,7 @@ ivas-conformance:
     - git restore .
     - git checkout $source_branch_commit_sha
     - cp tests/test_26252.py tests_ref/test_26252.py
-    - cp tests/codec_be_on_mr_nonselection/test_sba_bs_* tests_ref/codec_be_on_mr_nonselection
+    - cp tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py tests_ref/codec_be_on_mr_nonselection
     - rm -r tests scripts
     - mv tests_ref tests 
     - mv scripts_ref scripts
-- 
GitLab


From 5f0c306322748b8de05967207d1371dc45d3485c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 19:56:51 +0100
Subject: [PATCH 038/163] Exclude pca cases

---
 .gitlab-ci.yml    |  1 -
 parse_commands.py | 13 +++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9d753b94a..a14aae28a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1217,7 +1217,6 @@ ivas-conformance:
     - git restore .
     - git checkout $source_branch_commit_sha
     - cp tests/test_26252.py tests_ref/test_26252.py
-    - cp tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py tests_ref/codec_be_on_mr_nonselection
     - rm -r tests scripts
     - mv tests_ref tests 
     - mv scripts_ref scripts
diff --git a/parse_commands.py b/parse_commands.py
index a670bd7c69..a4e9ffe017 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -45,12 +45,13 @@ if __name__ == '__main__':
             cmd = cmd.replace(r'\\', '/')
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH )
-                       
-            outfile.write(cmd+'\n')
-            bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt))$", cmd)
-            if bts:
-                outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+'\n')
-            outfile.write('\n')
+            
+            if not "pca" in cmd:
+                outfile.write(cmd+'\n')
+                bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt))$", cmd)
+                if bts:
+                    outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+'\n')
+                outfile.write('\n')
 
     with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile:
         with open('dec_header.txt','r') as header:
-- 
GitLab


From c182b60a803a2922af67d4fce00bb8e828dfc8f8 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 20:00:07 +0100
Subject: [PATCH 039/163] Use Ericsson runner

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a14aae28a2..6dcbd877e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1196,6 +1196,7 @@ test-be-to-release:
 ivas-conformance:
   tags:
     - ivas-linux-fast
+    - test-ericsson-linux-runner
   stage: test
   timeout: "60 minutes"
   rules:
-- 
GitLab


From d5cc28ce4c406f42a19967795203a322a128612c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 20:24:40 +0100
Subject: [PATCH 040/163] Fix renderer input

---
 parse_commands.py | 14 ++++++++------
 rend_header.txt   |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/parse_commands.py b/parse_commands.py
index a4e9ffe017..5d7b33fb3c 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -63,12 +63,13 @@ if __name__ == '__main__':
             cmd = cmd.replace(r'\\', '/')
             cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', 1)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
-                        
-            outfile.write(cmd+'\n')
-            out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
-            if out:
-                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+out.group(1)+'\n')
-            outfile.write('\n')
+            
+            if not "pca" in cmd:            
+                outfile.write(cmd+'\n')
+                out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
+                if out:
+                    outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+out.group(1)+'\n')
+                outfile.write('\n')
 
     with open(txt_file.replace('.','_rend.'),'w', newline='\n') as outfile:
         with open('rend_header.txt','r') as header:
@@ -81,6 +82,7 @@ if __name__ == '__main__':
   
             cmd = cmd.replace(root_folder + r'/IVAS_rend', '$CUT_REND_BIN')
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH, 1)
+            cmd = cmd.replace(root_folder + r'/tests/renderer/', REF_PATH + r'renderer/')            
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            
 
             if "cut" in cmd:
diff --git a/rend_header.txt b/rend_header.txt
index 9e31939a5f..fb72f4ddd8 100644
--- a/rend_header.txt
+++ b/rend_header.txt
@@ -14,6 +14,6 @@ REF_PATH="./tests"
 CUT_PATH="./TMP_REND"
 
 rm -rf $CUT_PATH
-mkdir -p $CUT_PATH/renderer/cut
+mkdir -p $CUT_PATH/renderer/cut $CUT_PATH/renderer/data
 
 
-- 
GitLab


From 5aed9f25c18043705d8fc0f4c91aeb1c0d0740ec Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 20:46:20 +0100
Subject: [PATCH 041/163] Fixes

---
 dec_header.txt    | 1 +
 parse_commands.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dec_header.txt b/dec_header.txt
index bc7cf89a33..bf91c72817 100644
--- a/dec_header.txt
+++ b/dec_header.txt
@@ -11,6 +11,7 @@ DIFF_BIN="diff"
 
 REF_PATH="./tests"
 CUT_PATH="./TMP_DEC"
+TESTV_PATH="./scripts"
 
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH
diff --git a/parse_commands.py b/parse_commands.py
index 5d7b33fb3c..e9d4de8e6b 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -61,8 +61,10 @@ if __name__ == '__main__':
             root_folder = arg1[0:arg1.find("ivas-codec/")+10]
             cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
             cmd = cmd.replace(r'\\', '/')
-            cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', 1)
+            inputs = cmd.count(root_folder) - 1
+            cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
+            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
             
             if not "pca" in cmd:            
                 outfile.write(cmd+'\n')
-- 
GitLab


From f03e890c927f2ba64671b30b667545825cde8f4e Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 21:14:24 +0100
Subject: [PATCH 042/163] Move output files. Exclude 2 failing cases

---
 .gitlab-ci.yml    | 5 +++++
 dec_header.txt    | 4 ++--
 enc_header.txt    | 4 ++--
 parse_commands.py | 2 +-
 rend_header.txt   | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6dcbd877e7..da2c524bb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1218,6 +1218,7 @@ ivas-conformance:
     - git restore .
     - git checkout $source_branch_commit_sha
     - cp tests/test_26252.py tests_ref/test_26252.py
+    
     - rm -r tests scripts
     - mv tests_ref tests 
     - mv scripts_ref scripts
@@ -1235,6 +1236,10 @@ ivas-conformance:
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
+    # Move output data
+    - mv scripts/testv .
+    - mv tests/ref tests/renderer/data tests/renderer/ref testv 
+    
     # Test run generated scripts
     - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - *merge-request-comparison-check
diff --git a/dec_header.txt b/dec_header.txt
index bf91c72817..8469dd4bfb 100644
--- a/dec_header.txt
+++ b/dec_header.txt
@@ -9,9 +9,9 @@ fi
 CUT_DEC_BIN=$1
 DIFF_BIN="diff"
 
-REF_PATH="./tests"
+TESTV_PATH="."
+REF_PATH="./testv"
 CUT_PATH="./TMP_DEC"
-TESTV_PATH="./scripts"
 
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH
diff --git a/enc_header.txt b/enc_header.txt
index efd391d1bc..32e78419cc 100644
--- a/enc_header.txt
+++ b/enc_header.txt
@@ -9,8 +9,8 @@ fi
 CUT_ENC_BIN=$1
 DIFF_BIN="diff"
 
-TESTV_PATH="./scripts"
-REF_PATH="./tests"
+TESTV_PATH="."
+REF_PATH="./testv"
 CUT_PATH="./TMP_ENC"
 
 rm -rf $CUT_PATH
diff --git a/parse_commands.py b/parse_commands.py
index e9d4de8e6b..2b1d01cafe 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -66,7 +66,7 @@ if __name__ == '__main__':
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
             
-            if not "pca" in cmd:            
+            if not "pca" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd:            
                 outfile.write(cmd+'\n')
                 out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
                 if out:
diff --git a/rend_header.txt b/rend_header.txt
index fb72f4ddd8..9e4adefc15 100644
--- a/rend_header.txt
+++ b/rend_header.txt
@@ -9,8 +9,8 @@ fi
 CUT_REND_BIN=$1
 DIFF_BIN="diff"
 
-TESTV_PATH="./scripts"
-REF_PATH="./tests"
+TESTV_PATH="."
+REF_PATH="./testv"
 CUT_PATH="./TMP_REND"
 
 rm -rf $CUT_PATH
-- 
GitLab


From e0699d5c0655309643b210d501ca44833ea66a35 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 21:34:22 +0100
Subject: [PATCH 043/163] Fix move of files

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da2c524bb8..78ac6f3572 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1238,7 +1238,10 @@ ivas-conformance:
     
     # Move output data
     - mv scripts/testv .
-    - mv tests/ref tests/renderer/data tests/renderer/ref testv 
+    - mv tests/ref testv/ref 
+    - mkdir testv/renderer
+    - mv tests/renderer/data testv/renderer/data
+    - mv tests/renderer/ref testv/renderer/ref 
     
     # Test run generated scripts
     - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
-- 
GitLab


From 6b554b48968a4bdbfcbe511ca5219aec1939df45 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 21:50:25 +0100
Subject: [PATCH 044/163] Fix move of data

---
 parse_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parse_commands.py b/parse_commands.py
index 2b1d01cafe..142942a9a4 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -84,7 +84,7 @@ if __name__ == '__main__':
   
             cmd = cmd.replace(root_folder + r'/IVAS_rend', '$CUT_REND_BIN')
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH, 1)
-            cmd = cmd.replace(root_folder + r'/tests/renderer/', REF_PATH + r'renderer/')            
+            cmd = cmd.replace(root_folder + r'/tests/renderer/data/', REF_PATH + r'renderer/data/')            
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            
 
             if "cut" in cmd:
-- 
GitLab


From 98f8da440704b4b231f112bbb6ed0d78c198c0dc Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 23 Jan 2024 22:10:02 +0100
Subject: [PATCH 045/163] Fix renderer script

---
 .gitlab-ci.yml    | 1 +
 parse_commands.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78ac6f3572..1ed831091e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1238,6 +1238,7 @@ ivas-conformance:
     
     # Move output data
     - mv scripts/testv .
+    - mv scripts/ls_layouts .
     - mv tests/ref testv/ref 
     - mkdir testv/renderer
     - mv tests/renderer/data testv/renderer/data
diff --git a/parse_commands.py b/parse_commands.py
index 142942a9a4..7f85313883 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -83,7 +83,7 @@ if __name__ == '__main__':
             cmd = cmd.replace(r'\\', '/')
   
             cmd = cmd.replace(root_folder + r'/IVAS_rend', '$CUT_REND_BIN')
-            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH, 1)
+            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
             cmd = cmd.replace(root_folder + r'/tests/renderer/data/', REF_PATH + r'renderer/data/')            
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            
 
-- 
GitLab


From 6d0f076ecc948448bc061c912c96abc10a4aa861 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 09:18:19 +0100
Subject: [PATCH 046/163] Disable DEBUGGING in reference

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55ef9b209f..f6d8aa0a37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1208,6 +1208,7 @@ ivas-conformance:
     # Prepare reference exec, TBD
     - source_branch_commit_sha=$(git rev-parse HEAD)
     - git checkout 20230815_RC02_SA4#125_delivery
+    - sed -i".bak" "s/\(#define DEBUGGING\)/\/\/\1/" lib_com/options.h
     - make -j
     - cp IVAS_cod IVAS_cod_ref
     - cp IVAS_dec IVAS_dec_ref
@@ -1225,7 +1226,7 @@ ivas-conformance:
     - sed -i '420,422d' scripts/config/self_test.prm
     - sed -i '377,383d' scripts/config/self_test.prm
     - sed -i '321,329d' scripts/config/self_test.prm
-    # Remove unsupported -fr option from renderer tests
+    # Remove -fr option
     - sed -i '206,207d' tests/renderer/utils.py 
     # Revert to -tf option used in old IVAS_rend
     - sed -i '187s/-T/-tf/' tests/renderer/utils.py 
-- 
GitLab


From 91fa408a9a2b16252b6a1b26cc7d1485953529d8 Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Wed, 24 Jan 2024 08:33:15 +0000
Subject: [PATCH 047/163] Adding trigger as pipeline source for
 ivas-conformance pipeline.

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ed831091e..05255157c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1200,7 +1200,7 @@ ivas-conformance:
   stage: test
   timeout: "60 minutes"
   rules:
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
+    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
   allow_failure:
     exit_codes:
       - 123
-- 
GitLab


From 2cb61418208c4a4b22b80502a11fb81d31a2c541 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 09:41:03 +0100
Subject: [PATCH 048/163] Remove test case from self_test.prm

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6d8aa0a37..b5199556ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1217,6 +1217,7 @@ ivas-conformance:
     - git checkout $source_branch_commit_sha
 
     # remove unsupported testcases, in reverse row order 
+    - sed -i '1644,1647d' scripts/config/self_test.prm
     - sed -i '1623,1625d' scripts/config/self_test.prm
     - sed -i '1307,1321d' scripts/config/self_test.prm
     - sed -i '1205,1213d' scripts/config/self_test.prm
-- 
GitLab


From 362e66cff88648c550407c9850e0acbb5060c8aa Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 09:44:24 +0100
Subject: [PATCH 049/163] Added trigger source for ivas-conformance

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5199556ea..725b3760a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1199,7 +1199,7 @@ ivas-conformance:
   stage: test
   timeout: "60 minutes"
   rules:
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
+    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
   allow_failure:
     exit_codes:
       - 123
-- 
GitLab


From f0c1f13de1672858b61b8c65f70cf68f7781170c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 10:47:38 +0100
Subject: [PATCH 050/163] Exclude tests from self_test.prm

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 725b3760a2..bdad57211f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1217,8 +1217,10 @@ ivas-conformance:
     - git checkout $source_branch_commit_sha
 
     # remove unsupported testcases, in reverse row order 
-    - sed -i '1644,1647d' scripts/config/self_test.prm
+    - sed -i '1657,1659d' scripts/config/self_test.prm
+    - sed -i '1644,1655d' scripts/config/self_test.prm
     - sed -i '1623,1625d' scripts/config/self_test.prm
+    - sed -i '1350,1353d' scripts/config/self_test.prm
     - sed -i '1307,1321d' scripts/config/self_test.prm
     - sed -i '1205,1213d' scripts/config/self_test.prm
     - sed -i '849,851d' scripts/config/self_test.prm
-- 
GitLab


From 0bf479c73e3e152286420d6d2d93fec2adecd0ba Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 11:13:10 +0100
Subject: [PATCH 051/163] Exclude MASA1 from renderer tests

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdad57211f..4ce9c8a90d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1233,6 +1233,8 @@ ivas-conformance:
     - sed -i '206,207d' tests/renderer/utils.py 
     # Revert to -tf option used in old IVAS_rend
     - sed -i '187s/-T/-tf/' tests/renderer/utils.py 
+    # Exclude MASA1
+    - sed -i '195s/"MASA1", //' tests/renderer/constants.py 
 
     # Reference creation
     - exit_code=0
-- 
GitLab


From a049945acc5f4682e277e0b1381db3bea40f0f35 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 12:50:13 +0100
Subject: [PATCH 052/163] Change pca to old bypass 2

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ce9c8a90d..d264f70ce0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1235,6 +1235,8 @@ ivas-conformance:
     - sed -i '187s/-T/-tf/' tests/renderer/utils.py 
     # Exclude MASA1
     - sed -i '195s/"MASA1", //' tests/renderer/constants.py 
+    # Change -pca to -bypass 2
+    - sed -i '258s/-pca/-bypass 2/' tests/conftest.py 
 
     # Reference creation
     - exit_code=0
-- 
GitLab


From a09f0fa6ad890fd440c1afec1e5f19f52f3fa623 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 13:00:56 +0100
Subject: [PATCH 053/163] Remove masa prerenderer test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d264f70ce0..01128623f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1237,6 +1237,8 @@ ivas-conformance:
     - sed -i '195s/"MASA1", //' tests/renderer/constants.py 
     # Change -pca to -bypass 2
     - sed -i '258s/-pca/-bypass 2/' tests/conftest.py 
+    # Remove tests/renderer/test_renderer::test_masa_prerend
+    - sed -i '239,246d' tests/renderer/test_renderer.py
 
     # Reference creation
     - exit_code=0
-- 
GitLab


From 1f5aedca86a3781cf9375a08d92e655e7ef4fe46 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 13:37:17 +0100
Subject: [PATCH 054/163] Remove test_pca_enc

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01128623f9..1248103513 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1239,6 +1239,9 @@ ivas-conformance:
     - sed -i '258s/-pca/-bypass 2/' tests/conftest.py 
     # Remove tests/renderer/test_renderer::test_masa_prerend
     - sed -i '239,246d' tests/renderer/test_renderer.py
+    # Remove test_sba_pca
+    - sed -i '88,153d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+
 
     # Reference creation
     - exit_code=0
-- 
GitLab


From a10ef42050dcfdc047ac3c29724e1555c51171fd Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 14:13:22 +0100
Subject: [PATCH 055/163] Fix renderer test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec18aa990c..557b038786 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1249,10 +1249,10 @@ ivas-conformance:
     - python3 tests/create_short_testvectors.py
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
-    - python3 -m pytest tests/renderer/test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored
+    - python3 -m pytest tests/renderer/test_renderer.py --create_ref || exit_code=$?
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --create_cut --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
-- 
GitLab


From eaf749be33380097f0e81d80174214434a63c1f4 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 13:34:59 +0000
Subject: [PATCH 056/163] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 557b038786..54c021ffc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1265,7 +1265,7 @@ ivas-conformance:
     - mv tests/renderer/ref testv/renderer/ref 
     
     # Test run generated scripts
-    - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    #- python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - *merge-request-comparison-check
 
   artifacts:
-- 
GitLab


From 42ab720d63d003a4bb35c3d47a2c7f8e7b2aa2c3 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 15:59:11 +0100
Subject: [PATCH 057/163] Debug file location

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54c021ffc1..d4e2d0f2cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1249,17 +1249,22 @@ ivas-conformance:
     - python3 tests/create_short_testvectors.py
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
+    - ls ./tests/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
     - python3 -m pytest tests/renderer/test_renderer.py --create_ref || exit_code=$?
+    - ls ./tests/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
 
     # Output creation
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --create_cut --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - ls ./tests/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
     - python3 parse_commands.py report.html Readme_IVAS.txt
+    - ls ./tests/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
     # Move output data
     - mv scripts/testv .
     - mv scripts/ls_layouts .
     - mv tests/ref testv/ref 
+    - ls ./testv/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
     - mkdir testv/renderer
     - mv tests/renderer/data testv/renderer/data
     - mv tests/renderer/ref testv/renderer/ref 
-- 
GitLab


From bc614546bd7ce7bf640744bd1889471b00bc0eba Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 17:17:26 +0100
Subject: [PATCH 058/163] Use dut output as ref output

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4e2d0f2cf..c8a59697ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1249,28 +1249,23 @@ ivas-conformance:
     - python3 tests/create_short_testvectors.py
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
-    - ls ./tests/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
     - python3 -m pytest tests/renderer/test_renderer.py --create_ref || exit_code=$?
-    - ls ./tests/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
 
     # Output creation
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --create_cut --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
-    - ls ./tests/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
     - python3 parse_commands.py report.html Readme_IVAS.txt
-    - ls ./tests/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
-    # Move output data
-    - mv scripts/testv .
-    - mv scripts/ls_layouts .
-    - mv tests/ref testv/ref 
-    - ls ./testv/ref/sba_bs/pkt/stvFOA48c_ivasbr13k_DTX1_Gain0_SID.pkt
+    # Copy output data
+    - cp scripts/testv .
+    - cp scripts/ls_layouts .
+    - cp tests/dut testv/ref 
     - mkdir testv/renderer
-    - mv tests/renderer/data testv/renderer/data
-    - mv tests/renderer/ref testv/renderer/ref 
+    - cp tests/renderer/data testv/renderer/data
+    - cp tests/renderer/ref testv/renderer/ref 
     
     # Test run generated scripts
-    #- python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - *merge-request-comparison-check
 
   artifacts:
-- 
GitLab


From f8eec29b38523eff9bade34c49255041fa68b349 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 17:25:56 +0100
Subject: [PATCH 059/163] Fix copying

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8a59697ab..fb6c2616ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1257,12 +1257,12 @@ ivas-conformance:
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
     # Copy output data
-    - cp scripts/testv .
-    - cp scripts/ls_layouts .
-    - cp tests/dut testv/ref 
+    - cp -r scripts/testv .
+    - cp -r scripts/ls_layouts .
+    - cp -r tests/dut testv/ref 
     - mkdir testv/renderer
-    - cp tests/renderer/data testv/renderer/data
-    - cp tests/renderer/ref testv/renderer/ref 
+    - cp -r tests/renderer/data testv/renderer/data
+    - cp -r tests/renderer/ref testv/renderer/ref 
     
     # Test run generated scripts
     - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
-- 
GitLab


From c96df1785c1dd1795a6de0b0bc1209c1b9d6af66 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 17:31:59 +0100
Subject: [PATCH 060/163] Keep files for DUT run

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb6c2616ab..fd7dbb7f1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1252,7 +1252,7 @@ ivas-conformance:
     - python3 -m pytest tests/renderer/test_renderer.py --create_ref || exit_code=$?
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --create_cut --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
-- 
GitLab


From 7110b1662f97c79c2b72e2c02479f51ecca988dd Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 18:10:19 +0100
Subject: [PATCH 061/163] Use cut output for renderer ref

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd7dbb7f1c..6a8cea0e29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1262,7 +1262,7 @@ ivas-conformance:
     - cp -r tests/dut testv/ref 
     - mkdir testv/renderer
     - cp -r tests/renderer/data testv/renderer/data
-    - cp -r tests/renderer/ref testv/renderer/ref 
+    - cp -r tests/renderer/ref testv/renderer/cut
     
     # Test run generated scripts
     - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
-- 
GitLab


From 80a4da0423b33854ad4bfb3017d9ec2a118b6b1d Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 18:36:26 +0100
Subject: [PATCH 062/163] Fix renderer refs

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a8cea0e29..26dfb5e411 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1262,7 +1262,7 @@ ivas-conformance:
     - cp -r tests/dut testv/ref 
     - mkdir testv/renderer
     - cp -r tests/renderer/data testv/renderer/data
-    - cp -r tests/renderer/ref testv/renderer/cut
+    - cp -r tests/renderer/cut testv/renderer/ref
     
     # Test run generated scripts
     - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
-- 
GitLab


From 43d667349b87fdee459ba2d5d035bed084c55120 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 19:08:32 +0100
Subject: [PATCH 063/163] Add checking for errors in test_26252.py

---
 tests/test_26252.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_26252.py b/tests/test_26252.py
index d284cc4343..ce38943862 100644
--- a/tests/test_26252.py
+++ b/tests/test_26252.py
@@ -104,13 +104,13 @@ def test_26252(test_tag):
 
     if enc_opts:
         enc_opts = replace_paths(enc_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./IVAS_cod"] + enc_opts.split()[1:])
+        subprocess.run(["./IVAS_cod"] + enc_opts.split()[1:], check = True)
     if dec_opts:
         dec_opts = replace_paths(dec_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./IVAS_dec"] + dec_opts.split()[1:])    
+        subprocess.run(["./IVAS_dec"] + dec_opts.split()[1:], check = True)    
     if rend_opts:
         rend_opts = replace_paths(rend_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./IVAS_rend"] + rend_opts.split()[1:])    
+        subprocess.run(["./IVAS_rend"] + rend_opts.split()[1:], check = True)    
 
     diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
     if ';' in diff_opts:
-- 
GitLab


From 5ce34b4fb3758b5fd12f70a2c1832a59c7d74b13 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 19:13:33 +0100
Subject: [PATCH 064/163] Add copying of necessary input data

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26dfb5e411..90618af996 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1256,9 +1256,11 @@ ivas-conformance:
     - python3 parse_commands.py report.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
-    # Copy output data
+    # Copy input data and output ref data
     - cp -r scripts/testv .
     - cp -r scripts/ls_layouts .
+    - cp -r scripts/switchPaths .
+    - cp -r scripts/trajectories .
     - cp -r tests/dut testv/ref 
     - mkdir testv/renderer
     - cp -r tests/renderer/data testv/renderer/data
-- 
GitLab


From d77bc75343ec73cb17b158fe8090f92769d6abd9 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 19:26:36 +0100
Subject: [PATCH 065/163] Fix in parse_commands.py

---
 parse_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parse_commands.py b/parse_commands.py
index 7f85313883..31bab4dbaa 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -48,7 +48,7 @@ if __name__ == '__main__':
             
             if not "pca" in cmd:
                 outfile.write(cmd+'\n')
-                bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt))$", cmd)
+                bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt|.fer))$", cmd)
                 if bts:
                     outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+'\n')
                 outfile.write('\n')
-- 
GitLab


From 8187bf6e83adad4c4ad480cb5fc40547f483c5ab Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 21:31:14 +0100
Subject: [PATCH 066/163] Add artifact of report_cmd.html

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90618af996..91212c2427 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1252,8 +1252,8 @@ ivas-conformance:
     - python3 -m pytest tests/renderer/test_renderer.py --create_ref || exit_code=$?
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
-    - python3 parse_commands.py report.html Readme_IVAS.txt
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --junit-xml=report-junit.xml --html=report_cmd.html --self-contained-html || exit_code=$?
+    - python3 parse_commands.py report_cmd.html Readme_IVAS.txt
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     
     # Copy input data and output ref data
@@ -1276,6 +1276,7 @@ ivas-conformance:
     when: always
     paths:
       - report-junit.xml
+      - report_cmd.html
       - report.html
       - Readme_IVAS_dec.txt  
       - Readme_IVAS_enc.txt  
-- 
GitLab


From e532c86e983479d957af9c237685c8a0fa016c79 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 22:26:29 +0100
Subject: [PATCH 067/163] Fix parse_commands.py

---
 parse_commands.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/parse_commands.py b/parse_commands.py
index 31bab4dbaa..a46b806eed 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -62,7 +62,10 @@ if __name__ == '__main__':
             cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
             cmd = cmd.replace(r'\\', '/')
             inputs = cmd.count(root_folder) - 1
-            cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
+            if ".fer " in cmd:
+                cmd = cmd.replace(root_folder + r'/tests/ref', REF_PATH + r'ref', 1)
+            else:
+                cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
             
-- 
GitLab


From c63262f931f725b9948ec405917c93e90154448b Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 24 Jan 2024 23:01:54 +0100
Subject: [PATCH 068/163] Fix of references

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91212c2427..a7ae07dee2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1261,7 +1261,7 @@ ivas-conformance:
     - cp -r scripts/ls_layouts .
     - cp -r scripts/switchPaths .
     - cp -r scripts/trajectories .
-    - cp -r tests/dut testv/ref 
+    - cp -r tests/ref testv/ref
     - mkdir testv/renderer
     - cp -r tests/renderer/data testv/renderer/data
     - cp -r tests/renderer/cut testv/renderer/ref
-- 
GitLab


From 84d01ccf0fae1cbfe9a4820ed3dc9ebd83cb4f85 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 09:17:20 +0100
Subject: [PATCH 069/163] Disable removal of bitstreams in SBA tests

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7ae07dee2..20d57ee8cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1242,6 +1242,8 @@ ivas-conformance:
     - sed -i '239,246d' tests/renderer/test_renderer.py
     # Remove test_sba_pca
     - sed -i '88,153d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+    # Disable removal of output bitstreams
+    - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
 
     # Reference creation
     - non_be_flag=0
-- 
GitLab


From 6e0c54a284ffc6fdcb7f8849b5e5c5bfe200bb90 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 09:38:55 +0100
Subject: [PATCH 070/163] Fix report

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20d57ee8cb..f4fe35c512 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1256,7 +1256,7 @@ ivas-conformance:
     # Output creation
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --junit-xml=report-junit.xml --html=report_cmd.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report_cmd.html Readme_IVAS.txt
-    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
+    
     
     # Copy input data and output ref data
     - cp -r scripts/testv .
@@ -1269,7 +1269,9 @@ ivas-conformance:
     - cp -r tests/renderer/cut testv/renderer/ref
     
     # Test run generated scripts
+    - exit_code=0    
     - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     - *merge-request-comparison-check
 
   artifacts:
-- 
GitLab


From 25fe9395ed3068ec5579f219f17cb2fa09a9442d Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 11:55:51 +0100
Subject: [PATCH 071/163] Remove one case failing in Windows. Create testvec
 folder for test package

---
 .gitlab-ci.yml      | 25 ++++++++++++++++---------
 tests/test_26252.py |  6 +++---
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4fe35c512..edd3a581c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1227,6 +1227,7 @@ ivas-conformance:
     - sed -i '849,851d' scripts/config/self_test.prm
     - sed -i '805,807d' scripts/config/self_test.prm
     - sed -i '684,686d' scripts/config/self_test.prm
+    - sed -i '505,508d' scripts/config/self_test.prm
     - sed -i '420,422d' scripts/config/self_test.prm
     - sed -i '377,383d' scripts/config/self_test.prm
     - sed -i '321,329d' scripts/config/self_test.prm
@@ -1259,16 +1260,22 @@ ivas-conformance:
     
     
     # Copy input data and output ref data
-    - cp -r scripts/testv .
-    - cp -r scripts/ls_layouts .
-    - cp -r scripts/switchPaths .
-    - cp -r scripts/trajectories .
-    - cp -r tests/ref testv/ref
-    - mkdir testv/renderer
-    - cp -r tests/renderer/data testv/renderer/data
-    - cp -r tests/renderer/cut testv/renderer/ref
+    - mkdir testvec
+    - cp -r scripts/testv testvec
+    - cp -r scripts/ls_layouts testvec
+    - cp -r scripts/switchPaths testvec
+    - cp -r scripts/trajectories testvec
+    - cp -r tests/ref testvec/testv/ref
+    - mkdir testvec/testv/renderer
+    - mkdir testvec/bin
+    - cp -r tests/renderer/data testvec/testv/renderer/data
+    - cp -r tests/renderer/cut testvec/testv/renderer/ref
+    - cp tests/test_26252.py testvec
+    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt testvec
+    - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
     
-    # Test run generated scripts
+    # Test run generated scripts in testvec
+    - cd testvec    
     - exit_code=0    
     - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
diff --git a/tests/test_26252.py b/tests/test_26252.py
index ce38943862..f91da1bbb2 100644
--- a/tests/test_26252.py
+++ b/tests/test_26252.py
@@ -104,13 +104,13 @@ def test_26252(test_tag):
 
     if enc_opts:
         enc_opts = replace_paths(enc_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./IVAS_cod"] + enc_opts.split()[1:], check = True)
+        subprocess.run(["./bin/IVAS_cod"] + enc_opts.split()[1:], check = True)
     if dec_opts:
         dec_opts = replace_paths(dec_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./IVAS_dec"] + dec_opts.split()[1:], check = True)    
+        subprocess.run(["./bin/IVAS_dec"] + dec_opts.split()[1:], check = True)    
     if rend_opts:
         rend_opts = replace_paths(rend_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./IVAS_rend"] + rend_opts.split()[1:], check = True)    
+        subprocess.run(["./bin/IVAS_rend"] + rend_opts.split()[1:], check = True)    
 
     diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
     if ';' in diff_opts:
-- 
GitLab


From a36f8f1958197adfa8737c9a85baee942cb09941 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 13:25:09 +0100
Subject: [PATCH 072/163] Remove section on file cleanup which became empty

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edd3a581c4..b08b56733a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1245,6 +1245,7 @@ ivas-conformance:
     - sed -i '88,153d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
     # Disable removal of output bitstreams
     - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+    - sed -i '605,608d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
 
     # Reference creation
     - non_be_flag=0
-- 
GitLab


From c843e92a1aeab2c9ad24fad4010bcd4460b2be29 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 13:49:06 +0100
Subject: [PATCH 073/163] Correct xml report to only be output on the last test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b08b56733a..8331ae9de6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1256,7 +1256,7 @@ ivas-conformance:
     - python3 -m pytest tests/renderer/test_renderer.py --create_ref || exit_code=$?
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --junit-xml=report-junit.xml --html=report_cmd.html --self-contained-html || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html || exit_code=$?
     - python3 parse_commands.py report_cmd.html Readme_IVAS.txt
     
     
-- 
GitLab


From 95dd215d81075275d0bde18ea5f6e9a9ba8969f3 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Thu, 25 Jan 2024 14:02:31 +0100
Subject: [PATCH 074/163] move conformance test to separate folder

---
 {tests => conformance-test}/test_26252.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {tests => conformance-test}/test_26252.py (100%)

diff --git a/tests/test_26252.py b/conformance-test/test_26252.py
similarity index 100%
rename from tests/test_26252.py
rename to conformance-test/test_26252.py
-- 
GitLab


From 7e1f24719400eea1bf2adaa58733a2eaffc24572 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Thu, 25 Jan 2024 14:59:54 +0100
Subject: [PATCH 075/163] add command line args for test_26252.py

---
 conformance-test/conftest.py   | 71 ++++++++++++++++++++++++++++++++++
 conformance-test/test_26252.py |  8 ++--
 2 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 conformance-test/conftest.py

diff --git a/conformance-test/conftest.py b/conformance-test/conftest.py
new file mode 100644
index 0000000000..0c5ca76062
--- /dev/null
+++ b/conformance-test/conftest.py
@@ -0,0 +1,71 @@
+__copyright__ = """
+(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+contributors to this repository. All Rights Reserved.
+
+This software is protected by copyright law and by international treaties.
+The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
+Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+contributors to this repository retain full ownership rights in their respective contributions in
+the software. This notice grants no license of any kind, including but not limited to patent
+license, nor is any license granted by implication, estoppel or otherwise.
+
+Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
+contributions.
+
+This software is provided "AS IS", without any express or implied warranties. The software is in the
+development stage. It is intended exclusively for experts who have experience with such software and
+solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
+and fitness for a particular purpose are hereby disclaimed and excluded.
+
+Any dispute, controversy or claim arising under or in relation to providing this software shall be
+submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
+accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
+the United Nations Convention on Contracts on the International Sales of Goods.
+"""
+
+import pytest
+import pathlib
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--encoder_path",
+        action="store",
+        help="path to encoder binary IVAS_cod(.exe)",
+        required=True,
+        type=pathlib.Path,
+    )
+    parser.addoption(
+        "--decoder_path",
+        action="store",
+        help="path to decoder binary IVAS_dec(.exe)",
+        required=True,
+        type=pathlib.Path,
+    )
+    parser.addoption(
+        "--renderer_path",
+        action="store",
+        help="path to renderer binary IVAS_rend(.exe)",
+        required=True,
+        type=pathlib.Path,
+    )
+
+
+@pytest.fixture(scope="session")
+def encoder_path(request) -> str:
+    return str(request.config.option.encoder_path.absolute())
+
+
+@pytest.fixture(scope="session")
+def decoder_path(request) -> str:
+    return str(request.config.option.decoder_path.absolute())
+
+
+@pytest.fixture(scope="session")
+def renderer_path(request) -> str:
+    return str(request.config.option.renderer_path.absolute())
diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index f91da1bbb2..a691aa7df9 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -98,19 +98,19 @@ for s in scripts:
             subprocess.run(proc.split())
 
 @pytest.mark.parametrize("test_tag", list(test_dict.keys()))
-def test_26252(test_tag):
+def test_26252(test_tag, encoder_path, decoder_path, renderer_path):
 
     enc_opts, dec_opts, rend_opts, diff_opts, testv_path, ref_path, cut_path = test_dict[test_tag]
 
     if enc_opts:
         enc_opts = replace_paths(enc_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./bin/IVAS_cod"] + enc_opts.split()[1:], check = True)
+        subprocess.run([encoder_path] + enc_opts.split()[1:], check = True)
     if dec_opts:
         dec_opts = replace_paths(dec_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./bin/IVAS_dec"] + dec_opts.split()[1:], check = True)    
+        subprocess.run([decoder_path] + dec_opts.split()[1:], check = True)
     if rend_opts:
         rend_opts = replace_paths(rend_opts, testv_path, ref_path, cut_path)
-        subprocess.run(["./bin/IVAS_rend"] + rend_opts.split()[1:], check = True)    
+        subprocess.run([renderer_path] + rend_opts.split()[1:], check = True)
 
     diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
     if ';' in diff_opts:
-- 
GitLab


From a8136b8329b9f970db755a0ac29338fb4c59dd1e Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Thu, 25 Jan 2024 15:14:03 +0100
Subject: [PATCH 076/163] adjust ci file to new folder structure

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8331ae9de6..e4e2ef27a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1271,14 +1271,14 @@ ivas-conformance:
     - mkdir testvec/bin
     - cp -r tests/renderer/data testvec/testv/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
-    - cp tests/test_26252.py testvec
+    - cp -r conformance-test testvec/
     - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
     
     # Test run generated scripts in testvec
     - cd testvec    
     - exit_code=0    
-    - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest conformance-test/test_26252.py --encoder_path bin/IVAS_cod --decoder_path bin/IVAS_dec --renderer_path bin/IVAS_rend --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     - *merge-request-comparison-check
 
-- 
GitLab


From 804695bac2b17f2d939e635a117c8f155711c47b Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 15:31:41 +0100
Subject: [PATCH 077/163] Remove ivas-linux-fast tag from conf job

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8331ae9de6..3db54afcaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1195,7 +1195,6 @@ test-be-to-release:
 
 ivas-conformance:
   tags:
-    - ivas-linux-fast
     - test-ericsson-linux-runner
   stage: test
   timeout: "60 minutes"
@@ -1278,7 +1277,7 @@ ivas-conformance:
     # Test run generated scripts in testvec
     - cd testvec    
     - exit_code=0    
-    - python3 -m pytest tests/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest tests/test_26252.py --junitxml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     - *merge-request-comparison-check
 
-- 
GitLab


From 47cf599c27e4a80a193900e63a565d0d8ad1a42b Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Thu, 25 Jan 2024 15:46:08 +0100
Subject: [PATCH 078/163] add pytest.ini with report-related options for
 standalone conf test

---
 conformance-test/pytest.ini | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 conformance-test/pytest.ini

diff --git a/conformance-test/pytest.ini b/conformance-test/pytest.ini
new file mode 100644
index 0000000000..6d179f0724
--- /dev/null
+++ b/conformance-test/pytest.ini
@@ -0,0 +1,15 @@
+# pytest.ini
+[pytest]
+# TODO remove ignore after tests are harmonized
+addopts = -ra --tb=short --basetemp=./tmp -n auto -v
+# Write captured system-out log messages to JUnit report.
+junit_logging = system-out
+# Do not capture log information for passing tests to JUnit report.
+junit_log_passing_tests = False
+junit_duration_report = call
+junit_family = xunit1
+log_file_level = DEBUG
+log_format = %(asctime)s %(levelname)s %(message)s
+log_date_format = %Y-%m-%d %H:%M:%S
+# for pytest-html report: do not log environment variables from the runners
+environment_table_redact_list = .*
-- 
GitLab


From 1a41bfdbdc76c3573d64020ec624bb1337e3af50 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 15:56:56 +0100
Subject: [PATCH 079/163] Catch parsing of relative paths

---
 parse_commands.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/parse_commands.py b/parse_commands.py
index a46b806eed..42e77141dc 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -44,6 +44,7 @@ if __name__ == '__main__':
             cmd = cmd.replace(root_folder + r'/IVAS_cod', '$CUT_ENC_BIN')
             cmd = cmd.replace(r'\\', '/')
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
+            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH )
             
             if not "pca" in cmd:
@@ -68,6 +69,7 @@ if __name__ == '__main__':
                 cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
+            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths
             
             if not "pca" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd:            
                 outfile.write(cmd+'\n')
-- 
GitLab


From 395a85ad2b64f569e5a4f13fb937e7763b9daec7 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 16:18:47 +0100
Subject: [PATCH 080/163] Move reports up such that they are found by gitlab

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 711c3c5284..051791924f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1278,6 +1278,8 @@ ivas-conformance:
     - cd testvec    
     - exit_code=0    
     - python3 -m pytest conformance-test/test_26252.py --encoder_path bin/IVAS_cod --decoder_path bin/IVAS_dec --renderer_path bin/IVAS_rend --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - mv report.html ..
+    - mv report-junit.xml ..
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     - *merge-request-comparison-check
 
-- 
GitLab


From 6a84b0ddb12d9c78027ab57a00bb330323a44028 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 16:31:23 +0100
Subject: [PATCH 081/163] Fix zero_errors check

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 051791924f..e1a92d0c01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1278,9 +1278,9 @@ ivas-conformance:
     - cd testvec    
     - exit_code=0    
     - python3 -m pytest conformance-test/test_26252.py --encoder_path bin/IVAS_cod --decoder_path bin/IVAS_dec --renderer_path bin/IVAS_rend --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     - mv report.html ..
     - mv report-junit.xml ..
-    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     - *merge-request-comparison-check
 
   artifacts:
-- 
GitLab


From 1b475a9db12a1929f61618750ce0ae3eb45c218c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 17:09:53 +0100
Subject: [PATCH 082/163] Remove 2 tests failing on Windows

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1a92d0c01..67672b551f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1226,6 +1226,7 @@ ivas-conformance:
     - sed -i '849,851d' scripts/config/self_test.prm
     - sed -i '805,807d' scripts/config/self_test.prm
     - sed -i '684,686d' scripts/config/self_test.prm
+    - sed -i '524,532d' scripts/config/self_test.prm
     - sed -i '505,508d' scripts/config/self_test.prm
     - sed -i '420,422d' scripts/config/self_test.prm
     - sed -i '377,383d' scripts/config/self_test.prm
-- 
GitLab


From 602a416958477bca8b4e784f56716cd59eabc475 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 25 Jan 2024 17:44:14 +0100
Subject: [PATCH 083/163] Remove binaural renderer tests

---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67672b551f..f2de4d27d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1246,7 +1246,13 @@ ivas-conformance:
     # Disable removal of output bitstreams
     - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
     - sed -i '605,608d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
-
+    # Remove binaural renderer tests
+    - sed -i '276,301d' tests/renderer/test_renderer.py
+    - sed -i '205,236d' tests/renderer/test_renderer.py
+    - sed -i '151,186d' tests/renderer/test_renderer.py
+    - sed -i '101,132d' tests/renderer/test_renderer.py
+    - sed -i '58,83d' tests/renderer/test_renderer.py    
+    
     # Reference creation
     - non_be_flag=0
     - exit_code=0
-- 
GitLab


From bd8afbc1afb8dfd9f37d0deb8a1534a4165676a2 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 07:38:56 +0100
Subject: [PATCH 084/163] Remove random tag in fer cases

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2de4d27d1..63e82f6367 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1251,7 +1251,9 @@ ivas-conformance:
     - sed -i '205,236d' tests/renderer/test_renderer.py
     - sed -i '151,186d' tests/renderer/test_renderer.py
     - sed -i '101,132d' tests/renderer/test_renderer.py
-    - sed -i '58,83d' tests/renderer/test_renderer.py    
+    - sed -i '58,83d' tests/renderer/test_renderer.py
+    # Remove random tag in FER cases    
+    - sed -i '438s/next(tempfile._get_candidate_names())/os.path.basename(plc_file)/' tests/conftest.py
     
     # Reference creation
     - non_be_flag=0
-- 
GitLab


From 1a85dcb2857f4b427ff08618117c6a8eee2e0e52 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 07:59:26 +0100
Subject: [PATCH 085/163] Unify bitstream suffix to .192

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63e82f6367..a8e2d08418 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1254,6 +1254,10 @@ ivas-conformance:
     - sed -i '58,83d' tests/renderer/test_renderer.py
     # Remove random tag in FER cases    
     - sed -i '438s/next(tempfile._get_candidate_names())/os.path.basename(plc_file)/' tests/conftest.py
+    # Unify to use .192 as bitstream suffix
+    - sed -i 's/.pkt/.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
+    - sed -i 's/.pkt/.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+    - sed -i 's/.bts/.192/g' tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
     
     # Reference creation
     - non_be_flag=0
-- 
GitLab


From 1ac703c17d99753feafa65808033542d1d7aac2c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 08:28:52 +0100
Subject: [PATCH 086/163] Fix substitution of bitstream suffixes

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8e2d08418..9e5b27d455 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1255,9 +1255,9 @@ ivas-conformance:
     # Remove random tag in FER cases    
     - sed -i '438s/next(tempfile._get_candidate_names())/os.path.basename(plc_file)/' tests/conftest.py
     # Unify to use .192 as bitstream suffix
-    - sed -i 's/.pkt/.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
-    - sed -i 's/.pkt/.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
-    - sed -i 's/.bts/.192/g' tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
+    - sed -i 's/\.pkt/\.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
+    - sed -i 's/\.pkt/\.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+    - sed -i 's/\.bts/\.192/g' tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
     
     # Reference creation
     - non_be_flag=0
-- 
GitLab


From ad601fc59ea9d1fad309475809077af28d5cd750 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 08:33:22 +0100
Subject: [PATCH 087/163] Add default bin path for test_26252.py

---
 .gitlab-ci.yml               | 2 +-
 conformance-test/conftest.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e5b27d455..0109682e02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1290,7 +1290,7 @@ ivas-conformance:
     # Test run generated scripts in testvec
     - cd testvec    
     - exit_code=0    
-    - python3 -m pytest conformance-test/test_26252.py --encoder_path bin/IVAS_cod --decoder_path bin/IVAS_dec --renderer_path bin/IVAS_rend --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
+    - python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
     - mv report.html ..
     - mv report-junit.xml ..
diff --git a/conformance-test/conftest.py b/conformance-test/conftest.py
index 0c5ca76062..7c37c3ad3f 100644
--- a/conformance-test/conftest.py
+++ b/conformance-test/conftest.py
@@ -39,6 +39,7 @@ def pytest_addoption(parser):
         help="path to encoder binary IVAS_cod(.exe)",
         required=True,
         type=pathlib.Path,
+        default='./bin/IVAS_cod',
     )
     parser.addoption(
         "--decoder_path",
@@ -46,6 +47,7 @@ def pytest_addoption(parser):
         help="path to decoder binary IVAS_dec(.exe)",
         required=True,
         type=pathlib.Path,
+        default='./bin/IVAS_dec',
     )
     parser.addoption(
         "--renderer_path",
@@ -53,6 +55,7 @@ def pytest_addoption(parser):
         help="path to renderer binary IVAS_rend(.exe)",
         required=True,
         type=pathlib.Path,
+        default='./bin/IVAS_rend',
     )
 
 
-- 
GitLab


From 50a8493eb924f5138d597d9198f14e6f2ccaf7ef Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 08:41:28 +0100
Subject: [PATCH 088/163] Fix arguments in test_26252.py

---
 conformance-test/conftest.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conformance-test/conftest.py b/conformance-test/conftest.py
index 7c37c3ad3f..5eea228c45 100644
--- a/conformance-test/conftest.py
+++ b/conformance-test/conftest.py
@@ -37,7 +37,6 @@ def pytest_addoption(parser):
         "--encoder_path",
         action="store",
         help="path to encoder binary IVAS_cod(.exe)",
-        required=True,
         type=pathlib.Path,
         default='./bin/IVAS_cod',
     )
@@ -45,7 +44,6 @@ def pytest_addoption(parser):
         "--decoder_path",
         action="store",
         help="path to decoder binary IVAS_dec(.exe)",
-        required=True,
         type=pathlib.Path,
         default='./bin/IVAS_dec',
     )
@@ -53,7 +51,6 @@ def pytest_addoption(parser):
         "--renderer_path",
         action="store",
         help="path to renderer binary IVAS_rend(.exe)",
-        required=True,
         type=pathlib.Path,
         default='./bin/IVAS_rend',
     )
-- 
GitLab


From f4309524e1c77aa0e9db7ec338eceae14016bbde Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 08:58:42 +0100
Subject: [PATCH 089/163] Unify to .wav output

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0109682e02..c69e8885a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1258,6 +1258,10 @@ ivas-conformance:
     - sed -i 's/\.pkt/\.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
     - sed -i 's/\.pkt/\.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
     - sed -i 's/\.bts/\.192/g' tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
+    # Unify to use .wav as output suffix
+    - sed -i 's/\.raw/\.wav/g' tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
+    - sed -i 's/\.raw/\.wav/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+
     
     # Reference creation
     - non_be_flag=0
-- 
GitLab


From 7774a9d284f1ef636a232370ee6b647b76872b2e Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 10:00:38 +0100
Subject: [PATCH 090/163] Add diff on metadata output and log diffs

---
 conformance-test/test_26252.py | 15 ++++-----------
 dec_header.txt                 |  1 +
 enc_header.txt                 |  1 +
 parse_commands.py              | 20 +++++++++++++++-----
 rend_header.txt                |  1 +
 script_footer.txt              | 10 ++++++++++
 6 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 script_footer.txt

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index a691aa7df9..01efa36195 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -113,16 +113,9 @@ def test_26252(test_tag, encoder_path, decoder_path, renderer_path):
         subprocess.run([renderer_path] + rend_opts.split()[1:], check = True)
 
     diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
-    if ';' in diff_opts:
-        cmd1, cmd2 = diff_opts.split(';')
-        cmd1 = cmd1.split()
-        cmd2 = cmd2.split()        
-        result1 = filecmp.cmp(cmd1[0], cmd1[1])
-        result2 = filecmp.cmp(cmd2[2], cmd2[3])
-    else:
-        cmd1 = diff_opts.split()
-        result1 = filecmp.cmp(cmd1[0], cmd1[1])
-        result2 = True
-    if not (result1 and result2):
+    result = True
+    for cmd in diff_opts.split(';')
+        result = result and filecmp.cmp(cmd.split()[0], cmd.split()[1])
+    if not result:
         assert False, "Output differs" 
 
diff --git a/dec_header.txt b/dec_header.txt
index 8469dd4bfb..6d7efe2d83 100644
--- a/dec_header.txt
+++ b/dec_header.txt
@@ -12,6 +12,7 @@ DIFF_BIN="diff"
 TESTV_PATH="."
 REF_PATH="./testv"
 CUT_PATH="./TMP_DEC"
+LOG_FILE=Readme_IVAS_dec_log.txt
 
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH
diff --git a/enc_header.txt b/enc_header.txt
index 32e78419cc..fba31ea826 100644
--- a/enc_header.txt
+++ b/enc_header.txt
@@ -12,6 +12,7 @@ DIFF_BIN="diff"
 TESTV_PATH="."
 REF_PATH="./testv"
 CUT_PATH="./TMP_ENC"
+LOG_FILE=Readme_IVAS_enc_log.txt
 
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH
diff --git a/parse_commands.py b/parse_commands.py
index 42e77141dc..d379b2149c 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -4,6 +4,7 @@ import argparse
 import re
 from os import path
 from pathlib import Path
+import glob
 
 # Main routine
 if __name__ == '__main__':
@@ -51,8 +52,10 @@ if __name__ == '__main__':
                 outfile.write(cmd+'\n')
                 bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt|.fer))$", cmd)
                 if bts:
-                    outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+'\n')
+                    outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+'>> $LOG_FILE 2>&1\n')
                 outfile.write('\n')
+        with open('script_footer.txt','r') as footer:
+            outfile.write(footer.read())                        
 
     with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile:
         with open('dec_header.txt','r') as header:
@@ -75,8 +78,13 @@ if __name__ == '__main__':
                 outfile.write(cmd+'\n')
                 out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
                 if out:
-                    outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+out.group(1)+'\n')
-                outfile.write('\n')
+                    diff_cmds=[]
+                    for output in glob.glob(out.group(1) + '*'):
+                        diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+output+' >> $LOG_FILE 2>&1')
+                    outfile.write(diff_cmds.join('; '))
+                outfile.write('\n\n')
+        with open('script_footer.txt','r') as footer:
+            outfile.write(footer.read())                        
 
     with open(txt_file.replace('.','_rend.'),'w', newline='\n') as outfile:
         with open('rend_header.txt','r') as header:
@@ -96,5 +104,7 @@ if __name__ == '__main__':
                 outfile.write(cmd+'\n')
             out = re.search(r"-o\s(([\S]+)(.wav|.raw|.pcm))", cmd)
             if out and "cut" in out.group(1):
-                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'renderer/cut',REF_PATH + r'renderer/ref')+' '+out.group(1)+'\n')
-                outfile.write('\n')            
\ No newline at end of file
+                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'renderer/cut',REF_PATH + r'renderer/ref')+' '+out.group(1)+' >> $LOG_FILE 2>&1\n')
+                outfile.write('\n')            
+        with open('script_footer.txt','r') as footer:
+            outfile.write(footer.read())                
\ No newline at end of file
diff --git a/rend_header.txt b/rend_header.txt
index 9e4adefc15..f95fb2e534 100644
--- a/rend_header.txt
+++ b/rend_header.txt
@@ -12,6 +12,7 @@ DIFF_BIN="diff"
 TESTV_PATH="."
 REF_PATH="./testv"
 CUT_PATH="./TMP_REND"
+LOG_FILE=Readme_IVAS_rend_log.txt
 
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH/renderer/cut $CUT_PATH/renderer/data
diff --git a/script_footer.txt b/script_footer.txt
new file mode 100644
index 0000000000..ca6412e27c
--- /dev/null
+++ b/script_footer.txt
@@ -0,0 +1,10 @@
+# test that log file is empty
+if [ -s $LOG_FILE ] ; then 
+   echo "TEST FAILED !!!" 
+   echo "Please check the following conditions:" 
+   cat $LOG_FILE 
+
+   echo "Summary: TEST FAILED !!!" 
+else 
+   echo "TEST PASSED SUCCESSFULLY" 
+fi ;
\ No newline at end of file
-- 
GitLab


From 31b53aa868d80281654840d8835d329a0846cd16 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 10:09:47 +0100
Subject: [PATCH 091/163] Fix diff cmds

---
 parse_commands.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parse_commands.py b/parse_commands.py
index d379b2149c..e5b7ed477e 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -81,8 +81,8 @@ if __name__ == '__main__':
                     diff_cmds=[]
                     for output in glob.glob(out.group(1) + '*'):
                         diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+output+' >> $LOG_FILE 2>&1')
-                    outfile.write(diff_cmds.join('; '))
-                outfile.write('\n\n')
+                    outfile.write(('; ').join(diff_cmds))
+                outfile.write('\n')
         with open('script_footer.txt','r') as footer:
             outfile.write(footer.read())                        
 
-- 
GitLab


From 0433beaeab21600b1b6d5fdc577d3faabc6fe21c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 10:15:48 +0100
Subject: [PATCH 092/163] Fix syntax error in test_26252.py

---
 conformance-test/test_26252.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index 01efa36195..895525fc07 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -114,7 +114,7 @@ def test_26252(test_tag, encoder_path, decoder_path, renderer_path):
 
     diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
     result = True
-    for cmd in diff_opts.split(';')
+    for cmd in diff_opts.split(';'):
         result = result and filecmp.cmp(cmd.split()[0], cmd.split()[1])
     if not result:
         assert False, "Output differs" 
-- 
GitLab


From f8cba2da5f1145d627417d54b5837f5105a0c1b9 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 10:32:18 +0100
Subject: [PATCH 093/163] Add separate file for jbm tests

---
 conformance-test/test_26252.py |  2 +-
 jbm_header.txt                 | 22 ++++++++++++++++++++++
 parse_commands.py              | 15 ++++++++++++---
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 jbm_header.txt

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index 895525fc07..c0b8795e68 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -53,7 +53,7 @@ def replace_paths(instr, testv_path, ref_path, cut_path):
 
 test_dict = {}
 TEST_DIR = "."
-scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt"]
+scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt", "Readme_IVAS_jbm.txt"]
 
 for s in scripts:
     with open(os.path.join(TEST_DIR, s), "r", encoding="UTF-8") as fp:
diff --git a/jbm_header.txt b/jbm_header.txt
new file mode 100644
index 0000000000..466c82c654
--- /dev/null
+++ b/jbm_header.txt
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -e
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <CUT_DEC_BIN>"
+    exit -1
+fi            
+
+CUT_DEC_BIN=$1
+DIFF_BIN="diff"
+
+TESTV_PATH="."
+REF_PATH="./testv"
+CUT_PATH="./TMP_JBM"
+LOG_FILE=Readme_IVAS_jbm_log.txt
+
+rm -rf $CUT_PATH
+mkdir -p $CUT_PATH
+mkdir -p $CUT_PATH/dut/masa_test/dec_output
+mkdir -p $CUT_PATH/dut/param_file/dec
+mkdir -p $CUT_PATH/dut/sba_bs/raw
+
diff --git a/parse_commands.py b/parse_commands.py
index e5b7ed477e..aebfa30d06 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -57,9 +57,11 @@ if __name__ == '__main__':
         with open('script_footer.txt','r') as footer:
             outfile.write(footer.read())                        
 
-    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile:
+    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_jbm.'),'w', newline='\n') as outfile_jbm:
         with open('dec_header.txt','r') as header:
-            outfile.write(header.read())
+            outfile_dec.write(header.read())
+        with open('jbm_header.txt','r') as header:            
+            outfile_jbm.write(header.read())
         for cmd in cmds_dec:
             arg1 = cmd.split()[0]
             root_folder = arg1[0:arg1.find("ivas-codec/")+10]
@@ -74,6 +76,11 @@ if __name__ == '__main__':
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
             cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths
             
+            if 'VOIP' in cmd:
+                outfile = outfile_jbm
+            else:
+                outfile = outfile_dec
+            
             if not "pca" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd:            
                 outfile.write(cmd+'\n')
                 out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
@@ -84,7 +91,9 @@ if __name__ == '__main__':
                     outfile.write(('; ').join(diff_cmds))
                 outfile.write('\n')
         with open('script_footer.txt','r') as footer:
-            outfile.write(footer.read())                        
+            outfile_dec.write(footer.read())    
+            footer.seek(0)
+            outfile_jbm.write(footer.read())
 
     with open(txt_file.replace('.','_rend.'),'w', newline='\n') as outfile:
         with open('rend_header.txt','r') as header:
-- 
GitLab


From 60c4bea2f525b8aa9d5421f0ede92fcb0a406c6d Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 10:36:55 +0100
Subject: [PATCH 094/163] Add missing space

---
 parse_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parse_commands.py b/parse_commands.py
index aebfa30d06..d82a087d29 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -52,7 +52,7 @@ if __name__ == '__main__':
                 outfile.write(cmd+'\n')
                 bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt|.fer))$", cmd)
                 if bts:
-                    outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+'>> $LOG_FILE 2>&1\n')
+                    outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+' >> $LOG_FILE 2>&1\n')
                 outfile.write('\n')
         with open('script_footer.txt','r') as footer:
             outfile.write(footer.read())                        
-- 
GitLab


From 7e2d77db208dfaffc7fd3929a8620ca74d9c403e Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 10:39:40 +0100
Subject: [PATCH 095/163] Move jbm script to test package

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c69e8885a3..4dc8510015 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1288,7 +1288,7 @@ ivas-conformance:
     - cp -r tests/renderer/data testvec/testv/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
-    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt testvec
+    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_jbm.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
     
     # Test run generated scripts in testvec
-- 
GitLab


From 6ccf7aaf4e4cbfe22949c103bfd19f4e5281e19b Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 11:19:48 +0100
Subject: [PATCH 096/163] Fix multiple diff

---
 parse_commands.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/parse_commands.py b/parse_commands.py
index d82a087d29..4defd5faf4 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -63,6 +63,7 @@ if __name__ == '__main__':
         with open('jbm_header.txt','r') as header:            
             outfile_jbm.write(header.read())
         for cmd in cmds_dec:
+            absolute_out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
             arg1 = cmd.split()[0]
             root_folder = arg1[0:arg1.find("ivas-codec/")+10]
             cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
@@ -86,7 +87,8 @@ if __name__ == '__main__':
                 out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
                 if out:
                     diff_cmds=[]
-                    for output in glob.glob(out.group(1) + '*'):
+                    for output in glob.glob(absolute_out.group(1) + '*'):
+                        output = output.replace(root_folder + r'/tests/', CUT_PATH)
                         diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+output+' >> $LOG_FILE 2>&1')
                     outfile.write(('; ').join(diff_cmds))
                 outfile.write('\n')
-- 
GitLab


From 404b2d9731826ec70198cdb660a6e8d8ca787677 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 11:31:27 +0100
Subject: [PATCH 097/163] Fix multiple diff 2

---
 conformance-test/test_26252.py                |   4 +-
 scripts/config/self_test.prm                  |  87 ----------
 .../test_masa_enc_dec.py                      |   4 +-
 .../test_sba_bs_dec_plc.py                    |  12 +-
 .../test_sba_bs_enc.py                        |  96 ++---------
 tests/conftest.py                             |   4 +-
 tests/renderer/constants.py                   |   2 +-
 tests/renderer/test_renderer.py               | 160 ------------------
 tests/renderer/utils.py                       |   4 +-
 9 files changed, 27 insertions(+), 346 deletions(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index c0b8795e68..e338233034 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -82,7 +82,7 @@ for s in scripts:
             if line.startswith("$CUT_REND_BIN"):
                 rend_opts = line                
             if line.startswith("$DIFF_BIN"):
-                diff_opts = line[9:]
+                diff_opts = line
                 tag = s + "--" + diff_opts.split()[1].split('/')[-1]
                 if tag in test_dict:
                     print("non-unique tag found - ignoring new entry")
@@ -115,7 +115,7 @@ def test_26252(test_tag, encoder_path, decoder_path, renderer_path):
     diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
     result = True
     for cmd in diff_opts.split(';'):
-        result = result and filecmp.cmp(cmd.split()[0], cmd.split()[1])
+        result = result and filecmp.cmp(cmd.split()[1], cmd.split()[2])
     if not result:
         assert False, "Output differs" 
 
diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm
index 203c8dfc4d..839ae42b73 100644
--- a/scripts/config/self_test.prm
+++ b/scripts/config/self_test.prm
@@ -318,15 +318,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit_error testv/stv1ISM48s.wav_64000_48-48_FER5_binaural_room_HR_EXOF.tst
 
-// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, random FER at 5%
-../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
-eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
-../IVAS_dec -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_FER5_binaural_file_TDHR.tst
-
-// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, external orientation, random FER at 5%
-../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
-eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
-../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_FER5_binaural_file_TDHR_EXOF.tst
 
 // 1 ISM with metadata at 96 kbps, 48 kHz in, 16 kHz out, EXT out
 ../IVAS_cod -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit
@@ -374,13 +365,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 80000 48 testv/stvST48n.wav bit
 ../IVAS_dec STEREO 48 bit testv/stvST48n.wav_2ISM_80000_48-48_DTX_STEREO.tst
 
-// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation
-../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit
-../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_binaural_file_TDHR.tst
-
-// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation, external orientation
-../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit
-../IVAS_dec -t testv/headrot_case01_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_binaural_file_TDHR_EXOF.tst
 
 // 2 ISM with metadata at 160 kbps, 48 kHz in, 32 kHz out, BINAURAL out
 ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 160000 48 testv/stv2ISM48s.wav bit
@@ -417,9 +401,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec HOA3 32 bit_error testv/stv3ISM48s.wav_128000_48-32_HOA3_FER5.tst
 
-// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out (Model from file)
-../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit
-../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_binauralfile.tst
 
 // 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, random FER at 5%
 ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit
@@ -502,10 +483,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_dec -t testv/headrot_case03_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_binaural_file_TDHR_EXOF.tst
 
 // 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, 5_1
-../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stv4ISM48s.wav bit
-../IVAS_dec 5_1 48 bit testv/stv4ISM48s.wav_512000_48-48_5_1.tst
-
-// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, Orientation tracking
 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 48 bit testv/stv4ISM48s.pcm_256000_48-48_TDHR_OtrAvg.tst
 
@@ -521,15 +498,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 4 testv/stvISM1.csv NULL NULL testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit
 ../IVAS_dec HOA3 48 bit testv/stv4ISM48n.wav_brate_sw_48-48_DTX_hoa3.tst
 
-// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, directivity configuration, random FER at 5%
-../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
-eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
-../IVAS_dec -render_config testv/config_directivity_txt.cfg -t testv/headrot_case04_3000_q.csv BINAURAL 48 bit_error testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_DirConfig_FER5.tst
-
-// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, external orientation, directivity configuration, random FER at 5%
-../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
-eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
-../IVAS_dec -render_config testv/config_directivity.cfg -t testv/headrot_case04_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit_error testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_EXOF_DirConfig_FER5.tst
 
 // 4 ISM with and without extended metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out
 ../IVAS_cod -dtx -ism +4 testv/stvISM1.csv NULL testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit
@@ -681,9 +649,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 48000 48 testv/stv3OA48c.wav bit
 ../IVAS_dec 5_1_2 48 bit testv/stv3OA48c.wav_SBA_48000_48-48_5_1_2.tst
 
-// SBA at 48 kbps, 48kHz in, 48kHz out, BINAURAL out, fr 5ms
-../IVAS_cod -sba 3 48000 48 testv/stv3OA48c.wav bit
-../IVAS_dec -fr 5 -t testv/headrot.csv BINAURAL 48 bit testv/stv3OA48c.wav_SBA_48000_48-48_binaural_ht_fr5.tst
 
 // SBA at 64 kbps, 32kHz in, 32kHz out, FOA out, DTX, random FER at 5%
 ../IVAS_cod -dtx -sba 1 64000 32 testv/stvFOA32c.wav bit
@@ -802,9 +767,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 512000 48 testv/stv3OA48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_Binaural_Headrot_EXOF.tst
 
-// SBA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, fr 5ms
-../IVAS_cod -sba 3 512000 48 testv/stv3OA48c.wav bit
-../IVAS_dec -fr 5 -t testv/headrot.csv BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_binaural_ht_fr5.tst
 
 // SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 48kHz in, 48kHz out, BINAURAL out
 ../IVAS_cod -sba 1 ../scripts/switchPaths/sw_13k2_192k_50fr.bin 48 testv/stvFOA48c.wav bit
@@ -846,9 +808,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -sba 3 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv3OA32c.wav bit
 ../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_sw_32-32_DTX_HOA3.tst
 
-// SBA FOA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, FOA out
-../IVAS_cod -sba 1 -max_band fb ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvFOA48c.wav bit
-../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_sw_48-48_FOA.tst
 
 
 // MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out
@@ -1202,15 +1161,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 
 // Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out, fr 5ms
 ../IVAS_cod -mc 7_1_4 160000 48 testv/stv714MC48c.wav bit
-../IVAS_dec -fr 5 BINAURAL_ROOM_IR 48 bit testv/stv714MC48c.wav_MC714_160000_48-48_MC_binaural_room_fr5.tst
-
-// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, with headtracking, BINAURAL out, fr 5ms
-../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
-../IVAS_dec -fr 5 -t testv/headrot.csv BINAURAL 48 bit testv/stv714MC48c.wav_MC714_512000_48-48_MC_binaural_ht_fr5.tst
-
-// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, fr 5ms
-../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit
-../IVAS_dec -fr 5 -t testv/headrot.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_binaural_ht_fr5.tst
 
 // Multi-channel 5_1_2 at 32 kbps, 48kHz in, 48kHz out, STEREO out, random FER at 5%
 ../IVAS_cod -mc 5_1_2 32000 48 testv/stv512MC48c.wav bit
@@ -1304,21 +1254,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_dec BINAURAL 48 bit testv/stv51MC48c.wav_sw_48-48_BINAURAL.tst
 
 
-// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM out (Model from file)
-../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit
-../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL_ROOM_IR 16 bit testv/stv51MC48c.wav_MC51_512000_48-16_MC_binaural_room.tst
-
-// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 32kHz out, BINAURAL out (Model from file)
-../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
-../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv714MC48c.wav_MC714_512000_48-32_MC_binaural.tst
-
-// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL out (Model from file)
-../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit
-../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_binaural.tst
-
-// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out (Model from file)
-../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
-../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL_ROOM_IR 48 bit testv/stv714MC48c.wav_MC714_512000_48-48_MC_binaural_room.tst
 
 
 
@@ -1347,10 +1282,6 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP HOA3 32 netsimoutput testv/stv3OA32c.wav_SBA_80000_32-32_HOA3_JBM5.tst
 
-// SBA at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out, JBM Prof 5
-../IVAS_cod -sba 1 13200 48 testv/stvFOA48c.wav bit
-networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
-../IVAS_dec -Tracefile tracefile_dec -VOIP BINAURAL 48 netsimoutput testv/stvFOA32c.wav_SBA_13200_48-48_BINAURAL_JBM5.tst
 
 // Multi-channel 5_1 at 384 kbps, 48kHz in, 48kHz out, 7_1_4 out, JBM Prof 5
 ../IVAS_cod -mc 5_1 384000 48 testv/stv51MC48c.wav bit
@@ -1620,9 +1551,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_3OA48c.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_sw_13k2_512k_48-48.tst
 
-// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA3 out
-../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 32 testv/stvOSBA_2ISM_3OA32c.wav bit
-../IVAS_dec HOA3 32 bit testv/stvOSBA_2ISM_3OA32c.wav_HOA3_256000_32-32.tst
 
 // OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, MONO out
 ../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 384000 16 testv/stvOSBA_3ISM_2OA16c.wav bit
@@ -1641,19 +1569,4 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 48 bit_error testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_sw_48-48_FER5.tst
 
-// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, STEREO out, FER at 10%
-../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_3ISM_2OA48c.wav bit
-eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
-../IVAS_dec STEREO 32 bit_error testv/stvOSBA_3ISM_2OA48c.wav_STEREO_sw_48-32_FER10.tst
-
-// OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out
-../IVAS_cod -ism_sba 1 -1 testv/stvISM1.csv 256000 48 testv/stvOSBA_1ISM_FOA48c.wav bit
-../IVAS_dec BINAURAL 48 bit testv/stvOSBA_1ISM_pFOA48c.wav_BINAURAL_256000_48-48.tst
-
-// OSBA planar FOA 2ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out
-../IVAS_cod -ism_sba 2 -1 testv/stvISM1.csv testv/stvISM2.csv 512000 48 testv/stvOSBA_2ISM_FOA48c.wav bit
-../IVAS_dec BINAURAL 48 bit testv/stvOSBA_2ISM_pFOA48c.wav_BINAURAL_512000_48-48.tst
 
-// OSBA planar 3OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out
-../IVAS_cod -ism_sba 4 -3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_3OA48c.wav bit
-../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_p3OA48c.wav_BINAURAL_512000_48-48.tst
diff --git a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
index 0614651653..af6d9cb86e 100644
--- a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
+++ b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
@@ -139,8 +139,8 @@ def test_masa_enc_dec(
     check_and_makedir(out_dir_dec_output_dut)
 
     # To avoid conflicting names in case of parallel test execution, differentiate all cases
-    output_bitstream_ref = f"{out_dir_bs_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.bts"
-    output_bitstream_dut = f"{out_dir_bs_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.bts"
+    output_bitstream_ref = f"{out_dir_bs_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.192"
+    output_bitstream_dut = f"{out_dir_bs_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.192"
     dec_output_ref = f"{out_dir_dec_output_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.wav"
     dec_output_dut = f"{out_dir_dec_output_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.wav"
     if output_mode == "EXT":
diff --git a/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py b/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
index 422f87d9c7..528f6b5d2f 100644
--- a/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
+++ b/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
@@ -157,14 +157,14 @@ def sba_dec_plc(
     check_and_makedir(ref_out_dir)
 
     plc_file = f"{test_vector_path}/{plc_pattern}.g192"
-    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}.pkt"
-    ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_dutenc.pkt"
+    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}.192"
+    ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_dutenc.192"
     if SID == 1:
-        ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_cut.pkt"
-        ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_dutenc_cut.pkt"
+        ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_cut.192"
+        ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_dutenc_cut.192"
 
-    dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.raw"
-    ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.raw"
+    dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.wav"
+    ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.wav"
 
     output_config = "FOA"
     if ref_decoder_path:
diff --git a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
index 3e84e6b283..a75c1ed7e9 100644
--- a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+++ b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
@@ -85,72 +85,6 @@ def check_and_makedir(dir_path):
                 raise  # raises the error again
 
 
-@pytest.mark.create_ref
-@pytest.mark.parametrize("tag", tag_list)
-@pytest.mark.parametrize("fs", sample_rate_list)
-def test_pca_enc(
-    dut_encoder_frontend: EncoderFrontend,
-    dut_decoder_frontend: DecoderFrontend,
-    test_vector_path,
-    reference_path,
-    dut_base_path,
-    ref_encoder_frontend,
-    ref_decoder_frontend,
-    update_ref,
-    keep_files,
-    tag,
-    fs,
-    get_mld,
-):
-    pca = True
-    tag = tag + fs + "c"
-    ivas_br = "256000"
-    dtx = "0"
-    max_bw = "FB"
-    gain_flag = -1
-    sba_order = "+1"
-    output_config = "FOA"
-
-    # enc
-    sba_enc(
-        dut_encoder_frontend,
-        test_vector_path,
-        ref_encoder_frontend,
-        reference_path,
-        dut_base_path,
-        None,
-        tag,
-        fs,
-        ivas_br,
-        dtx,
-        None,
-        max_bw,
-        sba_order,
-        update_ref,
-        gain_flag,
-        cut_testv=True,
-        pca=pca,
-    )
-
-    # dec
-    sba_dec(
-        dut_decoder_frontend,
-        ref_decoder_frontend,
-        reference_path,
-        dut_base_path,
-        tag,
-        fs,
-        ivas_br,
-        dtx,
-        None,
-        max_bw,
-        output_config,
-        update_ref,
-        gain_flag,
-        keep_files,
-        get_mld=get_mld,
-        pca=pca,
-    )
 
 
 @pytest.mark.create_ref
@@ -504,14 +438,14 @@ def sba_enc(
         long_tag_ext += f"_Gain{gain_flag}"
     if SID == 1:
         long_tag_ext += f"_SID"
-    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.pkt"
-    ref_pkt_file = f"{ref_out_dir}/{tag_out}{short_tag_ext}.pkt"
-    ref_pkt_file_dutenc = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc.pkt"
+    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.192"
+    ref_pkt_file = f"{ref_out_dir}/{tag_out}{short_tag_ext}.192"
+    ref_pkt_file_dutenc = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc.192"
     if SID == 1:
-        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{long_tag_ext}_cut.pkt"
-        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_cut.pkt"
+        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{long_tag_ext}_cut.192"
+        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_cut.192"
         ref_pkt_file_dutenc_cut = (
-            f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc_cut.pkt"
+            f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc_cut.192"
         )
     input_path = f"{test_vector_path}/{tag_in}{in_extension}"
     dtx_mode = dtx == "1"
@@ -584,13 +518,13 @@ def sba_enc(
             with open(ref_pkt_file_dutenc, "rb") as fp_in:
                 with open(ref_pkt_file_dutenc_cut, "wb") as fp_out:
                     fr_cnt, cut_cnt = cut_from_start(fp_in, fp_out, 0, True)
-            os.remove(ref_pkt_file)
-            os.remove(ref_pkt_file_dutenc)
+            #os.remove(ref_pkt_file)
+            #os.remove(ref_pkt_file_dutenc)
         if update_ref == 0:
             with open(dut_pkt_file, "rb") as fp_in:
                 with open(dut_pkt_file_cut, "wb") as fp_out:
                     fr_cnt, cut_cnt = cut_from_start(fp_in, fp_out, 0, True)
-            os.remove(dut_pkt_file)
+            #os.remove(dut_pkt_file)
 
 
 def sba_dec(
@@ -635,11 +569,11 @@ def sba_dec(
     dut_out_dir = f"{dut_base_path}/sba_bs/raw"
     ref_out_dir = f"{reference_path}/sba_bs/raw"
 
-    dut_in_pkt = f"{dut_base_path}/sba_bs/pkt/{tag_out}{long_tag_ext}.pkt"
-    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}.pkt"
+    dut_in_pkt = f"{dut_base_path}/sba_bs/pkt/{tag_out}{long_tag_ext}.192"
+    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}.192"
 
-    dut_out_raw = f"{dut_out_dir}/{tag_out}{long_tag_ext}.raw"
-    ref_out_raw = f"{ref_out_dir}/{tag_out}{short_tag_ext}.raw"
+    dut_out_raw = f"{dut_out_dir}/{tag_out}{long_tag_ext}.wav"
+    ref_out_raw = f"{ref_out_dir}/{tag_out}{short_tag_ext}.wav"
 
     check_and_makedir(dut_out_dir)
     check_and_makedir(ref_out_dir)
@@ -668,7 +602,3 @@ def sba_dec(
         # report compare result
         assert cmp_result == 0, reason
 
-        # remove DUT output files when test result is OK (to save disk space)
-        if not keep_files:
-            os.remove(dut_in_pkt)
-            os.remove(dut_out_raw)
diff --git a/tests/conftest.py b/tests/conftest.py
index 5f7ed04a82..a542b12ff1 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -255,7 +255,7 @@ class EncoderFrontend:
             command.extend(["-max_band", max_band])
 
         if pca:
-            command.extend(["-pca"])
+            command.extend(["-bypass 2"])
 
         if quiet_mode:
             command.extend(["-q"])
@@ -435,7 +435,7 @@ class DecoderFrontend:
         
             eid_command = [eid_path]
             eid_command.extend(["-fer", "-vbr", "-bs", "g192", "-ep", "g192"])
-            eid_output_suffix = "." + next(tempfile._get_candidate_names()) + ".fer"
+            eid_output_suffix = "." + os.path.basename(plc_file) + ".fer"
             eid_command += [
                 str(input_bitstream_path),
                 str(plc_file),
diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py
index 056242bd3c..09fc0d74bb 100644
--- a/tests/renderer/constants.py
+++ b/tests/renderer/constants.py
@@ -192,7 +192,7 @@ FORMAT_TO_METADATA_FILES = {
 INPUT_FORMATS_AMBI = ["FOA", "HOA2", "HOA3"]
 INPUT_FORMATS_MC = ["MONO", "STEREO", "5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]
 INPUT_FORMATS_ISM = ["ISM1", "ISM2", "ISM3", "ISM4"]
-INPUT_FORMATS_MASA = ["MASA1", "MASA2"]
+INPUT_FORMATS_MASA = ["MASA2"]
 
 """ Non binaural / parametric output formats """
 OUTPUT_FORMATS = [
diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py
index 1ddba22695..e481818045 100644
--- a/tests/renderer/test_renderer.py
+++ b/tests/renderer/test_renderer.py
@@ -55,32 +55,6 @@ def test_ambisonics(test_info, in_fmt, out_fmt, frame_size):
     )
 
 
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_ambisonics_binaural_static(test_info, in_fmt, out_fmt, frame_size):
-    run_renderer(
-        test_info,
-        in_fmt,
-        out_fmt,
-        frame_size=frame_size,
-    )
-
-
-@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_ambisonics_binaural_headrotation(
-    test_info, in_fmt, out_fmt, trj_file, frame_size
-):
-    run_renderer(
-        test_info,
-        in_fmt,
-        out_fmt,
-        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
-        frame_size=frame_size,
-    )
 
 
 """ Multichannel """
@@ -98,38 +72,6 @@ def test_multichannel(test_info, in_fmt, out_fmt, frame_size):
     )
 
 
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_multichannel_binaural_static(test_info, in_fmt, out_fmt, frame_size):
-    if in_fmt in ["MONO", "STEREO"]:
-        pytest.skip("MONO or STEREO to Binaural rendering unsupported")
-
-    run_renderer(
-        test_info,
-        in_fmt,
-        out_fmt,
-        frame_size=frame_size,
-    )
-
-
-@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_multichannel_binaural_headrotation(
-    test_info, in_fmt, out_fmt, trj_file, frame_size
-):
-    if in_fmt in ["MONO", "STEREO"]:
-        pytest.skip("MONO or STEREO to Binaural rendering unsupported")
-
-    run_renderer(
-        test_info,
-        in_fmt,
-        out_fmt,
-        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
-        frame_size=frame_size,
-    )
 
 
 """ ISM """
@@ -148,42 +90,6 @@ def test_ism(test_info, in_fmt, out_fmt, frame_size):
     )
 
 
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_ism_binaural_static(test_info, in_fmt, out_fmt, frame_size):
-    try:
-        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]
-    except KeyError:
-        in_meta_files = None
-
-    run_renderer(
-        test_info,
-        in_fmt,
-        out_fmt,
-        in_meta_files=in_meta_files,
-        frame_size=frame_size,
-    )
-
-
-@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file, frame_size):
-    try:
-        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]
-    except KeyError:
-        in_meta_files = None
-
-    run_renderer(
-        test_info,
-        in_fmt,
-        out_fmt,
-        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
-        in_meta_files=in_meta_files,
-        frame_size=frame_size,
-    )
 
 
 """ MASA """
@@ -202,48 +108,8 @@ def test_masa(test_info, in_fmt, out_fmt, frame_size):
     )
 
 
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_masa_binaural_static(test_info, in_fmt, out_fmt, frame_size):
-    if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]:
-        pytest.skip("Skipping binaural room outputs for MASA as unimplemented.")
-
-    run_renderer(
-        test_info,
-        in_fmt,
-        out_fmt,
-        in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],
-        frame_size=frame_size,
-    )
-
-
-@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_masa_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file, frame_size):
-    if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]:
-        pytest.skip("Skipping binaural room outputs for MASA as unimplemented.")
-
-    run_renderer(
-        test_info,
-        in_fmt,
-        out_fmt,
-        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
-        in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],
-        frame_size=frame_size,
-    )
 
 
-@pytest.mark.parametrize("in_fmt", METADATA_SCENES_TO_TEST_MASA_PREREND)
-def test_masa_prerend(test_info, in_fmt):
-    run_renderer(
-        test_info,
-        "META",
-        "MASA2",
-        metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}.txt"),
-    )
 
 
 """ Custom loudspeaker layouts """
@@ -281,32 +147,6 @@ def test_custom_ls_input_output(test_info, in_fmt, out_fmt):
     )
 
 
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_custom_ls_input_binaural(test_info, in_layout, out_fmt, frame_size):
-    run_renderer(
-        test_info,
-        CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),
-        out_fmt,
-        frame_size=frame_size,
-    )
-
-
-@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
-@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
-@pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST)
-@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
-def test_custom_ls_input_binaural_headrotation(
-    test_info, in_layout, out_fmt, trj_file, frame_size
-):
-    run_renderer(
-        test_info,
-        CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),
-        out_fmt,
-        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
-        frame_size=frame_size,
-    )
 
 
 """ Metadata / scene description input """
diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py
index 5f724e16de..e4ab74683b 100644
--- a/tests/renderer/utils.py
+++ b/tests/renderer/utils.py
@@ -184,7 +184,7 @@ def run_renderer(
         cmd[5:5] = ["-im", *in_meta_files]
 
     if trj_file is not None:
-        cmd.extend(["-T", str(trj_file)])
+        cmd.extend(["-tf", str(trj_file)])
 
     if non_diegetic_pan is not None:
         cmd.extend(["-non_diegetic_pan", str(non_diegetic_pan)])
@@ -203,8 +203,6 @@ def run_renderer(
     if config_file is not None:
         cmd.extend(["-render_config", str(config_file)])
 
-    if frame_size:
-        cmd.extend(["-fr", str(frame_size.replace("ms", ""))])
 
     # Set env variables for UBSAN
     env = os.environ.copy()
-- 
GitLab


From b918e5cd46d419d38b73d0bf472625e281481251 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 11:33:26 +0100
Subject: [PATCH 098/163] Fix multiple diff 3

---
 conformance-test/test_26252.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index e338233034..1c148bcc72 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -83,7 +83,7 @@ for s in scripts:
                 rend_opts = line                
             if line.startswith("$DIFF_BIN"):
                 diff_opts = line
-                tag = s + "--" + diff_opts.split()[1].split('/')[-1]
+                tag = s + "--" + diff_opts.split()[2].split('/')[-1]
                 if tag in test_dict:
                     print("non-unique tag found - ignoring new entry")
                     continue                
-- 
GitLab


From b3224af2fb1dfddfb808cf85f727b9c3dc370a98 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 14:09:14 +0100
Subject: [PATCH 099/163] Revert "Fix multiple diff 3"

This reverts commit b918e5cd46d419d38b73d0bf472625e281481251.
---
 conformance-test/test_26252.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index 1c148bcc72..e338233034 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -83,7 +83,7 @@ for s in scripts:
                 rend_opts = line                
             if line.startswith("$DIFF_BIN"):
                 diff_opts = line
-                tag = s + "--" + diff_opts.split()[2].split('/')[-1]
+                tag = s + "--" + diff_opts.split()[1].split('/')[-1]
                 if tag in test_dict:
                     print("non-unique tag found - ignoring new entry")
                     continue                
-- 
GitLab


From c92e2ba6aadc956c65a49757ad8f5202217c3ae7 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 14:09:24 +0100
Subject: [PATCH 100/163] Revert "Fix multiple diff 2"

This reverts commit 404b2d9731826ec70198cdb660a6e8d8ca787677.
---
 conformance-test/test_26252.py                |   4 +-
 scripts/config/self_test.prm                  |  87 ++++++++++
 .../test_masa_enc_dec.py                      |   4 +-
 .../test_sba_bs_dec_plc.py                    |  12 +-
 .../test_sba_bs_enc.py                        |  96 +++++++++--
 tests/conftest.py                             |   4 +-
 tests/renderer/constants.py                   |   2 +-
 tests/renderer/test_renderer.py               | 160 ++++++++++++++++++
 tests/renderer/utils.py                       |   4 +-
 9 files changed, 346 insertions(+), 27 deletions(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index e338233034..c0b8795e68 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -82,7 +82,7 @@ for s in scripts:
             if line.startswith("$CUT_REND_BIN"):
                 rend_opts = line                
             if line.startswith("$DIFF_BIN"):
-                diff_opts = line
+                diff_opts = line[9:]
                 tag = s + "--" + diff_opts.split()[1].split('/')[-1]
                 if tag in test_dict:
                     print("non-unique tag found - ignoring new entry")
@@ -115,7 +115,7 @@ def test_26252(test_tag, encoder_path, decoder_path, renderer_path):
     diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
     result = True
     for cmd in diff_opts.split(';'):
-        result = result and filecmp.cmp(cmd.split()[1], cmd.split()[2])
+        result = result and filecmp.cmp(cmd.split()[0], cmd.split()[1])
     if not result:
         assert False, "Output differs" 
 
diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm
index 839ae42b73..203c8dfc4d 100644
--- a/scripts/config/self_test.prm
+++ b/scripts/config/self_test.prm
@@ -318,6 +318,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit_error testv/stv1ISM48s.wav_64000_48-48_FER5_binaural_room_HR_EXOF.tst
 
+// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, random FER at 5%
+../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
+eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
+../IVAS_dec -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_FER5_binaural_file_TDHR.tst
+
+// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, external orientation, random FER at 5%
+../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
+eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
+../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_FER5_binaural_file_TDHR_EXOF.tst
 
 // 1 ISM with metadata at 96 kbps, 48 kHz in, 16 kHz out, EXT out
 ../IVAS_cod -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit
@@ -365,6 +374,13 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 80000 48 testv/stvST48n.wav bit
 ../IVAS_dec STEREO 48 bit testv/stvST48n.wav_2ISM_80000_48-48_DTX_STEREO.tst
 
+// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation
+../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit
+../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_binaural_file_TDHR.tst
+
+// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation, external orientation
+../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit
+../IVAS_dec -t testv/headrot_case01_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_binaural_file_TDHR_EXOF.tst
 
 // 2 ISM with metadata at 160 kbps, 48 kHz in, 32 kHz out, BINAURAL out
 ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 160000 48 testv/stv2ISM48s.wav bit
@@ -401,6 +417,9 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec HOA3 32 bit_error testv/stv3ISM48s.wav_128000_48-32_HOA3_FER5.tst
 
+// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out (Model from file)
+../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit
+../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_binauralfile.tst
 
 // 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, random FER at 5%
 ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit
@@ -483,6 +502,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_dec -t testv/headrot_case03_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_binaural_file_TDHR_EXOF.tst
 
 // 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, 5_1
+../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stv4ISM48s.wav bit
+../IVAS_dec 5_1 48 bit testv/stv4ISM48s.wav_512000_48-48_5_1.tst
+
+// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, Orientation tracking
 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 48 bit testv/stv4ISM48s.pcm_256000_48-48_TDHR_OtrAvg.tst
 
@@ -498,6 +521,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 4 testv/stvISM1.csv NULL NULL testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit
 ../IVAS_dec HOA3 48 bit testv/stv4ISM48n.wav_brate_sw_48-48_DTX_hoa3.tst
 
+// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, directivity configuration, random FER at 5%
+../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
+eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
+../IVAS_dec -render_config testv/config_directivity_txt.cfg -t testv/headrot_case04_3000_q.csv BINAURAL 48 bit_error testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_DirConfig_FER5.tst
+
+// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, external orientation, directivity configuration, random FER at 5%
+../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
+eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
+../IVAS_dec -render_config testv/config_directivity.cfg -t testv/headrot_case04_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit_error testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_EXOF_DirConfig_FER5.tst
 
 // 4 ISM with and without extended metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out
 ../IVAS_cod -dtx -ism +4 testv/stvISM1.csv NULL testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit
@@ -649,6 +681,9 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 48000 48 testv/stv3OA48c.wav bit
 ../IVAS_dec 5_1_2 48 bit testv/stv3OA48c.wav_SBA_48000_48-48_5_1_2.tst
 
+// SBA at 48 kbps, 48kHz in, 48kHz out, BINAURAL out, fr 5ms
+../IVAS_cod -sba 3 48000 48 testv/stv3OA48c.wav bit
+../IVAS_dec -fr 5 -t testv/headrot.csv BINAURAL 48 bit testv/stv3OA48c.wav_SBA_48000_48-48_binaural_ht_fr5.tst
 
 // SBA at 64 kbps, 32kHz in, 32kHz out, FOA out, DTX, random FER at 5%
 ../IVAS_cod -dtx -sba 1 64000 32 testv/stvFOA32c.wav bit
@@ -767,6 +802,9 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 512000 48 testv/stv3OA48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_Binaural_Headrot_EXOF.tst
 
+// SBA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, fr 5ms
+../IVAS_cod -sba 3 512000 48 testv/stv3OA48c.wav bit
+../IVAS_dec -fr 5 -t testv/headrot.csv BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_binaural_ht_fr5.tst
 
 // SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 48kHz in, 48kHz out, BINAURAL out
 ../IVAS_cod -sba 1 ../scripts/switchPaths/sw_13k2_192k_50fr.bin 48 testv/stvFOA48c.wav bit
@@ -808,6 +846,9 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -sba 3 ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv3OA32c.wav bit
 ../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_sw_32-32_DTX_HOA3.tst
 
+// SBA FOA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, FOA out
+../IVAS_cod -sba 1 -max_band fb ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvFOA48c.wav bit
+../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_sw_48-48_FOA.tst
 
 
 // MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out
@@ -1161,6 +1202,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 
 // Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out, fr 5ms
 ../IVAS_cod -mc 7_1_4 160000 48 testv/stv714MC48c.wav bit
+../IVAS_dec -fr 5 BINAURAL_ROOM_IR 48 bit testv/stv714MC48c.wav_MC714_160000_48-48_MC_binaural_room_fr5.tst
+
+// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, with headtracking, BINAURAL out, fr 5ms
+../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
+../IVAS_dec -fr 5 -t testv/headrot.csv BINAURAL 48 bit testv/stv714MC48c.wav_MC714_512000_48-48_MC_binaural_ht_fr5.tst
+
+// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, fr 5ms
+../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit
+../IVAS_dec -fr 5 -t testv/headrot.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_binaural_ht_fr5.tst
 
 // Multi-channel 5_1_2 at 32 kbps, 48kHz in, 48kHz out, STEREO out, random FER at 5%
 ../IVAS_cod -mc 5_1_2 32000 48 testv/stv512MC48c.wav bit
@@ -1254,6 +1304,21 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_dec BINAURAL 48 bit testv/stv51MC48c.wav_sw_48-48_BINAURAL.tst
 
 
+// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM out (Model from file)
+../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit
+../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL_ROOM_IR 16 bit testv/stv51MC48c.wav_MC51_512000_48-16_MC_binaural_room.tst
+
+// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 32kHz out, BINAURAL out (Model from file)
+../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
+../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv714MC48c.wav_MC714_512000_48-32_MC_binaural.tst
+
+// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL out (Model from file)
+../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit
+../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_binaural.tst
+
+// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out (Model from file)
+../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
+../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL_ROOM_IR 48 bit testv/stv714MC48c.wav_MC714_512000_48-48_MC_binaural_room.tst
 
 
 
@@ -1282,6 +1347,10 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP HOA3 32 netsimoutput testv/stv3OA32c.wav_SBA_80000_32-32_HOA3_JBM5.tst
 
+// SBA at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out, JBM Prof 5
+../IVAS_cod -sba 1 13200 48 testv/stvFOA48c.wav bit
+networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
+../IVAS_dec -Tracefile tracefile_dec -VOIP BINAURAL 48 netsimoutput testv/stvFOA32c.wav_SBA_13200_48-48_BINAURAL_JBM5.tst
 
 // Multi-channel 5_1 at 384 kbps, 48kHz in, 48kHz out, 7_1_4 out, JBM Prof 5
 ../IVAS_cod -mc 5_1 384000 48 testv/stv51MC48c.wav bit
@@ -1551,6 +1620,9 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_3OA48c.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_sw_13k2_512k_48-48.tst
 
+// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, HOA3 out
+../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 32 testv/stvOSBA_2ISM_3OA32c.wav bit
+../IVAS_dec HOA3 32 bit testv/stvOSBA_2ISM_3OA32c.wav_HOA3_256000_32-32.tst
 
 // OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, MONO out
 ../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 384000 16 testv/stvOSBA_3ISM_2OA16c.wav bit
@@ -1569,4 +1641,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 48 bit_error testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_sw_48-48_FER5.tst
 
+// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, STEREO out, FER at 10%
+../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_3ISM_2OA48c.wav bit
+eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
+../IVAS_dec STEREO 32 bit_error testv/stvOSBA_3ISM_2OA48c.wav_STEREO_sw_48-32_FER10.tst
+
+// OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out
+../IVAS_cod -ism_sba 1 -1 testv/stvISM1.csv 256000 48 testv/stvOSBA_1ISM_FOA48c.wav bit
+../IVAS_dec BINAURAL 48 bit testv/stvOSBA_1ISM_pFOA48c.wav_BINAURAL_256000_48-48.tst
+
+// OSBA planar FOA 2ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out
+../IVAS_cod -ism_sba 2 -1 testv/stvISM1.csv testv/stvISM2.csv 512000 48 testv/stvOSBA_2ISM_FOA48c.wav bit
+../IVAS_dec BINAURAL 48 bit testv/stvOSBA_2ISM_pFOA48c.wav_BINAURAL_512000_48-48.tst
 
+// OSBA planar 3OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out
+../IVAS_cod -ism_sba 4 -3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_3OA48c.wav bit
+../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_p3OA48c.wav_BINAURAL_512000_48-48.tst
diff --git a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
index af6d9cb86e..0614651653 100644
--- a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
+++ b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
@@ -139,8 +139,8 @@ def test_masa_enc_dec(
     check_and_makedir(out_dir_dec_output_dut)
 
     # To avoid conflicting names in case of parallel test execution, differentiate all cases
-    output_bitstream_ref = f"{out_dir_bs_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.192"
-    output_bitstream_dut = f"{out_dir_bs_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.192"
+    output_bitstream_ref = f"{out_dir_bs_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.bts"
+    output_bitstream_dut = f"{out_dir_bs_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.bts"
     dec_output_ref = f"{out_dir_dec_output_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.wav"
     dec_output_dut = f"{out_dir_dec_output_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.wav"
     if output_mode == "EXT":
diff --git a/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py b/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
index 528f6b5d2f..422f87d9c7 100644
--- a/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
+++ b/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
@@ -157,14 +157,14 @@ def sba_dec_plc(
     check_and_makedir(ref_out_dir)
 
     plc_file = f"{test_vector_path}/{plc_pattern}.g192"
-    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}.192"
-    ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_dutenc.192"
+    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}.pkt"
+    ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_dutenc.pkt"
     if SID == 1:
-        ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_cut.192"
-        ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_dutenc_cut.192"
+        ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_cut.pkt"
+        ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_dutenc_cut.pkt"
 
-    dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.wav"
-    ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.wav"
+    dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.raw"
+    ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.raw"
 
     output_config = "FOA"
     if ref_decoder_path:
diff --git a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
index a75c1ed7e9..3e84e6b283 100644
--- a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+++ b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
@@ -85,6 +85,72 @@ def check_and_makedir(dir_path):
                 raise  # raises the error again
 
 
+@pytest.mark.create_ref
+@pytest.mark.parametrize("tag", tag_list)
+@pytest.mark.parametrize("fs", sample_rate_list)
+def test_pca_enc(
+    dut_encoder_frontend: EncoderFrontend,
+    dut_decoder_frontend: DecoderFrontend,
+    test_vector_path,
+    reference_path,
+    dut_base_path,
+    ref_encoder_frontend,
+    ref_decoder_frontend,
+    update_ref,
+    keep_files,
+    tag,
+    fs,
+    get_mld,
+):
+    pca = True
+    tag = tag + fs + "c"
+    ivas_br = "256000"
+    dtx = "0"
+    max_bw = "FB"
+    gain_flag = -1
+    sba_order = "+1"
+    output_config = "FOA"
+
+    # enc
+    sba_enc(
+        dut_encoder_frontend,
+        test_vector_path,
+        ref_encoder_frontend,
+        reference_path,
+        dut_base_path,
+        None,
+        tag,
+        fs,
+        ivas_br,
+        dtx,
+        None,
+        max_bw,
+        sba_order,
+        update_ref,
+        gain_flag,
+        cut_testv=True,
+        pca=pca,
+    )
+
+    # dec
+    sba_dec(
+        dut_decoder_frontend,
+        ref_decoder_frontend,
+        reference_path,
+        dut_base_path,
+        tag,
+        fs,
+        ivas_br,
+        dtx,
+        None,
+        max_bw,
+        output_config,
+        update_ref,
+        gain_flag,
+        keep_files,
+        get_mld=get_mld,
+        pca=pca,
+    )
 
 
 @pytest.mark.create_ref
@@ -438,14 +504,14 @@ def sba_enc(
         long_tag_ext += f"_Gain{gain_flag}"
     if SID == 1:
         long_tag_ext += f"_SID"
-    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.192"
-    ref_pkt_file = f"{ref_out_dir}/{tag_out}{short_tag_ext}.192"
-    ref_pkt_file_dutenc = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc.192"
+    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.pkt"
+    ref_pkt_file = f"{ref_out_dir}/{tag_out}{short_tag_ext}.pkt"
+    ref_pkt_file_dutenc = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc.pkt"
     if SID == 1:
-        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{long_tag_ext}_cut.192"
-        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_cut.192"
+        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{long_tag_ext}_cut.pkt"
+        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_cut.pkt"
         ref_pkt_file_dutenc_cut = (
-            f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc_cut.192"
+            f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc_cut.pkt"
         )
     input_path = f"{test_vector_path}/{tag_in}{in_extension}"
     dtx_mode = dtx == "1"
@@ -518,13 +584,13 @@ def sba_enc(
             with open(ref_pkt_file_dutenc, "rb") as fp_in:
                 with open(ref_pkt_file_dutenc_cut, "wb") as fp_out:
                     fr_cnt, cut_cnt = cut_from_start(fp_in, fp_out, 0, True)
-            #os.remove(ref_pkt_file)
-            #os.remove(ref_pkt_file_dutenc)
+            os.remove(ref_pkt_file)
+            os.remove(ref_pkt_file_dutenc)
         if update_ref == 0:
             with open(dut_pkt_file, "rb") as fp_in:
                 with open(dut_pkt_file_cut, "wb") as fp_out:
                     fr_cnt, cut_cnt = cut_from_start(fp_in, fp_out, 0, True)
-            #os.remove(dut_pkt_file)
+            os.remove(dut_pkt_file)
 
 
 def sba_dec(
@@ -569,11 +635,11 @@ def sba_dec(
     dut_out_dir = f"{dut_base_path}/sba_bs/raw"
     ref_out_dir = f"{reference_path}/sba_bs/raw"
 
-    dut_in_pkt = f"{dut_base_path}/sba_bs/pkt/{tag_out}{long_tag_ext}.192"
-    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}.192"
+    dut_in_pkt = f"{dut_base_path}/sba_bs/pkt/{tag_out}{long_tag_ext}.pkt"
+    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}.pkt"
 
-    dut_out_raw = f"{dut_out_dir}/{tag_out}{long_tag_ext}.wav"
-    ref_out_raw = f"{ref_out_dir}/{tag_out}{short_tag_ext}.wav"
+    dut_out_raw = f"{dut_out_dir}/{tag_out}{long_tag_ext}.raw"
+    ref_out_raw = f"{ref_out_dir}/{tag_out}{short_tag_ext}.raw"
 
     check_and_makedir(dut_out_dir)
     check_and_makedir(ref_out_dir)
@@ -602,3 +668,7 @@ def sba_dec(
         # report compare result
         assert cmp_result == 0, reason
 
+        # remove DUT output files when test result is OK (to save disk space)
+        if not keep_files:
+            os.remove(dut_in_pkt)
+            os.remove(dut_out_raw)
diff --git a/tests/conftest.py b/tests/conftest.py
index a542b12ff1..5f7ed04a82 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -255,7 +255,7 @@ class EncoderFrontend:
             command.extend(["-max_band", max_band])
 
         if pca:
-            command.extend(["-bypass 2"])
+            command.extend(["-pca"])
 
         if quiet_mode:
             command.extend(["-q"])
@@ -435,7 +435,7 @@ class DecoderFrontend:
         
             eid_command = [eid_path]
             eid_command.extend(["-fer", "-vbr", "-bs", "g192", "-ep", "g192"])
-            eid_output_suffix = "." + os.path.basename(plc_file) + ".fer"
+            eid_output_suffix = "." + next(tempfile._get_candidate_names()) + ".fer"
             eid_command += [
                 str(input_bitstream_path),
                 str(plc_file),
diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py
index 09fc0d74bb..056242bd3c 100644
--- a/tests/renderer/constants.py
+++ b/tests/renderer/constants.py
@@ -192,7 +192,7 @@ FORMAT_TO_METADATA_FILES = {
 INPUT_FORMATS_AMBI = ["FOA", "HOA2", "HOA3"]
 INPUT_FORMATS_MC = ["MONO", "STEREO", "5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]
 INPUT_FORMATS_ISM = ["ISM1", "ISM2", "ISM3", "ISM4"]
-INPUT_FORMATS_MASA = ["MASA2"]
+INPUT_FORMATS_MASA = ["MASA1", "MASA2"]
 
 """ Non binaural / parametric output formats """
 OUTPUT_FORMATS = [
diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py
index e481818045..1ddba22695 100644
--- a/tests/renderer/test_renderer.py
+++ b/tests/renderer/test_renderer.py
@@ -55,6 +55,32 @@ def test_ambisonics(test_info, in_fmt, out_fmt, frame_size):
     )
 
 
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_ambisonics_binaural_static(test_info, in_fmt, out_fmt, frame_size):
+    run_renderer(
+        test_info,
+        in_fmt,
+        out_fmt,
+        frame_size=frame_size,
+    )
+
+
+@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_ambisonics_binaural_headrotation(
+    test_info, in_fmt, out_fmt, trj_file, frame_size
+):
+    run_renderer(
+        test_info,
+        in_fmt,
+        out_fmt,
+        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+        frame_size=frame_size,
+    )
 
 
 """ Multichannel """
@@ -72,6 +98,38 @@ def test_multichannel(test_info, in_fmt, out_fmt, frame_size):
     )
 
 
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_multichannel_binaural_static(test_info, in_fmt, out_fmt, frame_size):
+    if in_fmt in ["MONO", "STEREO"]:
+        pytest.skip("MONO or STEREO to Binaural rendering unsupported")
+
+    run_renderer(
+        test_info,
+        in_fmt,
+        out_fmt,
+        frame_size=frame_size,
+    )
+
+
+@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_multichannel_binaural_headrotation(
+    test_info, in_fmt, out_fmt, trj_file, frame_size
+):
+    if in_fmt in ["MONO", "STEREO"]:
+        pytest.skip("MONO or STEREO to Binaural rendering unsupported")
+
+    run_renderer(
+        test_info,
+        in_fmt,
+        out_fmt,
+        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+        frame_size=frame_size,
+    )
 
 
 """ ISM """
@@ -90,6 +148,42 @@ def test_ism(test_info, in_fmt, out_fmt, frame_size):
     )
 
 
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_ism_binaural_static(test_info, in_fmt, out_fmt, frame_size):
+    try:
+        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]
+    except KeyError:
+        in_meta_files = None
+
+    run_renderer(
+        test_info,
+        in_fmt,
+        out_fmt,
+        in_meta_files=in_meta_files,
+        frame_size=frame_size,
+    )
+
+
+@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file, frame_size):
+    try:
+        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]
+    except KeyError:
+        in_meta_files = None
+
+    run_renderer(
+        test_info,
+        in_fmt,
+        out_fmt,
+        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+        in_meta_files=in_meta_files,
+        frame_size=frame_size,
+    )
 
 
 """ MASA """
@@ -108,8 +202,48 @@ def test_masa(test_info, in_fmt, out_fmt, frame_size):
     )
 
 
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_masa_binaural_static(test_info, in_fmt, out_fmt, frame_size):
+    if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]:
+        pytest.skip("Skipping binaural room outputs for MASA as unimplemented.")
+
+    run_renderer(
+        test_info,
+        in_fmt,
+        out_fmt,
+        in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],
+        frame_size=frame_size,
+    )
+
+
+@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_masa_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file, frame_size):
+    if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]:
+        pytest.skip("Skipping binaural room outputs for MASA as unimplemented.")
+
+    run_renderer(
+        test_info,
+        in_fmt,
+        out_fmt,
+        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+        in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],
+        frame_size=frame_size,
+    )
 
 
+@pytest.mark.parametrize("in_fmt", METADATA_SCENES_TO_TEST_MASA_PREREND)
+def test_masa_prerend(test_info, in_fmt):
+    run_renderer(
+        test_info,
+        "META",
+        "MASA2",
+        metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}.txt"),
+    )
 
 
 """ Custom loudspeaker layouts """
@@ -147,6 +281,32 @@ def test_custom_ls_input_output(test_info, in_fmt, out_fmt):
     )
 
 
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_custom_ls_input_binaural(test_info, in_layout, out_fmt, frame_size):
+    run_renderer(
+        test_info,
+        CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),
+        out_fmt,
+        frame_size=frame_size,
+    )
+
+
+@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST)
+@pytest.mark.parametrize("frame_size", FRAMING_TO_TEST)
+def test_custom_ls_input_binaural_headrotation(
+    test_info, in_layout, out_fmt, trj_file, frame_size
+):
+    run_renderer(
+        test_info,
+        CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),
+        out_fmt,
+        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+        frame_size=frame_size,
+    )
 
 
 """ Metadata / scene description input """
diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py
index e4ab74683b..5f724e16de 100644
--- a/tests/renderer/utils.py
+++ b/tests/renderer/utils.py
@@ -184,7 +184,7 @@ def run_renderer(
         cmd[5:5] = ["-im", *in_meta_files]
 
     if trj_file is not None:
-        cmd.extend(["-tf", str(trj_file)])
+        cmd.extend(["-T", str(trj_file)])
 
     if non_diegetic_pan is not None:
         cmd.extend(["-non_diegetic_pan", str(non_diegetic_pan)])
@@ -203,6 +203,8 @@ def run_renderer(
     if config_file is not None:
         cmd.extend(["-render_config", str(config_file)])
 
+    if frame_size:
+        cmd.extend(["-fr", str(frame_size.replace("ms", ""))])
 
     # Set env variables for UBSAN
     env = os.environ.copy()
-- 
GitLab


From 4f658bde6a8fcb1f77232ea2f5d2f284604b9562 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 14:16:44 +0100
Subject: [PATCH 101/163] Fixes

---
 conformance-test/test_26252.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index c0b8795e68..1c148bcc72 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -82,8 +82,8 @@ for s in scripts:
             if line.startswith("$CUT_REND_BIN"):
                 rend_opts = line                
             if line.startswith("$DIFF_BIN"):
-                diff_opts = line[9:]
-                tag = s + "--" + diff_opts.split()[1].split('/')[-1]
+                diff_opts = line
+                tag = s + "--" + diff_opts.split()[2].split('/')[-1]
                 if tag in test_dict:
                     print("non-unique tag found - ignoring new entry")
                     continue                
@@ -115,7 +115,7 @@ def test_26252(test_tag, encoder_path, decoder_path, renderer_path):
     diff_opts = replace_paths(diff_opts, testv_path, ref_path, cut_path)
     result = True
     for cmd in diff_opts.split(';'):
-        result = result and filecmp.cmp(cmd.split()[0], cmd.split()[1])
+        result = result and filecmp.cmp(cmd.split()[1], cmd.split()[2])
     if not result:
         assert False, "Output differs" 
 
-- 
GitLab


From 09659a8c6ed70432059326ee7516ed05a33a2c7d Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 15:16:31 +0100
Subject: [PATCH 102/163] Fixes in parse_commands.py

---
 .gitlab-ci.yml                 |  3 ++-
 conformance-test/test_26252.py |  2 +-
 parse_commands.py              | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4dc8510015..d358f707e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1288,7 +1288,7 @@ ivas-conformance:
     - cp -r tests/renderer/data testvec/testv/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
-    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_jbm.txt testvec
+    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
     
     # Test run generated scripts in testvec
@@ -1311,6 +1311,7 @@ ivas-conformance:
       - Readme_IVAS_dec.txt  
       - Readme_IVAS_enc.txt  
       - Readme_IVAS_rend.txt
+      - Readme_IVAS_JBM_dec.txt
     expose_as: "Draft IVAS conformance"
     reports:
       junit: report-junit.xml
diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index 1c148bcc72..9e22ddf0a9 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -53,7 +53,7 @@ def replace_paths(instr, testv_path, ref_path, cut_path):
 
 test_dict = {}
 TEST_DIR = "."
-scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt", "Readme_IVAS_jbm.txt"]
+scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt", "Readme_IVAS_JBM_dec.txt"]
 
 for s in scripts:
     with open(os.path.join(TEST_DIR, s), "r", encoding="UTF-8") as fp:
diff --git a/parse_commands.py b/parse_commands.py
index 4defd5faf4..fe3d165c1a 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -57,25 +57,25 @@ if __name__ == '__main__':
         with open('script_footer.txt','r') as footer:
             outfile.write(footer.read())                        
 
-    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_jbm.'),'w', newline='\n') as outfile_jbm:
+    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_JBM_dec.'),'w', newline='\n') as outfile_jbm:
         with open('dec_header.txt','r') as header:
             outfile_dec.write(header.read())
         with open('jbm_header.txt','r') as header:            
             outfile_jbm.write(header.read())
         for cmd in cmds_dec:
-            absolute_out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
+            absolute_out = re.search(r"\s(([\S]+)(.wav))$", cmd)
             arg1 = cmd.split()[0]
             root_folder = arg1[0:arg1.find("ivas-codec/")+10]
             cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
             cmd = cmd.replace(r'\\', '/')
+            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
+            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths            
             inputs = cmd.count(root_folder) - 1
             if ".fer " in cmd:
                 cmd = cmd.replace(root_folder + r'/tests/ref', REF_PATH + r'ref', 1)
             else:
                 cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
-            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths
             
             if 'VOIP' in cmd:
                 outfile = outfile_jbm
@@ -84,14 +84,14 @@ if __name__ == '__main__':
             
             if not "pca" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd:            
                 outfile.write(cmd+'\n')
-                out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
+                out = re.search(r"\s(([\S]+)(.wav))$", cmd)
                 if out:
                     diff_cmds=[]
                     for output in glob.glob(absolute_out.group(1) + '*'):
                         output = output.replace(root_folder + r'/tests/', CUT_PATH)
                         diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+output+' >> $LOG_FILE 2>&1')
                     outfile.write(('; ').join(diff_cmds))
-                outfile.write('\n')
+                outfile.write('\n\n')
         with open('script_footer.txt','r') as footer:
             outfile_dec.write(footer.read())    
             footer.seek(0)
-- 
GitLab


From 98ecfc53f1f1bddbacaa35003cab1a49a40460e7 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 20:22:45 +0100
Subject: [PATCH 103/163] Use os.remove/os.mkdirs instead of bash rm/mkdir

---
 conformance-test/test_26252.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index 9e22ddf0a9..3e6a30ff1e 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -95,7 +95,13 @@ for s in scripts:
                 diff_opts  = ""
         for proc in preproc:
             proc = replace_paths(proc, testv_path, ref_path, cut_path)
-            subprocess.run(proc.split())
+            if 'rm' in proc:
+                path = proc.split()[-1]
+                if os.path.exists(path): os.remove(path)
+            if 'mkdir' in proc:
+                path = proc.split()[-1]
+                os.mkdirs(path)
+                
 
 @pytest.mark.parametrize("test_tag", list(test_dict.keys()))
 def test_26252(test_tag, encoder_path, decoder_path, renderer_path):
-- 
GitLab


From 3ffdb45020fefc8db630126c16088490624a2953 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 20:29:53 +0100
Subject: [PATCH 104/163] Use os.remove/os.makedirs instead of bash rm/mkdir

---
 conformance-test/test_26252.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index 3e6a30ff1e..4c6549186d 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -100,7 +100,7 @@ for s in scripts:
                 if os.path.exists(path): os.remove(path)
             if 'mkdir' in proc:
                 path = proc.split()[-1]
-                os.mkdirs(path)
+                os.makedirs(path)
                 
 
 @pytest.mark.parametrize("test_tag", list(test_dict.keys()))
-- 
GitLab


From 8a3767a411a492c04bf9af8bd041d8e95b10ef23 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 26 Jan 2024 20:40:32 +0100
Subject: [PATCH 105/163] Fix

---
 conformance-test/test_26252.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index 4c6549186d..dffe565ebf 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -33,6 +33,7 @@ Execute tests specified via a parameter file.
 """
 
 import os
+import shutil
 from pathlib import Path
 import filecmp
 import subprocess
@@ -97,7 +98,7 @@ for s in scripts:
             proc = replace_paths(proc, testv_path, ref_path, cut_path)
             if 'rm' in proc:
                 path = proc.split()[-1]
-                if os.path.exists(path): os.remove(path)
+                if os.path.exists(path): shutil.rmtree(path)
             if 'mkdir' in proc:
                 path = proc.split()[-1]
                 os.makedirs(path)
-- 
GitLab


From 31d4ac312ea7d0df5fcac7c323bc75f7d40732bb Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Fri, 26 Jan 2024 19:50:11 +0000
Subject: [PATCH 106/163] Revert "Fixes in parse_commands.py"

This reverts commit 09659a8c6ed70432059326ee7516ed05a33a2c7d
---
 .gitlab-ci.yml                 |  3 +--
 conformance-test/test_26252.py |  2 +-
 parse_commands.py              | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d358f707e5..4dc8510015 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1288,7 +1288,7 @@ ivas-conformance:
     - cp -r tests/renderer/data testvec/testv/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
-    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
+    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_jbm.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
     
     # Test run generated scripts in testvec
@@ -1311,7 +1311,6 @@ ivas-conformance:
       - Readme_IVAS_dec.txt  
       - Readme_IVAS_enc.txt  
       - Readme_IVAS_rend.txt
-      - Readme_IVAS_JBM_dec.txt
     expose_as: "Draft IVAS conformance"
     reports:
       junit: report-junit.xml
diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index dffe565ebf..47c3e10b4c 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -54,7 +54,7 @@ def replace_paths(instr, testv_path, ref_path, cut_path):
 
 test_dict = {}
 TEST_DIR = "."
-scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt", "Readme_IVAS_JBM_dec.txt"]
+scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt", "Readme_IVAS_jbm.txt"]
 
 for s in scripts:
     with open(os.path.join(TEST_DIR, s), "r", encoding="UTF-8") as fp:
diff --git a/parse_commands.py b/parse_commands.py
index fe3d165c1a..4defd5faf4 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -57,25 +57,25 @@ if __name__ == '__main__':
         with open('script_footer.txt','r') as footer:
             outfile.write(footer.read())                        
 
-    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_JBM_dec.'),'w', newline='\n') as outfile_jbm:
+    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_jbm.'),'w', newline='\n') as outfile_jbm:
         with open('dec_header.txt','r') as header:
             outfile_dec.write(header.read())
         with open('jbm_header.txt','r') as header:            
             outfile_jbm.write(header.read())
         for cmd in cmds_dec:
-            absolute_out = re.search(r"\s(([\S]+)(.wav))$", cmd)
+            absolute_out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
             arg1 = cmd.split()[0]
             root_folder = arg1[0:arg1.find("ivas-codec/")+10]
             cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
             cmd = cmd.replace(r'\\', '/')
-            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths            
             inputs = cmd.count(root_folder) - 1
             if ".fer " in cmd:
                 cmd = cmd.replace(root_folder + r'/tests/ref', REF_PATH + r'ref', 1)
             else:
                 cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
+            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
+            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths
             
             if 'VOIP' in cmd:
                 outfile = outfile_jbm
@@ -84,14 +84,14 @@ if __name__ == '__main__':
             
             if not "pca" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd:            
                 outfile.write(cmd+'\n')
-                out = re.search(r"\s(([\S]+)(.wav))$", cmd)
+                out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
                 if out:
                     diff_cmds=[]
                     for output in glob.glob(absolute_out.group(1) + '*'):
                         output = output.replace(root_folder + r'/tests/', CUT_PATH)
                         diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+output+' >> $LOG_FILE 2>&1')
                     outfile.write(('; ').join(diff_cmds))
-                outfile.write('\n\n')
+                outfile.write('\n')
         with open('script_footer.txt','r') as footer:
             outfile_dec.write(footer.read())    
             footer.seek(0)
-- 
GitLab


From 2a5ffa69a7c7e1c0010a74a236becce72b0f9a82 Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Fri, 26 Jan 2024 19:54:00 +0000
Subject: [PATCH 107/163] Add report for first pytest reference creation.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4dc8510015..5bad7bb4c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1267,7 +1267,7 @@ ivas-conformance:
     - non_be_flag=0
     - exit_code=0
     - python3 tests/create_short_testvectors.py
-    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref --html=report1.html --self-contained-html  || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
     - python3 -m pytest tests/renderer/test_renderer.py --create_ref || exit_code=$?
 
@@ -1306,6 +1306,7 @@ ivas-conformance:
     when: always
     paths:
       - report-junit.xml
+      - report1.html
       - report_cmd.html
       - report.html
       - Readme_IVAS_dec.txt  
-- 
GitLab


From 55be30e053be87afd6a51dd1307413a39e07e2c5 Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Fri, 26 Jan 2024 20:08:34 +0000
Subject: [PATCH 108/163] Revert "Revert "Fixes in parse_commands.py""

This reverts commit 31d4ac312ea7d0df5fcac7c323bc75f7d40732bb
---
 .gitlab-ci.yml                 |  3 ++-
 conformance-test/test_26252.py |  2 +-
 parse_commands.py              | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bad7bb4c5..6863d34e18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1288,7 +1288,7 @@ ivas-conformance:
     - cp -r tests/renderer/data testvec/testv/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
-    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_jbm.txt testvec
+    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
     
     # Test run generated scripts in testvec
@@ -1312,6 +1312,7 @@ ivas-conformance:
       - Readme_IVAS_dec.txt  
       - Readme_IVAS_enc.txt  
       - Readme_IVAS_rend.txt
+      - Readme_IVAS_JBM_dec.txt
     expose_as: "Draft IVAS conformance"
     reports:
       junit: report-junit.xml
diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index 47c3e10b4c..dffe565ebf 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -54,7 +54,7 @@ def replace_paths(instr, testv_path, ref_path, cut_path):
 
 test_dict = {}
 TEST_DIR = "."
-scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt", "Readme_IVAS_jbm.txt"]
+scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt", "Readme_IVAS_JBM_dec.txt"]
 
 for s in scripts:
     with open(os.path.join(TEST_DIR, s), "r", encoding="UTF-8") as fp:
diff --git a/parse_commands.py b/parse_commands.py
index 4defd5faf4..fe3d165c1a 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -57,25 +57,25 @@ if __name__ == '__main__':
         with open('script_footer.txt','r') as footer:
             outfile.write(footer.read())                        
 
-    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_jbm.'),'w', newline='\n') as outfile_jbm:
+    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_JBM_dec.'),'w', newline='\n') as outfile_jbm:
         with open('dec_header.txt','r') as header:
             outfile_dec.write(header.read())
         with open('jbm_header.txt','r') as header:            
             outfile_jbm.write(header.read())
         for cmd in cmds_dec:
-            absolute_out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
+            absolute_out = re.search(r"\s(([\S]+)(.wav))$", cmd)
             arg1 = cmd.split()[0]
             root_folder = arg1[0:arg1.find("ivas-codec/")+10]
             cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
             cmd = cmd.replace(r'\\', '/')
+            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
+            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths            
             inputs = cmd.count(root_folder) - 1
             if ".fer " in cmd:
                 cmd = cmd.replace(root_folder + r'/tests/ref', REF_PATH + r'ref', 1)
             else:
                 cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
-            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths
             
             if 'VOIP' in cmd:
                 outfile = outfile_jbm
@@ -84,14 +84,14 @@ if __name__ == '__main__':
             
             if not "pca" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd:            
                 outfile.write(cmd+'\n')
-                out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)
+                out = re.search(r"\s(([\S]+)(.wav))$", cmd)
                 if out:
                     diff_cmds=[]
                     for output in glob.glob(absolute_out.group(1) + '*'):
                         output = output.replace(root_folder + r'/tests/', CUT_PATH)
                         diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+output+' >> $LOG_FILE 2>&1')
                     outfile.write(('; ').join(diff_cmds))
-                outfile.write('\n')
+                outfile.write('\n\n')
         with open('script_footer.txt','r') as footer:
             outfile_dec.write(footer.read())    
             footer.seek(0)
-- 
GitLab


From bb1b122a68df5b2a399bdd6aa5e8212d03f772b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20Toftg=C3=A5rd?= <tomas.toftgard@ericsson.com>
Date: Fri, 26 Jan 2024 21:17:27 +0100
Subject: [PATCH 109/163] Revert 98ecfc53

---
 conformance-test/test_26252.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index dffe565ebf..88e90b1c97 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -96,13 +96,7 @@ for s in scripts:
                 diff_opts  = ""
         for proc in preproc:
             proc = replace_paths(proc, testv_path, ref_path, cut_path)
-            if 'rm' in proc:
-                path = proc.split()[-1]
-                if os.path.exists(path): shutil.rmtree(path)
-            if 'mkdir' in proc:
-                path = proc.split()[-1]
-                os.makedirs(path)
-                
+            subprocess.run(proc.split())
 
 @pytest.mark.parametrize("test_tag", list(test_dict.keys()))
 def test_26252(test_tag, encoder_path, decoder_path, renderer_path):
-- 
GitLab


From 74ec28974932b2400d370d2e3205fbe4b19de80f Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Sat, 27 Jan 2024 00:33:23 +0000
Subject: [PATCH 110/163] Fix for testv_file parsing for linux

---
 tests/codec_be_on_mr_nonselection/test_param_file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/codec_be_on_mr_nonselection/test_param_file.py b/tests/codec_be_on_mr_nonselection/test_param_file.py
index 1dfda043d7..2a796488f7 100644
--- a/tests/codec_be_on_mr_nonselection/test_param_file.py
+++ b/tests/codec_be_on_mr_nonselection/test_param_file.py
@@ -163,7 +163,7 @@ def test_param_file_tests(
         not bitrate.isdigit()
         and "-dtx" in enc_split
         and "-sba" in enc_split
-        and testv_file.split("/")[1].startswith("stv")
+        and testv_file.split("/")[test_vector_path.count("/")+1].startswith("stv")
     ):
         sba_br_switching_dtx = 1
         cut_file = pre_proc_input(testv_file, fs)
-- 
GitLab


From 29179c1c03f3600bec67bf96761c5ce5d83d7655 Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Sat, 27 Jan 2024 00:59:30 +0000
Subject: [PATCH 111/163] Disable removal of files also for test_param_file.py

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6863d34e18..9b9ba87804 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1245,6 +1245,7 @@ ivas-conformance:
     - sed -i '88,153d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
     # Disable removal of output bitstreams
     - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+    - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_param_file.py
     - sed -i '605,608d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
     # Remove binaural renderer tests
     - sed -i '276,301d' tests/renderer/test_renderer.py
-- 
GitLab


From 3d38635e34df5219a9bf3c3072554050188a6c7b Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Sat, 27 Jan 2024 02:18:33 +0000
Subject: [PATCH 112/163] Update os.remove code

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b9ba87804..9980b981f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1245,7 +1245,7 @@ ivas-conformance:
     - sed -i '88,153d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
     # Disable removal of output bitstreams
     - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
-    - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_param_file.py
+    - sed -i 's/os.remove/#os.remove print()/g' tests/codec_be_on_mr_nonselection/test_param_file.py
     - sed -i '605,608d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
     # Remove binaural renderer tests
     - sed -i '276,301d' tests/renderer/test_renderer.py
-- 
GitLab


From cc69760ba1b06f58481ea350fc23ca6768e796ab Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Sat, 27 Jan 2024 02:25:10 +0000
Subject: [PATCH 113/163] Change sed for os.remove

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9980b981f7..0e5bc3f00c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1245,7 +1245,7 @@ ivas-conformance:
     - sed -i '88,153d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
     # Disable removal of output bitstreams
     - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
-    - sed -i 's/os.remove/#os.remove print()/g' tests/codec_be_on_mr_nonselection/test_param_file.py
+    - sed -i 's/os.remove/print()#os.remove/g' tests/codec_be_on_mr_nonselection/test_param_file.py
     - sed -i '605,608d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
     # Remove binaural renderer tests
     - sed -i '276,301d' tests/renderer/test_renderer.py
-- 
GitLab


From c5879a977f60b08fe140dd33a710a3a4bf36875c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Sat, 27 Jan 2024 10:17:11 +0100
Subject: [PATCH 114/163] New attempt: remove rm/mkdir

---
 conformance-test/test_26252.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index 88e90b1c97..ea69261a0c 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -96,7 +96,12 @@ for s in scripts:
                 diff_opts  = ""
         for proc in preproc:
             proc = replace_paths(proc, testv_path, ref_path, cut_path)
-            subprocess.run(proc.split())
+            path_arg = proc.split()[-1]
+            if "rm" in proc:
+                if os.path.exists(path_arg)
+                    shutil.rmtree(path_arg)
+            if "mkdir" in proc:
+                Path(path_arg).mkdir(parents=True, exist_ok=True)
 
 @pytest.mark.parametrize("test_tag", list(test_dict.keys()))
 def test_26252(test_tag, encoder_path, decoder_path, renderer_path):
-- 
GitLab


From e27248624ac79bc8591eeba26847f7d5a8068f93 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Sat, 27 Jan 2024 10:22:46 +0100
Subject: [PATCH 115/163] Fix syntax error. Remove set -e from test scripts

---
 conformance-test/test_26252.py | 2 +-
 dec_header.txt                 | 1 -
 enc_header.txt                 | 1 -
 jbm_header.txt                 | 1 -
 rend_header.txt                | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index ea69261a0c..b620f15209 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -98,7 +98,7 @@ for s in scripts:
             proc = replace_paths(proc, testv_path, ref_path, cut_path)
             path_arg = proc.split()[-1]
             if "rm" in proc:
-                if os.path.exists(path_arg)
+                if os.path.exists(path_arg):
                     shutil.rmtree(path_arg)
             if "mkdir" in proc:
                 Path(path_arg).mkdir(parents=True, exist_ok=True)
diff --git a/dec_header.txt b/dec_header.txt
index 6d7efe2d83..110d7429a7 100644
--- a/dec_header.txt
+++ b/dec_header.txt
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 if [ "$#" -ne 1 ]; then
     echo "Usage: $0 <CUT_DEC_BIN>"
diff --git a/enc_header.txt b/enc_header.txt
index fba31ea826..4f193b17c8 100644
--- a/enc_header.txt
+++ b/enc_header.txt
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 if [ "$#" -ne 1 ]; then
     echo "Usage: $0 <CUT_ENC_BIN>"
diff --git a/jbm_header.txt b/jbm_header.txt
index 466c82c654..e1c0168434 100644
--- a/jbm_header.txt
+++ b/jbm_header.txt
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 if [ "$#" -ne 1 ]; then
     echo "Usage: $0 <CUT_DEC_BIN>"
diff --git a/rend_header.txt b/rend_header.txt
index f95fb2e534..4088ff0101 100644
--- a/rend_header.txt
+++ b/rend_header.txt
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -e
 
 if [ "$#" -ne 1 ]; then
     echo "Usage: $0 <CUT_REND_BIN>"
-- 
GitLab


From fec68d5cd41c4bc31ab34c5c7bcc9ab7e0d9996b Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Sat, 27 Jan 2024 10:44:41 +0100
Subject: [PATCH 116/163] Fix rend_header.txt

---
 rend_header.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rend_header.txt b/rend_header.txt
index 4088ff0101..f6fe7cbe02 100644
--- a/rend_header.txt
+++ b/rend_header.txt
@@ -14,6 +14,7 @@ CUT_PATH="./TMP_REND"
 LOG_FILE=Readme_IVAS_rend_log.txt
 
 rm -rf $CUT_PATH
-mkdir -p $CUT_PATH/renderer/cut $CUT_PATH/renderer/data
+mkdir -p $CUT_PATH/renderer/cut 
+mkdir -p $CUT_PATH/renderer/data
 
 
-- 
GitLab


From 7047e552b12a4c1e342cf43f86572913002c3105 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Sat, 27 Jan 2024 11:08:26 +0100
Subject: [PATCH 117/163] Fixes for file removal on Windows

---
 conformance-test/test_26252.py | 7 ++++++-
 dec_header.txt                 | 1 +
 enc_header.txt                 | 1 +
 jbm_header.txt                 | 1 +
 rend_header.txt                | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/conformance-test/test_26252.py b/conformance-test/test_26252.py
index b620f15209..d8796b5ae7 100644
--- a/conformance-test/test_26252.py
+++ b/conformance-test/test_26252.py
@@ -34,11 +34,16 @@ Execute tests specified via a parameter file.
 
 import os
 import shutil
+import stat
 from pathlib import Path
 import filecmp
 import subprocess
 import pytest
 
+def remove_readonly(func, path, excinfo):
+    os.chmod(path, stat.S_IWRITE)
+    func(path)
+
 def replace_paths(instr, testv_path, ref_path, cut_path):  
     outstr = instr
     tmp = testv_path.split('=')
@@ -99,7 +104,7 @@ for s in scripts:
             path_arg = proc.split()[-1]
             if "rm" in proc:
                 if os.path.exists(path_arg):
-                    shutil.rmtree(path_arg)
+                    shutil.rmtree(path_arg, onerror=remove_readonly) # Needed for folder tree removal on Windows.
             if "mkdir" in proc:
                 Path(path_arg).mkdir(parents=True, exist_ok=True)
 
diff --git a/dec_header.txt b/dec_header.txt
index 110d7429a7..599c7e73ed 100644
--- a/dec_header.txt
+++ b/dec_header.txt
@@ -13,6 +13,7 @@ REF_PATH="./testv"
 CUT_PATH="./TMP_DEC"
 LOG_FILE=Readme_IVAS_dec_log.txt
 
+rm -rf tmp
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH
 mkdir -p $CUT_PATH/dut/masa_test/dec_output
diff --git a/enc_header.txt b/enc_header.txt
index 4f193b17c8..18387a9326 100644
--- a/enc_header.txt
+++ b/enc_header.txt
@@ -13,6 +13,7 @@ REF_PATH="./testv"
 CUT_PATH="./TMP_ENC"
 LOG_FILE=Readme_IVAS_enc_log.txt
 
+rm -rf tmp
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH
 mkdir -p $CUT_PATH/dut/masa_test/bitstreams
diff --git a/jbm_header.txt b/jbm_header.txt
index e1c0168434..d244c83b3f 100644
--- a/jbm_header.txt
+++ b/jbm_header.txt
@@ -13,6 +13,7 @@ REF_PATH="./testv"
 CUT_PATH="./TMP_JBM"
 LOG_FILE=Readme_IVAS_jbm_log.txt
 
+rm -rf tmp
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH
 mkdir -p $CUT_PATH/dut/masa_test/dec_output
diff --git a/rend_header.txt b/rend_header.txt
index f6fe7cbe02..c56eb17cb0 100644
--- a/rend_header.txt
+++ b/rend_header.txt
@@ -13,6 +13,7 @@ REF_PATH="./testv"
 CUT_PATH="./TMP_REND"
 LOG_FILE=Readme_IVAS_rend_log.txt
 
+rm -rf tmp
 rm -rf $CUT_PATH
 mkdir -p $CUT_PATH/renderer/cut 
 mkdir -p $CUT_PATH/renderer/data
-- 
GitLab


From dc5cea9dffe26bf81dbcf3ec0c80679b6a7228ad Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Sat, 27 Jan 2024 21:39:33 +0000
Subject: [PATCH 118/163] Changed version to
 20230817_Final_Upd02_SA4#125_delivery

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e5bc3f00c..3719b74169 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1207,7 +1207,7 @@ ivas-conformance:
     - *print-common-info
     # Prepare reference exec, use tests and scripts from reference
     - source_branch_commit_sha=$(git rev-parse HEAD)
-    - git checkout 20230815_RC02_SA4#125_delivery
+    - git checkout 20230817_Final_Upd02_SA4#125_delivery
     - sed -i".bak" "s/\(#define DEBUGGING\)/\/\/\1/" lib_com/options.h
     - make -j
     - cp IVAS_cod IVAS_cod_ref
-- 
GitLab


From a3f1207c2f7d6fcdc4b376a4ce7525b737004b28 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 11:26:57 +0100
Subject: [PATCH 119/163] Ensure keep_files is used, unify .192 as bitstream
 and .wav as output

---
 .gitlab-ci.yml                                | 51 +------------------
 .../test_masa_enc_dec.py                      |  4 +-
 .../test_param_file.py                        |  2 +-
 .../test_sba_bs_dec_plc.py                    | 12 ++---
 .../test_sba_bs_enc.py                        | 28 +++++-----
 tests/conftest.py                             |  3 +-
 tests/test_param_file_ltv.py                  |  2 +-
 7 files changed, 27 insertions(+), 75 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f92228a64..6bc0513d1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1231,62 +1231,13 @@ ivas-conformance:
     - *print-common-info
     # Prepare reference exec, use tests and scripts from reference
     - source_branch_commit_sha=$(git rev-parse HEAD)
-    - git checkout 20230817_Final_Upd02_SA4#125_delivery
-    - sed -i".bak" "s/\(#define DEBUGGING\)/\/\/\1/" lib_com/options.h
+    - git checkout main # This should be set to a relevant reference
     - make -j
     - cp IVAS_cod IVAS_cod_ref
     - cp IVAS_dec IVAS_dec_ref
     - cp IVAS_rend IVAS_rend_ref
     - git restore .
     - git checkout $source_branch_commit_sha
-
-    # remove unsupported testcases, in reverse row order 
-    - sed -i '1657,1659d' scripts/config/self_test.prm
-    - sed -i '1644,1655d' scripts/config/self_test.prm
-    - sed -i '1623,1625d' scripts/config/self_test.prm
-    - sed -i '1350,1353d' scripts/config/self_test.prm
-    - sed -i '1307,1321d' scripts/config/self_test.prm
-    - sed -i '1205,1213d' scripts/config/self_test.prm
-    - sed -i '849,851d' scripts/config/self_test.prm
-    - sed -i '805,807d' scripts/config/self_test.prm
-    - sed -i '684,686d' scripts/config/self_test.prm
-    - sed -i '524,532d' scripts/config/self_test.prm
-    - sed -i '505,508d' scripts/config/self_test.prm
-    - sed -i '420,422d' scripts/config/self_test.prm
-    - sed -i '377,383d' scripts/config/self_test.prm
-    - sed -i '321,329d' scripts/config/self_test.prm
-    # Remove -fr option
-    - sed -i '206,207d' tests/renderer/utils.py 
-    # Revert to -tf option used in old IVAS_rend
-    - sed -i '187s/-T/-tf/' tests/renderer/utils.py 
-    # Exclude MASA1
-    - sed -i '195s/"MASA1", //' tests/renderer/constants.py 
-    # Change -pca to -bypass 2
-    - sed -i '258s/-pca/-bypass 2/' tests/conftest.py 
-    # Remove tests/renderer/test_renderer::test_masa_prerend
-    - sed -i '239,246d' tests/renderer/test_renderer.py
-    # Remove test_sba_pca
-    - sed -i '88,153d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
-    # Disable removal of output bitstreams
-    - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
-    - sed -i 's/os.remove/print()#os.remove/g' tests/codec_be_on_mr_nonselection/test_param_file.py
-    - sed -i '605,608d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
-    # Remove binaural renderer tests
-    - sed -i '276,301d' tests/renderer/test_renderer.py
-    - sed -i '205,236d' tests/renderer/test_renderer.py
-    - sed -i '151,186d' tests/renderer/test_renderer.py
-    - sed -i '101,132d' tests/renderer/test_renderer.py
-    - sed -i '58,83d' tests/renderer/test_renderer.py
-    # Remove random tag in FER cases    
-    - sed -i '438s/next(tempfile._get_candidate_names())/os.path.basename(plc_file)/' tests/conftest.py
-    # Unify to use .192 as bitstream suffix
-    - sed -i 's/\.pkt/\.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
-    - sed -i 's/\.pkt/\.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
-    - sed -i 's/\.bts/\.192/g' tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
-    # Unify to use .wav as output suffix
-    - sed -i 's/\.raw/\.wav/g' tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
-    - sed -i 's/\.raw/\.wav/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
-
     
     # Reference creation
     - non_be_flag=0
diff --git a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
index 3c49f9f21c..31ba41775c 100644
--- a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
+++ b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py
@@ -141,8 +141,8 @@ def test_masa_enc_dec(
     check_and_makedir(out_dir_dec_output_dut)
 
     # To avoid conflicting names in case of parallel test execution, differentiate all cases
-    output_bitstream_ref = f"{out_dir_bs_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.bts"
-    output_bitstream_dut = f"{out_dir_bs_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.bts"
+    output_bitstream_ref = f"{out_dir_bs_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.192"
+    output_bitstream_dut = f"{out_dir_bs_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.192"
     dec_output_ref = f"{out_dir_dec_output_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.wav"
     dec_output_dut = f"{out_dir_dec_output_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.wav"
     if output_mode == "EXT":
diff --git a/tests/codec_be_on_mr_nonselection/test_param_file.py b/tests/codec_be_on_mr_nonselection/test_param_file.py
index 3c94d670d7..ba70ba027b 100644
--- a/tests/codec_be_on_mr_nonselection/test_param_file.py
+++ b/tests/codec_be_on_mr_nonselection/test_param_file.py
@@ -196,7 +196,7 @@ def test_param_file_tests(
         enc_split,
         update_ref,
     )
-    if sba_br_switching_dtx == 1:
+    if sba_br_switching_dtx == 1 and not keep_files:
         is_exist = os.path.exists(cut_file)
         if is_exist:
             os.remove(cut_file)
diff --git a/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py b/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
index 484ada6c8a..7b7e29367d 100644
--- a/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
+++ b/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py
@@ -163,14 +163,14 @@ def sba_dec_plc(
     check_and_makedir(ref_out_dir)
 
     plc_file = f"{test_vector_path}/{plc_pattern}.g192"
-    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}.pkt"
-    ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_dutenc.pkt"
+    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}.192"
+    ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_dutenc.192"
     if SID == 1:
-        ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_cut.pkt"
-        ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_dutenc_cut.pkt"
+        ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_cut.192"
+        ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_dutenc_cut.192"
 
-    dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.raw"
-    ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.raw"
+    dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.wav"
+    ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.wav"
 
     output_config = "FOA"
     if ref_decoder_path:
diff --git a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
index 650bddb17d..eb86a6cb05 100644
--- a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+++ b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
@@ -524,14 +524,14 @@ def sba_enc(
         long_tag_ext += f"_Gain{gain_flag}"
     if SID == 1:
         long_tag_ext += f"_SID"
-    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.pkt"
-    ref_pkt_file = f"{ref_out_dir}/{tag_out}{short_tag_ext}.pkt"
-    ref_pkt_file_dutenc = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc.pkt"
+    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.192"
+    ref_pkt_file = f"{ref_out_dir}/{tag_out}{short_tag_ext}.192"
+    ref_pkt_file_dutenc = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc.192"
     if SID == 1:
-        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{long_tag_ext}_cut.pkt"
-        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_cut.pkt"
+        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{long_tag_ext}_cut.192"
+        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_cut.192"
         ref_pkt_file_dutenc_cut = (
-            f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc_cut.pkt"
+            f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc_cut.192"
         )
     input_path = f"{test_vector_path}/{tag_in}{in_extension}"
     dtx_mode = dtx == "1"
@@ -604,13 +604,15 @@ def sba_enc(
             with open(ref_pkt_file_dutenc, "rb") as fp_in:
                 with open(ref_pkt_file_dutenc_cut, "wb") as fp_out:
                     fr_cnt, cut_cnt = cut_from_start(fp_in, fp_out, 0, True)
-            os.remove(ref_pkt_file)
-            os.remove(ref_pkt_file_dutenc)
+            if not keep_files:
+                os.remove(ref_pkt_file)
+                os.remove(ref_pkt_file_dutenc)
         if update_ref == 0:
             with open(dut_pkt_file, "rb") as fp_in:
                 with open(dut_pkt_file_cut, "wb") as fp_out:
                     fr_cnt, cut_cnt = cut_from_start(fp_in, fp_out, 0, True)
-            os.remove(dut_pkt_file)
+            if not keep_files:                    
+                os.remove(dut_pkt_file)
 
 
 def sba_dec(
@@ -657,11 +659,11 @@ def sba_dec(
     dut_out_dir = f"{dut_base_path}/sba_bs/raw"
     ref_out_dir = f"{reference_path}/sba_bs/raw"
 
-    dut_in_pkt = f"{dut_base_path}/sba_bs/pkt/{tag_out}{long_tag_ext}.pkt"
-    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}.pkt"
+    dut_in_pkt = f"{dut_base_path}/sba_bs/pkt/{tag_out}{long_tag_ext}.192"
+    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}.192"
 
-    dut_out_raw = f"{dut_out_dir}/{tag_out}{long_tag_ext}.raw"
-    ref_out_raw = f"{ref_out_dir}/{tag_out}{short_tag_ext}.raw"
+    dut_out_raw = f"{dut_out_dir}/{tag_out}{long_tag_ext}.wav"
+    ref_out_raw = f"{ref_out_dir}/{tag_out}{short_tag_ext}.wav"
 
     check_and_makedir(dut_out_dir)
     check_and_makedir(ref_out_dir)
diff --git a/tests/conftest.py b/tests/conftest.py
index 3b2d5944db..fd3c4a0898 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -41,7 +41,6 @@ from typing import Optional, Union
 import os
 from tests import testconfig
 import pytest
-import tempfile
 
 logger = logging.getLogger(__name__)
 USE_LOGGER_FOR_DBG = False  # current tests do not make use of the logger feature
@@ -449,7 +448,7 @@ class DecoderFrontend:
 
             eid_command = [eid_path]
             eid_command.extend(["-fer", "-vbr", "-bs", "g192", "-ep", "g192"])
-            eid_output_suffix = "." + next(tempfile._get_candidate_names()) + ".fer"
+            eid_output_suffix = "." + os.path.basename(plc_file) + ".fer"
             eid_command += [
                 str(input_bitstream_path),
                 str(plc_file),
diff --git a/tests/test_param_file_ltv.py b/tests/test_param_file_ltv.py
index d74a32aa76..47d51d66bb 100644
--- a/tests/test_param_file_ltv.py
+++ b/tests/test_param_file_ltv.py
@@ -197,7 +197,7 @@ def test_param_file_tests(
         enc_split,
         update_ref,
     )
-    if sba_br_switching_dtx == 1:
+    if sba_br_switching_dtx == 1 and not keep_files:
         is_exist = os.path.exists(cut_file)
         if is_exist:
             os.remove(cut_file)
-- 
GitLab


From e0409275362cd2efeaa20023a53f28860fa606d3 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 11:30:35 +0100
Subject: [PATCH 120/163] Set ivas-linux-fast tag for ivas-conformance job

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bc0513d1c..0d05ee11a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1219,7 +1219,7 @@ test-be-to-release:
 
 ivas-conformance:
   tags:
-    - test-ericsson-linux-runner
+    - ivas-linux-fast
   stage: test
   timeout: "60 minutes"
   rules:
-- 
GitLab


From f09451e5f63f2e08a0f4ff26909b1c1d8f659df0 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 11:45:43 +0100
Subject: [PATCH 121/163] Add copying of binary HRTF files

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d05ee11a0..b9abfef52f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1254,13 +1254,15 @@ ivas-conformance:
     
     # Copy input data and output ref data
     - mkdir testvec
+    - mkdir testvec/binauralRenderer_interface
+    - mkdir testvec/testv/renderer
+    - mkdir testvec/bin    
     - cp -r scripts/testv testvec
     - cp -r scripts/ls_layouts testvec
     - cp -r scripts/switchPaths testvec
     - cp -r scripts/trajectories testvec
+    - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
     - cp -r tests/ref testvec/testv/ref
-    - mkdir testvec/testv/renderer
-    - mkdir testvec/bin
     - cp -r tests/renderer/data testvec/testv/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
-- 
GitLab


From d6d7425e51712f60a14b2774441508746c920f77 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 11:54:15 +0100
Subject: [PATCH 122/163] Fix folder creation

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9abfef52f..b08f3eaec6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1255,9 +1255,10 @@ ivas-conformance:
     # Copy input data and output ref data
     - mkdir testvec
     - mkdir testvec/binauralRenderer_interface
+    - mkdir testvec/testv
     - mkdir testvec/testv/renderer
     - mkdir testvec/bin    
-    - cp -r scripts/testv testvec
+    - cp -r scripts/testv/* testvec/testv
     - cp -r scripts/ls_layouts testvec
     - cp -r scripts/switchPaths testvec
     - cp -r scripts/trajectories testvec
-- 
GitLab


From d97a045a534d48147d10b6598544541209678b93 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 12:32:40 +0100
Subject: [PATCH 123/163] Add test-job-linux-needs-testv-dir to
 ivas-conformance job

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b08f3eaec6..9c3ffd0095 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1218,6 +1218,8 @@ test-be-to-release:
 
 
 ivas-conformance:
+  extends:
+    - .test-job-linux-needs-testv-dir
   tags:
     - ivas-linux-fast
   stage: test
-- 
GitLab


From 9dbad762bd84eea5c672529d6c0b48d16fa21d66 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 14:06:07 +0100
Subject: [PATCH 124/163] Fix for keep_files

---
 tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
index eb86a6cb05..47dc7c791f 100644
--- a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
+++ b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py
@@ -130,6 +130,7 @@ def test_pca_enc(
         sba_order,
         update_ref,
         gain_flag,
+        keep_files,
         cut_testv=True,
         pca=pca,
     )
@@ -226,6 +227,7 @@ def test_sba_enc_system(
         sba_order,
         update_ref,
         gain_flag,
+        keep_files,
         cut_gain=cut_gain,
         create_dutenc=True,
         cut_testv=True,
@@ -298,6 +300,7 @@ def test_spar_hoa2_enc_system(
         sba_order,
         update_ref,
         gain_flag,
+        keep_files,
     )
 
     # dec
@@ -367,6 +370,7 @@ def test_spar_hoa3_enc_system(
         sba_order,
         update_ref,
         gain_flag,
+        keep_files,
     )
 
     # dec
@@ -445,6 +449,7 @@ def test_sba_enc_BWforce_system(
         sba_order,
         update_ref,
         gain_flag,
+        keep_files,
         cut_testv=True,
     )
 
@@ -488,6 +493,7 @@ def sba_enc(
     sba_order,
     update_ref,
     gain_flag,
+    keep_files=False,
     cut_gain="1.0",
     create_dutenc=False,
     cut_testv=False,
-- 
GitLab


From 47b15bfd8db2137e4f84fdc2b5d7774e25f59d68 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 13:09:37 +0000
Subject: [PATCH 125/163] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c3ffd0095..1669fc6f74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1221,7 +1221,7 @@ ivas-conformance:
   extends:
     - .test-job-linux-needs-testv-dir
   tags:
-    - ivas-linux-fast
+    - test-ericsson-linux-runner
   stage: test
   timeout: "60 minutes"
   rules:
-- 
GitLab


From 30cd3582837fbab37d477d4f58e10563ea4740b1 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 15:02:07 +0100
Subject: [PATCH 126/163] Use dut run in testv creation

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c3ffd0095..8208ab7fec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1265,7 +1265,7 @@ ivas-conformance:
     - cp -r scripts/switchPaths testvec
     - cp -r scripts/trajectories testvec
     - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
-    - cp -r tests/ref testvec/testv/ref
+    - cp -r tests/dut testvec/testv/ref
     - cp -r tests/renderer/data testvec/testv/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
-- 
GitLab


From 09f9694cd032a6e9dec13d61aa225f5736b8f2a2 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 14:09:06 +0000
Subject: [PATCH 127/163] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a58b20739..c39f667605 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1221,7 +1221,7 @@ ivas-conformance:
   extends:
     - .test-job-linux-needs-testv-dir
   tags:
-    - test-ericsson-linux-runner
+    - ivas-linux
   stage: test
   timeout: "60 minutes"
   rules:
-- 
GitLab


From a2a8ae9988bba948d1f96e2c2af8c998ef4b99ed Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 15:18:54 +0100
Subject: [PATCH 128/163] Change back to ref folder and set --keep_files for
 the creation part

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a58b20739..5784289c97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1245,9 +1245,9 @@ ivas-conformance:
     - non_be_flag=0
     - exit_code=0
     - python3 tests/create_short_testvectors.py
-    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref --html=report1.html --self-contained-html  || exit_code=$?
-    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?
-    - python3 -m pytest tests/renderer/test_renderer.py --create_ref || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref --html=report1.html --self-contained-html --keep_files || exit_code=$?
+    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 --keep_files || exit_code=$?
+    - python3 -m pytest tests/renderer/test_renderer.py --create_ref --keep_files || exit_code=$?
 
     # Output creation
     - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html || exit_code=$?
@@ -1265,7 +1265,7 @@ ivas-conformance:
     - cp -r scripts/switchPaths testvec
     - cp -r scripts/trajectories testvec
     - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
-    - cp -r tests/dut testvec/testv/ref
+    - cp -r tests/ref testvec/testv/ref
     - cp -r tests/renderer/data testvec/testv/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
-- 
GitLab


From 2a06a0b1670654073f7cc4d573e83d2fed5f6d84 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 14:40:22 +0000
Subject: [PATCH 129/163] Use pytest-html-updated for ivas-conformance job

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd4624fbdd..5fd790fd8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1221,7 +1221,7 @@ ivas-conformance:
   extends:
     - .test-job-linux-needs-testv-dir
   tags:
-    - ivas-linux
+    - pytest-html-updated
   stage: test
   timeout: "60 minutes"
   rules:
-- 
GitLab


From 34ab85fc60532e99d3f82a6371ac8e74393cd253 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 2 Feb 2024 15:59:49 +0100
Subject: [PATCH 130/163] Try joining ref and dut outputs

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5fd790fd8f..1f22df8845 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1266,6 +1266,7 @@ ivas-conformance:
     - cp -r scripts/trajectories testvec
     - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
     - cp -r tests/ref testvec/testv/ref
+    - cp -r tests/dut/* testvec/testv/ref
     - cp -r tests/renderer/data testvec/testv/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
-- 
GitLab


From 649cfd110fc64da40eaab854f4d596c9896df8cd Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Mon, 5 Feb 2024 13:55:40 +0100
Subject: [PATCH 131/163] Change input folder of renderer data

---
 parse_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parse_commands.py b/parse_commands.py
index fe3d165c1a..eb0cbfa412 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -108,7 +108,7 @@ if __name__ == '__main__':
   
             cmd = cmd.replace(root_folder + r'/IVAS_rend', '$CUT_REND_BIN')
             cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            cmd = cmd.replace(root_folder + r'/tests/renderer/data/', REF_PATH + r'renderer/data/')            
+            cmd = cmd.replace(root_folder + r'/tests/renderer/data/', TESTV_PATH + r'renderer/data/')            
             cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            
 
             if "cut" in cmd:
-- 
GitLab


From 6c5ef4f8a9ddccf3c2dfdd6b239d1859b35a28ba Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Mon, 5 Feb 2024 14:51:48 +0100
Subject: [PATCH 132/163] Fix location of renderer data

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f22df8845..98f7b950ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1258,7 +1258,7 @@ ivas-conformance:
     - mkdir testvec
     - mkdir testvec/binauralRenderer_interface
     - mkdir testvec/testv
-    - mkdir testvec/testv/renderer
+    - mkdir testvec/renderer
     - mkdir testvec/bin    
     - cp -r scripts/testv/* testvec/testv
     - cp -r scripts/ls_layouts testvec
@@ -1267,7 +1267,7 @@ ivas-conformance:
     - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
     - cp -r tests/ref testvec/testv/ref
     - cp -r tests/dut/* testvec/testv/ref
-    - cp -r tests/renderer/data testvec/testv/renderer/data
+    - cp -r tests/renderer/data testvec/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
     - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
-- 
GitLab


From 29975c71bc0ca47c464d4349edd94c205f77e05d Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 8 Feb 2024 15:12:40 +0100
Subject: [PATCH 133/163] Add prepare_combined_format_inputs.py

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98f7b950ac..2b0477f4dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1245,6 +1245,7 @@ ivas-conformance:
     - non_be_flag=0
     - exit_code=0
     - python3 tests/create_short_testvectors.py
+    - python3 prepare_combined_format_inputs.py
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref --html=report1.html --self-contained-html --keep_files || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 --keep_files || exit_code=$?
     - python3 -m pytest tests/renderer/test_renderer.py --create_ref --keep_files || exit_code=$?
-- 
GitLab


From 2d839a7787df4ff1795c29718a8f61151c8da59f Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 8 Feb 2024 15:14:56 +0100
Subject: [PATCH 134/163] Fix call to scripts/prepare_combined_format_inputs.py

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b0477f4dd..f16bf9e2f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1245,7 +1245,7 @@ ivas-conformance:
     - non_be_flag=0
     - exit_code=0
     - python3 tests/create_short_testvectors.py
-    - python3 prepare_combined_format_inputs.py
+    - python3 scripts/prepare_combined_format_inputs.py
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref --html=report1.html --self-contained-html --keep_files || exit_code=$?
     - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 --keep_files || exit_code=$?
     - python3 -m pytest tests/renderer/test_renderer.py --create_ref --keep_files || exit_code=$?
-- 
GitLab


From d5c2b34fc166f6bfd3afef0def9fa08bfeff90f4 Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Thu, 8 Feb 2024 16:24:21 +0100
Subject: [PATCH 135/163] move renderer pytest data to scripts/testv

---
 .../renderer/data => scripts/testv}/ism1_ivas_mtdt_config.txt   | 0
 .../renderer/data => scripts/testv}/ism1_shorthand_config.txt   | 0
 .../renderer/data => scripts/testv}/ism2_ivas_mtdt_config.txt   | 0
 .../renderer/data => scripts/testv}/ism2_shorthand_config.txt   | 0
 .../renderer/data => scripts/testv}/ism3_ivas_mtdt_config.txt   | 0
 .../renderer/data => scripts/testv}/ism3_shorthand_config.txt   | 0
 .../renderer/data => scripts/testv}/ism4_ivas_mtdt_config.txt   | 0
 .../renderer/data => scripts/testv}/ism4_shorthand_config.txt   | 0
 {tests/renderer/data => scripts/testv}/ism_0a_0e.csv            | 0
 {tests/renderer/data => scripts/testv}/masa_scene.txt           | 0
 .../renderer/data => scripts/testv}/mixed_ivas_mtdt_config.txt  | 0
 .../data => scripts/testv}/mixed_ivas_mtdt_gain_config.txt      | 0
 .../data => scripts/testv}/mixed_mc714_foa_masa2_ism4.txt       | 0
 {tests/renderer/data => scripts/testv}/mixed_scene.txt          | 0
 {tests/renderer/data => scripts/testv}/mixed_scene_simple.txt   | 0
 .../renderer/data => scripts/testv}/mixed_shorthand_config.txt  | 0
 .../data => scripts/testv}/mixed_shorthand_gain_config.txt      | 0
 .../data => scripts/testv}/mixed_shorthand_limiter_config.txt   | 0
 .../data => scripts/testv}/renderer_config_format_readme.txt    | 0
 .../data => scripts/testv}/spectral_test_10ch_48kHz.wav         | 0
 .../data => scripts/testv}/spectral_test_11ch_48kHz.wav         | 0
 .../data => scripts/testv}/spectral_test_12ch_48kHz.wav         | 0
 .../data => scripts/testv}/spectral_test_13ch_48kHz.wav         | 0
 .../data => scripts/testv}/spectral_test_15ch_48kHz.wav         | 0
 .../data => scripts/testv}/spectral_test_16ch_48kHz.wav         | 0
 .../data => scripts/testv}/spectral_test_17ch_48kHz.wav         | 0
 .../data => scripts/testv}/spectral_test_18ch_48kHz.wav         | 0
 .../data => scripts/testv}/spectral_test_19ch_48kHz.wav         | 0
 .../renderer/data => scripts/testv}/spectral_test_1ch_48kHz.wav | 0
 .../data => scripts/testv}/spectral_test_20ch_48kHz.wav         | 0
 .../renderer/data => scripts/testv}/spectral_test_2ch_48kHz.wav | 0
 .../renderer/data => scripts/testv}/spectral_test_3ch_48kHz.wav | 0
 .../renderer/data => scripts/testv}/spectral_test_4ch_48kHz.wav | 0
 .../renderer/data => scripts/testv}/spectral_test_5ch_48kHz.wav | 0
 .../renderer/data => scripts/testv}/spectral_test_6ch_48kHz.wav | 0
 .../renderer/data => scripts/testv}/spectral_test_7ch_48kHz.wav | 0
 .../renderer/data => scripts/testv}/spectral_test_8ch_48kHz.wav | 0
 .../renderer/data => scripts/testv}/spectral_test_9ch_48kHz.wav | 0
 tests/renderer/constants.py                                     | 2 +-
 39 files changed, 1 insertion(+), 1 deletion(-)
 rename {tests/renderer/data => scripts/testv}/ism1_ivas_mtdt_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/ism1_shorthand_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/ism2_ivas_mtdt_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/ism2_shorthand_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/ism3_ivas_mtdt_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/ism3_shorthand_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/ism4_ivas_mtdt_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/ism4_shorthand_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/ism_0a_0e.csv (100%)
 rename {tests/renderer/data => scripts/testv}/masa_scene.txt (100%)
 rename {tests/renderer/data => scripts/testv}/mixed_ivas_mtdt_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/mixed_ivas_mtdt_gain_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/mixed_mc714_foa_masa2_ism4.txt (100%)
 rename {tests/renderer/data => scripts/testv}/mixed_scene.txt (100%)
 rename {tests/renderer/data => scripts/testv}/mixed_scene_simple.txt (100%)
 rename {tests/renderer/data => scripts/testv}/mixed_shorthand_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/mixed_shorthand_gain_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/mixed_shorthand_limiter_config.txt (100%)
 rename {tests/renderer/data => scripts/testv}/renderer_config_format_readme.txt (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_10ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_11ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_12ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_13ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_15ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_16ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_17ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_18ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_19ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_1ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_20ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_2ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_3ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_4ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_5ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_6ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_7ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_8ch_48kHz.wav (100%)
 rename {tests/renderer/data => scripts/testv}/spectral_test_9ch_48kHz.wav (100%)

diff --git a/tests/renderer/data/ism1_ivas_mtdt_config.txt b/scripts/testv/ism1_ivas_mtdt_config.txt
similarity index 100%
rename from tests/renderer/data/ism1_ivas_mtdt_config.txt
rename to scripts/testv/ism1_ivas_mtdt_config.txt
diff --git a/tests/renderer/data/ism1_shorthand_config.txt b/scripts/testv/ism1_shorthand_config.txt
similarity index 100%
rename from tests/renderer/data/ism1_shorthand_config.txt
rename to scripts/testv/ism1_shorthand_config.txt
diff --git a/tests/renderer/data/ism2_ivas_mtdt_config.txt b/scripts/testv/ism2_ivas_mtdt_config.txt
similarity index 100%
rename from tests/renderer/data/ism2_ivas_mtdt_config.txt
rename to scripts/testv/ism2_ivas_mtdt_config.txt
diff --git a/tests/renderer/data/ism2_shorthand_config.txt b/scripts/testv/ism2_shorthand_config.txt
similarity index 100%
rename from tests/renderer/data/ism2_shorthand_config.txt
rename to scripts/testv/ism2_shorthand_config.txt
diff --git a/tests/renderer/data/ism3_ivas_mtdt_config.txt b/scripts/testv/ism3_ivas_mtdt_config.txt
similarity index 100%
rename from tests/renderer/data/ism3_ivas_mtdt_config.txt
rename to scripts/testv/ism3_ivas_mtdt_config.txt
diff --git a/tests/renderer/data/ism3_shorthand_config.txt b/scripts/testv/ism3_shorthand_config.txt
similarity index 100%
rename from tests/renderer/data/ism3_shorthand_config.txt
rename to scripts/testv/ism3_shorthand_config.txt
diff --git a/tests/renderer/data/ism4_ivas_mtdt_config.txt b/scripts/testv/ism4_ivas_mtdt_config.txt
similarity index 100%
rename from tests/renderer/data/ism4_ivas_mtdt_config.txt
rename to scripts/testv/ism4_ivas_mtdt_config.txt
diff --git a/tests/renderer/data/ism4_shorthand_config.txt b/scripts/testv/ism4_shorthand_config.txt
similarity index 100%
rename from tests/renderer/data/ism4_shorthand_config.txt
rename to scripts/testv/ism4_shorthand_config.txt
diff --git a/tests/renderer/data/ism_0a_0e.csv b/scripts/testv/ism_0a_0e.csv
similarity index 100%
rename from tests/renderer/data/ism_0a_0e.csv
rename to scripts/testv/ism_0a_0e.csv
diff --git a/tests/renderer/data/masa_scene.txt b/scripts/testv/masa_scene.txt
similarity index 100%
rename from tests/renderer/data/masa_scene.txt
rename to scripts/testv/masa_scene.txt
diff --git a/tests/renderer/data/mixed_ivas_mtdt_config.txt b/scripts/testv/mixed_ivas_mtdt_config.txt
similarity index 100%
rename from tests/renderer/data/mixed_ivas_mtdt_config.txt
rename to scripts/testv/mixed_ivas_mtdt_config.txt
diff --git a/tests/renderer/data/mixed_ivas_mtdt_gain_config.txt b/scripts/testv/mixed_ivas_mtdt_gain_config.txt
similarity index 100%
rename from tests/renderer/data/mixed_ivas_mtdt_gain_config.txt
rename to scripts/testv/mixed_ivas_mtdt_gain_config.txt
diff --git a/tests/renderer/data/mixed_mc714_foa_masa2_ism4.txt b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt
similarity index 100%
rename from tests/renderer/data/mixed_mc714_foa_masa2_ism4.txt
rename to scripts/testv/mixed_mc714_foa_masa2_ism4.txt
diff --git a/tests/renderer/data/mixed_scene.txt b/scripts/testv/mixed_scene.txt
similarity index 100%
rename from tests/renderer/data/mixed_scene.txt
rename to scripts/testv/mixed_scene.txt
diff --git a/tests/renderer/data/mixed_scene_simple.txt b/scripts/testv/mixed_scene_simple.txt
similarity index 100%
rename from tests/renderer/data/mixed_scene_simple.txt
rename to scripts/testv/mixed_scene_simple.txt
diff --git a/tests/renderer/data/mixed_shorthand_config.txt b/scripts/testv/mixed_shorthand_config.txt
similarity index 100%
rename from tests/renderer/data/mixed_shorthand_config.txt
rename to scripts/testv/mixed_shorthand_config.txt
diff --git a/tests/renderer/data/mixed_shorthand_gain_config.txt b/scripts/testv/mixed_shorthand_gain_config.txt
similarity index 100%
rename from tests/renderer/data/mixed_shorthand_gain_config.txt
rename to scripts/testv/mixed_shorthand_gain_config.txt
diff --git a/tests/renderer/data/mixed_shorthand_limiter_config.txt b/scripts/testv/mixed_shorthand_limiter_config.txt
similarity index 100%
rename from tests/renderer/data/mixed_shorthand_limiter_config.txt
rename to scripts/testv/mixed_shorthand_limiter_config.txt
diff --git a/tests/renderer/data/renderer_config_format_readme.txt b/scripts/testv/renderer_config_format_readme.txt
similarity index 100%
rename from tests/renderer/data/renderer_config_format_readme.txt
rename to scripts/testv/renderer_config_format_readme.txt
diff --git a/tests/renderer/data/spectral_test_10ch_48kHz.wav b/scripts/testv/spectral_test_10ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_10ch_48kHz.wav
rename to scripts/testv/spectral_test_10ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_11ch_48kHz.wav b/scripts/testv/spectral_test_11ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_11ch_48kHz.wav
rename to scripts/testv/spectral_test_11ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_12ch_48kHz.wav b/scripts/testv/spectral_test_12ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_12ch_48kHz.wav
rename to scripts/testv/spectral_test_12ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_13ch_48kHz.wav b/scripts/testv/spectral_test_13ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_13ch_48kHz.wav
rename to scripts/testv/spectral_test_13ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_15ch_48kHz.wav b/scripts/testv/spectral_test_15ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_15ch_48kHz.wav
rename to scripts/testv/spectral_test_15ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_16ch_48kHz.wav b/scripts/testv/spectral_test_16ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_16ch_48kHz.wav
rename to scripts/testv/spectral_test_16ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_17ch_48kHz.wav b/scripts/testv/spectral_test_17ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_17ch_48kHz.wav
rename to scripts/testv/spectral_test_17ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_18ch_48kHz.wav b/scripts/testv/spectral_test_18ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_18ch_48kHz.wav
rename to scripts/testv/spectral_test_18ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_19ch_48kHz.wav b/scripts/testv/spectral_test_19ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_19ch_48kHz.wav
rename to scripts/testv/spectral_test_19ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_1ch_48kHz.wav b/scripts/testv/spectral_test_1ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_1ch_48kHz.wav
rename to scripts/testv/spectral_test_1ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_20ch_48kHz.wav b/scripts/testv/spectral_test_20ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_20ch_48kHz.wav
rename to scripts/testv/spectral_test_20ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_2ch_48kHz.wav b/scripts/testv/spectral_test_2ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_2ch_48kHz.wav
rename to scripts/testv/spectral_test_2ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_3ch_48kHz.wav b/scripts/testv/spectral_test_3ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_3ch_48kHz.wav
rename to scripts/testv/spectral_test_3ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_4ch_48kHz.wav b/scripts/testv/spectral_test_4ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_4ch_48kHz.wav
rename to scripts/testv/spectral_test_4ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_5ch_48kHz.wav b/scripts/testv/spectral_test_5ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_5ch_48kHz.wav
rename to scripts/testv/spectral_test_5ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_6ch_48kHz.wav b/scripts/testv/spectral_test_6ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_6ch_48kHz.wav
rename to scripts/testv/spectral_test_6ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_7ch_48kHz.wav b/scripts/testv/spectral_test_7ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_7ch_48kHz.wav
rename to scripts/testv/spectral_test_7ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_8ch_48kHz.wav b/scripts/testv/spectral_test_8ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_8ch_48kHz.wav
rename to scripts/testv/spectral_test_8ch_48kHz.wav
diff --git a/tests/renderer/data/spectral_test_9ch_48kHz.wav b/scripts/testv/spectral_test_9ch_48kHz.wav
similarity index 100%
rename from tests/renderer/data/spectral_test_9ch_48kHz.wav
rename to scripts/testv/spectral_test_9ch_48kHz.wav
diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py
index 056242bd3c..b49f006d79 100644
--- a/tests/renderer/constants.py
+++ b/tests/renderer/constants.py
@@ -35,7 +35,7 @@ from pathlib import Path
 """ Set up paths """
 TESTS_DIR = Path(__file__).parent
 SCRIPTS_DIR = TESTS_DIR.parents[1].joinpath("scripts").resolve()
-TEST_VECTOR_DIR = TESTS_DIR.joinpath("data")
+TEST_VECTOR_DIR = SCRIPTS_DIR.joinpath("testv")
 
 OUTPUT_PATH_REF = TESTS_DIR.joinpath("ref")
 OUTPUT_PATH_CUT = TESTS_DIR.joinpath("cut")
-- 
GitLab


From 8bef53f6d3986f976901f40522d96719642b480e Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Thu, 8 Feb 2024 16:32:37 +0100
Subject: [PATCH 136/163] update mixed scene .txt file

---
 scripts/testv/mixed_mc714_foa_masa2_ism4.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/testv/mixed_mc714_foa_masa2_ism4.txt b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt
index e29dabb46c..c7f8e4276a 100644
--- a/scripts/testv/mixed_mc714_foa_masa2_ism4.txt
+++ b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt
@@ -1,4 +1,4 @@
-../../../scripts/testv/mixed_mc714_foa_masa2_ism4.wav
+mixed_mc714_foa_masa2_ism4.wav
 7
 MC
 1
@@ -9,16 +9,16 @@ SBA
 MASA
 17
 2
-../../../scripts/testv/stv2MASA2TC48c.met
+MASA2TC48c.met
 ISM
 19
-../../../scripts/testv/stvISM1.csv
+stvISM1.csv
 ISM
 20
-../../../scripts/testv/stvISM2.csv
+stvISM2.csv
 ISM
 21
-../../../scripts/testv/stvISM3.csv
+stvISM3.csv
 ISM
 22
-../../../scripts/testv/stvISM4.csv
\ No newline at end of file
+stvISM4.csv
-- 
GitLab


From c610912336ae13e77dbfc903e2035cced5a73a97 Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Thu, 8 Feb 2024 16:43:56 +0100
Subject: [PATCH 137/163] [ci] remove old cp command in .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f16bf9e2f1..de622c6cfb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1268,7 +1268,6 @@ ivas-conformance:
     - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
     - cp -r tests/ref testvec/testv/ref
     - cp -r tests/dut/* testvec/testv/ref
-    - cp -r tests/renderer/data testvec/renderer/data
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
     - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
-- 
GitLab


From 7ef27b78f65d05258bd21a1d0628bd1a6ecb704d Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Thu, 8 Feb 2024 17:00:39 +0100
Subject: [PATCH 138/163] [ci] fix path in conformance test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de622c6cfb..cace6c4614 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1268,7 +1268,7 @@ ivas-conformance:
     - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
     - cp -r tests/ref testvec/testv/ref
     - cp -r tests/dut/* testvec/testv/ref
-    - cp -r tests/renderer/cut testvec/testv/renderer/ref
+    - cp -r tests/renderer/cut testvec/renderer/ref
     - cp -r conformance-test testvec/
     - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
-- 
GitLab


From 7b9c9c6aacb9a1d7f7a10e941a88c7a1c0caa0e9 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 9 Feb 2024 07:35:17 +0100
Subject: [PATCH 139/163] Fix copying of testvec data

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cace6c4614..f3d355e4d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1259,7 +1259,7 @@ ivas-conformance:
     - mkdir testvec
     - mkdir testvec/binauralRenderer_interface
     - mkdir testvec/testv
-    - mkdir testvec/renderer
+    - mkdir testvec/testv/renderer
     - mkdir testvec/bin    
     - cp -r scripts/testv/* testvec/testv
     - cp -r scripts/ls_layouts testvec
@@ -1268,7 +1268,7 @@ ivas-conformance:
     - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
     - cp -r tests/ref testvec/testv/ref
     - cp -r tests/dut/* testvec/testv/ref
-    - cp -r tests/renderer/cut testvec/renderer/ref
+    - cp -r tests/renderer/cut testvec/testv/renderer/ref
     - cp -r conformance-test testvec/
     - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
-- 
GitLab


From 36a6fb1c7dc9cac173be5d38615808e059dba76b Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 9 Feb 2024 08:07:56 +0100
Subject: [PATCH 140/163] Fix in mixed_mc714_foa_masa2_ism4.txt

---
 scripts/testv/mixed_mc714_foa_masa2_ism4.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/testv/mixed_mc714_foa_masa2_ism4.txt b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt
index c7f8e4276a..800e88ae7c 100644
--- a/scripts/testv/mixed_mc714_foa_masa2_ism4.txt
+++ b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt
@@ -9,7 +9,7 @@ SBA
 MASA
 17
 2
-MASA2TC48c.met
+stv2MASA2TC48c.met
 ISM
 19
 stvISM1.csv
-- 
GitLab


From b63c0bef9e9e0d50baa367c06aaa2904c61848f0 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 9 Feb 2024 15:06:17 +0100
Subject: [PATCH 141/163] Add .exe suffix for Windows in renderer tests

---
 tests/renderer/constants.py     |  7 +++++++
 tests/renderer/test_renderer.py | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py
index b49f006d79..b2a25b9206 100644
--- a/tests/renderer/constants.py
+++ b/tests/renderer/constants.py
@@ -31,6 +31,7 @@
 """
 
 from pathlib import Path
+import platform
 
 """ Set up paths """
 TESTS_DIR = Path(__file__).parent
@@ -46,6 +47,12 @@ TESTV_DIR = SCRIPTS_DIR.joinpath("testv")
 
 BIN_SUFFIX_MERGETARGET = "_ref"
 
+if platform.system() == "Windows":
+    EXE_SUFFIX = ".exe"
+elif platform.system() in ["Linux", "Darwin"]:
+    EXE_SUFFIX = ""
+else:
+    assert False, f"Unsupported platform {platform.system()}"
 
 """ Renderer commandline template """
 RENDERER_CMD = [
diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py
index 9750cc11f4..9db98c1e88 100644
--- a/tests/renderer/test_renderer.py
+++ b/tests/renderer/test_renderer.py
@@ -52,6 +52,7 @@ def test_ambisonics(record_property, test_info, in_fmt, out_fmt, frame_size, get
         test_info,
         in_fmt,
         out_fmt,
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -68,6 +69,7 @@ def test_ambisonics_binaural_static(record_property, test_info, in_fmt, out_fmt,
         test_info,
         in_fmt,
         out_fmt,
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -88,6 +90,7 @@ def test_ambisonics_binaural_headrotation(
         in_fmt,
         out_fmt,
         trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -107,6 +110,7 @@ def test_multichannel(record_property, test_info, in_fmt, out_fmt, frame_size, g
         test_info,
         in_fmt,
         out_fmt,
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -126,6 +130,7 @@ def test_multichannel_binaural_static(record_property, test_info, in_fmt, out_fm
         test_info,
         in_fmt,
         out_fmt,
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -149,6 +154,7 @@ def test_multichannel_binaural_headrotation(
         in_fmt,
         out_fmt,
         trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,
@@ -169,6 +175,7 @@ def test_ism(record_property, test_info, in_fmt, out_fmt, frame_size, get_mld, g
         in_fmt,
         out_fmt,
         in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,
@@ -191,6 +198,7 @@ def test_ism_binaural_static(record_property, test_info, in_fmt, out_fmt, frame_
         in_fmt,
         out_fmt,
         in_meta_files=in_meta_files,
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -215,6 +223,7 @@ def test_ism_binaural_headrotation(record_property, test_info, in_fmt, out_fmt,
         out_fmt,
         trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
         in_meta_files=in_meta_files,
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -235,6 +244,7 @@ def test_masa(record_property, test_info, in_fmt, out_fmt, frame_size, get_mld,
         in_fmt,
         out_fmt,
         in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -255,6 +265,7 @@ def test_masa_binaural_static(record_property, test_info, in_fmt, out_fmt, frame
         in_fmt,
         out_fmt,
         in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -277,6 +288,7 @@ def test_masa_binaural_headrotation(record_property, test_info, in_fmt, out_fmt,
         out_fmt,
         trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
         in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -292,6 +304,7 @@ def test_masa_prerend(record_property, test_info, in_fmt, get_mld, get_mld_lim):
         "META",
         "MASA2",
         metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}.txt"),
+        binary_suffix=EXE_SUFFIX,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
     )
@@ -310,6 +323,7 @@ def test_custom_ls_input(record_property, test_info, in_layout, out_fmt, frame_s
         test_info,
         CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),
         out_fmt,
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -325,6 +339,7 @@ def test_custom_ls_output(record_property, test_info, in_fmt, out_fmt, get_mld,
         test_info,
         in_fmt,
         CUSTOM_LAYOUT_DIR.joinpath(f"{out_fmt}.txt"),
+        binary_suffix=EXE_SUFFIX,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
     )
@@ -339,6 +354,7 @@ def test_custom_ls_input_output(record_property, test_info, in_fmt, out_fmt, get
         test_info,
         CUSTOM_LAYOUT_DIR.joinpath(f"{in_fmt}.txt"),
         CUSTOM_LAYOUT_DIR.joinpath(f"{out_fmt}.txt"),
+        binary_suffix=EXE_SUFFIX,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
     )
@@ -354,6 +370,7 @@ def test_custom_ls_input_binaural(record_property, test_info, in_layout, out_fmt
         test_info,
         CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),
         out_fmt,
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -374,6 +391,7 @@ def test_custom_ls_input_binaural_headrotation(
         CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"),
         out_fmt,
         trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -394,6 +412,7 @@ def test_metadata(record_property, test_info, in_fmt, out_fmt, frame_size, get_m
         "META",
         out_fmt,
         metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}.txt"),
+        binary_suffix=EXE_SUFFIX,
         frame_size=frame_size,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
@@ -414,6 +433,7 @@ def test_non_diegetic_pan_static(record_property, test_info, in_fmt, out_fmt, no
         in_fmt,
         out_fmt,
         non_diegetic_pan=non_diegetic_pan,
+        binary_suffix=EXE_SUFFIX,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
     )
@@ -430,6 +450,7 @@ def test_non_diegetic_pan_ism_static(record_property, test_info, in_fmt, out_fmt
         in_fmt,
         out_fmt,
         non_diegetic_pan=non_diegetic_pan,
+        binary_suffix=EXE_SUFFIX,
         get_mld=get_mld, 
         mld_lim=get_mld_lim,        
     )
-- 
GitLab


From 3f9600e9c585885ede17d310ed61b2ea795b6f98 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Mon, 12 Feb 2024 15:57:23 +0100
Subject: [PATCH 142/163] Update parse_commands.py for Windows

---
 parse_commands.py | 130 +++++++++++++++++++++++++++++-----------------
 1 file changed, 82 insertions(+), 48 deletions(-)

diff --git a/parse_commands.py b/parse_commands.py
index eb0cbfa412..1cf6accde5 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -15,10 +15,12 @@ if __name__ == '__main__':
     input = args.input
     txt_file    = args.txt_file
 
-    TESTV_PATH='$TESTV_PATH/'
-    REF_PATH='$REF_PATH/'
-    CUT_PATH='$CUT_PATH/'
+    TESTV_PATH='$TESTV_PATH'
+    REF_PATH='$REF_PATH'
+    CUT_PATH='$CUT_PATH'
     
+    here = Path(__file__).parent.resolve()
+
     cmds_enc=[]
     cmds_dec=[]
     cmds_rend=[]
@@ -40,20 +42,21 @@ if __name__ == '__main__':
         with open('enc_header.txt','r') as header:
             outfile.write(header.read())
         for cmd in cmds_enc:
-            arg1 = cmd.split()[0]
-            root_folder = arg1[0:arg1.find("ivas-codec/")+10]
-            cmd = cmd.replace(root_folder + r'/IVAS_cod', '$CUT_ENC_BIN')
-            cmd = cmd.replace(r'\\', '/')
-            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths
-            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH )
-            
-            if not "pca" in cmd:
-                outfile.write(cmd+'\n')
-                bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt|.fer))$", cmd)
-                if bts:
-                    outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+' >> $LOG_FILE 2>&1\n')
-                outfile.write('\n')
+            args = []
+            for arg in cmd.split():
+                # Adjust file arguments, pass other arguments as they are
+                if path.exists(arg):
+                    arg = path.relpath(arg).replace('\\','/')
+                    arg = re.sub('IVAS_cod(.exe)?', '$CUT_ENC_BIN', arg)
+                    arg = re.sub('scripts', TESTV_PATH, arg)
+                    arg = re.sub('tests', CUT_PATH, arg)
+                args.append(arg)
+            cmd = ' '.join(args)
+            outfile.write(cmd+'\n')
+            bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt|.fer))$", cmd)
+            if bts:
+                outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'/dut',REF_PATH + r'/ref')+' '+bts.group(1)+' >> $LOG_FILE 2>&1\n')
+            outfile.write('\n')
         with open('script_footer.txt','r') as footer:
             outfile.write(footer.read())                        
 
@@ -64,34 +67,53 @@ if __name__ == '__main__':
             outfile_jbm.write(header.read())
         for cmd in cmds_dec:
             absolute_out = re.search(r"\s(([\S]+)(.wav))$", cmd)
-            arg1 = cmd.split()[0]
-            root_folder = arg1[0:arg1.find("ivas-codec/")+10]
-            cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
-            cmd = cmd.replace(r'\\', '/')
-            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths            
-            inputs = cmd.count(root_folder) - 1
-            if ".fer " in cmd:
-                cmd = cmd.replace(root_folder + r'/tests/ref', REF_PATH + r'ref', 1)
-            else:
-                cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
-            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
+
+            args = []
+            inputs = sum([1 if path.exists(a) else 0 for a in cmd.split()]) - 2 # One is the exec, one is the output, rest is inputs
+            for arg in cmd.split():
+                # Adjust file arguments, pass other arguments as they are
+                if path.exists(arg):
+                    arg = path.relpath(arg).replace('\\','/')
+                    arg = re.sub('IVAS_dec(.exe)?', '$CUT_DEC_BIN', arg)
+                    arg = re.sub('scripts', TESTV_PATH, arg)
+                    if ".fer " in cmd:
+                        arg = re.sub('tests/ref', REF_PATH + r'/ref', arg)
+                    else:
+                        if inputs > 0:
+                            arg, count = re.subn('tests/dut', REF_PATH + r'/ref', arg)
+                            inputs = inputs - count
+                    arg = re.sub('tests', CUT_PATH, arg)
+                args.append(arg)
+            cmd = ' '.join(args)
+
+            #arg1 = cmd.split()[0]
+            #root_folder = arg1[0:arg1.find("ivas-codec/")+10]
+            #cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
+            #cmd = cmd.replace(r'\\', '/')
+            #cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
+            #cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths            
+            # inputs = cmd.count(root_folder) - 1
+            # if ".fer " in cmd:
+            #     cmd = cmd.replace(root_folder + r'/tests/ref', REF_PATH + r'ref', 1)
+            # else:
+            #     cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
+            # cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
             
             if 'VOIP' in cmd:
                 outfile = outfile_jbm
             else:
                 outfile = outfile_dec
-            
-            if not "pca" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd:            
-                outfile.write(cmd+'\n')
-                out = re.search(r"\s(([\S]+)(.wav))$", cmd)
-                if out:
-                    diff_cmds=[]
-                    for output in glob.glob(absolute_out.group(1) + '*'):
-                        output = output.replace(root_folder + r'/tests/', CUT_PATH)
-                        diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+output+' >> $LOG_FILE 2>&1')
-                    outfile.write(('; ').join(diff_cmds))
-                outfile.write('\n\n')
+                        
+            outfile.write(cmd+'\n')
+            out = re.search(r"\s(([\S]+)(.wav))$", cmd)
+            if out:
+                diff_cmds=[]
+                for output in glob.glob(absolute_out.group(1) + '*'):
+                    output = path.relpath(output).replace('\\','/')
+                    output = re.sub('tests', CUT_PATH, output)
+                    diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'/dut',REF_PATH + r'/ref')+' '+output+' >> $LOG_FILE 2>&1')
+                outfile.write(('; ').join(diff_cmds))
+            outfile.write('\n\n')
         with open('script_footer.txt','r') as footer:
             outfile_dec.write(footer.read())    
             footer.seek(0)
@@ -101,21 +123,33 @@ if __name__ == '__main__':
         with open('rend_header.txt','r') as header:
             outfile.write(header.read())
         for cmd in cmds_rend:
-            arg1 = cmd.split()[0]
-            root_folder = arg1[0:arg1.find("ivas-codec/")+10]
+            args = []
+            for arg in cmd.split():
+                # Adjust file arguments, pass other arguments as they are
+                if path.exists(arg):
+                    arg = path.relpath(arg).replace('\\','/')
+                    arg = re.sub('IVAS_rend(.exe)?', '$CUT_REND_BIN', arg)
+                    arg = re.sub('scripts', TESTV_PATH, arg)
+                    arg = re.sub('tests/renderer/data', TESTV_PATH + r'renderer/data/', arg)
+                    arg = re.sub('tests', CUT_PATH, arg)
+                args.append(arg)
+            cmd = ' '.join(args)
+
+            # arg1 = cmd.split()[0]
+            # root_folder = arg1[0:arg1.find("ivas-codec/")+10]
         
-            cmd = cmd.replace(r'\\', '/')
+            # cmd = cmd.replace(r'\\', '/')
   
-            cmd = cmd.replace(root_folder + r'/IVAS_rend', '$CUT_REND_BIN')
-            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            cmd = cmd.replace(root_folder + r'/tests/renderer/data/', TESTV_PATH + r'renderer/data/')            
-            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            
+            # cmd = cmd.replace(root_folder + r'/IVAS_rend', '$CUT_REND_BIN')
+            # cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
+            # cmd = cmd.replace(root_folder + r'/tests/renderer/data/', TESTV_PATH + r'renderer/data/')            
+            # cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            
 
             if "cut" in cmd:
                 outfile.write(cmd+'\n')
             out = re.search(r"-o\s(([\S]+)(.wav|.raw|.pcm))", cmd)
             if out and "cut" in out.group(1):
-                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'renderer/cut',REF_PATH + r'renderer/ref')+' '+out.group(1)+' >> $LOG_FILE 2>&1\n')
+                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'/renderer/cut',REF_PATH + r'/renderer/ref')+' '+out.group(1)+' >> $LOG_FILE 2>&1\n')
                 outfile.write('\n')            
         with open('script_footer.txt','r') as footer:
             outfile.write(footer.read())                
\ No newline at end of file
-- 
GitLab


From 00fd99b00dd67faaca1bf1f48a2ef067b6cdfc8c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 08:53:35 +0100
Subject: [PATCH 143/163] Fixes in parse_commands.py

---
 parse_commands.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/parse_commands.py b/parse_commands.py
index 1cf6accde5..f2cefd52e9 100644
--- a/parse_commands.py
+++ b/parse_commands.py
@@ -69,20 +69,17 @@ if __name__ == '__main__':
             absolute_out = re.search(r"\s(([\S]+)(.wav))$", cmd)
 
             args = []
-            inputs = sum([1 if path.exists(a) else 0 for a in cmd.split()]) - 2 # One is the exec, one is the output, rest is inputs
             for arg in cmd.split():
                 # Adjust file arguments, pass other arguments as they are
                 if path.exists(arg):
                     arg = path.relpath(arg).replace('\\','/')
                     arg = re.sub('IVAS_dec(.exe)?', '$CUT_DEC_BIN', arg)
                     arg = re.sub('scripts', TESTV_PATH, arg)
-                    if ".fer " in cmd:
-                        arg = re.sub('tests/ref', REF_PATH + r'/ref', arg)
+                    arg = re.sub('tests/ref', REF_PATH + r'/ref', arg) # For .fer cases the bitstream is in ref
+                    if re.search("\.wav$",arg):
+                        arg = re.sub('tests', CUT_PATH, arg) # Output argument for decoder ends with .wav
                     else:
-                        if inputs > 0:
-                            arg, count = re.subn('tests/dut', REF_PATH + r'/ref', arg)
-                            inputs = inputs - count
-                    arg = re.sub('tests', CUT_PATH, arg)
+                        arg = re.sub('tests/dut', REF_PATH + r'/ref', arg) # Input argument
                 args.append(arg)
             cmd = ' '.join(args)
 
-- 
GitLab


From c68fa456caa26356c3d7e6736e9538543bbce55c Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 09:49:14 +0100
Subject: [PATCH 144/163] Merge tests/renderer/conftest.py with
 tests/conftest.py

---
 tests/conftest.py          | 11 ++++++++++
 tests/renderer/conftest.py | 44 --------------------------------------
 2 files changed, 11 insertions(+), 44 deletions(-)
 delete mode 100644 tests/renderer/conftest.py

diff --git a/tests/conftest.py b/tests/conftest.py
index fd3c4a0898..c66de954d9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -164,6 +164,17 @@ def pytest_addoption(parser):
         default="0",
     )
 
+    parser.addoption(
+        "--create_ref",
+        action="store_true",
+        default=False,
+    )
+    parser.addoption(
+        "--create_cut",
+        action="store_true",
+        default=False,
+    )
+
 @pytest.fixture(scope="session", autouse=True)
 def update_ref(request):
     """
diff --git a/tests/renderer/conftest.py b/tests/renderer/conftest.py
deleted file mode 100644
index 4668d742db..0000000000
--- a/tests/renderer/conftest.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-"""
-
-
-def pytest_addoption(parser):
-    parser.addoption(
-        "--create_ref",
-        action="store_true",
-        default=False,
-    )
-    parser.addoption(
-        "--create_cut",
-        action="store_true",
-        default=False,
-    )
-- 
GitLab


From 1b622b7a9acfd35d33505bdebec1c713479e21b8 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 10:42:52 +0100
Subject: [PATCH 145/163] Updates for Windows runner

---
 .gitlab-ci.yml | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7efd1b597..2b3055f750 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1221,10 +1221,8 @@ test-be-to-release:
 
 
 ivas-conformance:
-  extends:
-    - .test-job-linux-needs-testv-dir
   tags:
-    - pytest-html-updated
+    - ivas-windows
   stage: test
   timeout: "60 minutes"
   rules:
@@ -1233,29 +1231,28 @@ ivas-conformance:
     exit_codes:
       - 123
   script:
-    - *print-common-info
+    - *print-common-info-windows
     # Prepare reference exec, use tests and scripts from reference
     - source_branch_commit_sha=$(git rev-parse HEAD)
     - git checkout main # This should be set to a relevant reference
-    - make -j
-    - cp IVAS_cod IVAS_cod_ref
-    - cp IVAS_dec IVAS_dec_ref
-    - cp IVAS_rend IVAS_rend_ref
+    - py .\scripts\strip_split_rendering.py
+    - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
+    - cp IVAS_cod.exe IVAS_cod_ref.exe
+    - cp IVAS_dec.exe IVAS_dec_ref.exe
+    - cp IVAS_rend.exe IVAS_rend_ref.exe
     - git restore .
     - git checkout $source_branch_commit_sha
     
     # Reference creation
-    - non_be_flag=0
-    - exit_code=0
-    - python3 tests/create_short_testvectors.py
-    - python3 scripts/prepare_combined_format_inputs.py
-    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref --html=report1.html --self-contained-html --keep_files || exit_code=$?
-    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 --keep_files || exit_code=$?
-    - python3 -m pytest tests/renderer/test_renderer.py --create_ref --keep_files || exit_code=$?
+    - python tests/create_short_testvectors.py
+    - python scripts/prepare_combined_format_inputs.py
+    - python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --html=report1.html --self-contained-html --keep_files
+    - python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
+    - python -m pytest tests/renderer/test_renderer.py --create_ref --keep_files
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html || exit_code=$?
-    - python3 parse_commands.py report_cmd.html Readme_IVAS.txt
+    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
+    - python parse_commands.py report_cmd.html Readme_IVAS.txt
     
     
     # Copy input data and output ref data
@@ -1278,12 +1275,9 @@ ivas-conformance:
     
     # Test run generated scripts in testvec
     - cd testvec    
-    - exit_code=0    
-    - python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
-    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
+    - python -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html
     - mv report.html ..
     - mv report-junit.xml ..
-    - *merge-request-comparison-check
 
   artifacts:
     name: "ivas-conformance-$CI_COMMIT_SHORT_SHA"
-- 
GitLab


From b4335305652bce63ab8c3ad0b4d39a5b6086b642 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 10:49:21 +0100
Subject: [PATCH 146/163] Fix for windows

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b3055f750..6bc4070c19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1233,7 +1233,7 @@ ivas-conformance:
   script:
     - *print-common-info-windows
     # Prepare reference exec, use tests and scripts from reference
-    - source_branch_commit_sha=$(git rev-parse HEAD)
+    - source_branch_commit_sha = $(git rev-parse HEAD)
     - git checkout main # This should be set to a relevant reference
     - py .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
-- 
GitLab


From 9268140327772ab72910bd3c8634ba7eac5ad00a Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 10:55:21 +0100
Subject: [PATCH 147/163] Fix for windows

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bc4070c19..ab295e5c27 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1233,7 +1233,7 @@ ivas-conformance:
   script:
     - *print-common-info-windows
     # Prepare reference exec, use tests and scripts from reference
-    - source_branch_commit_sha = $(git rev-parse HEAD)
+    - $source_branch_commit_sha = $(git rev-parse HEAD)
     - git checkout main # This should be set to a relevant reference
     - py .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
-- 
GitLab


From c80d12d8e1eef013dfb1f226d1a6749363d157cd Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 11:14:38 +0100
Subject: [PATCH 148/163] Shorten name of tests due to 255 character file name
 limit on Windows

---
 scripts/config/self_test.prm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm
index 25cef6b5e6..ef7e879851 100644
--- a/scripts/config/self_test.prm
+++ b/scripts/config/self_test.prm
@@ -1424,37 +1424,37 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP EXT 48 netsimoutput testv/stv2MASA2TC48c.wav_sw_48-48_EXT_JBM5.tst
 
-// OMASA 2Dir2TC 1ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_IR out, JBM Prof 5
+// OMASA 2Dir2TC 1ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_IR out, JBM Prof 5
 ../IVAS_cod -ism_masa 1 2 testv/stvISM1.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_1ism.bin 48 testv/stvOMASA_1ISM_2MASA2TC48c.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP BINAURAL_ROOM_IR 48 netsimoutput testv/stvOMASA_1ISM_2MASA2TC48c.wav_BINAURAL_ROOM_IR_sw_48-48_JBM5.tst
 
-// OMASA 2Dir2TC 2ISM at bitrate switching techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, 7.1 out, JBM Prof 5
+// OMASA 2Dir2TC 2ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, 7.1 out, JBM Prof 5
 ../IVAS_cod -ism_masa 2 2 testv/stvISM1.csv NULL testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_2ism.bin 48 testv/stvOMASA_2ISM_2MASA2TC48c.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP 7_1 48 netsimoutput testv/stvOMASA_2ISM_2MASA2TC48c.wav_7_1_sw_48-48_JBM5.tst
 
-// OMASA 2Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, MONO out, JBM Prof 5
+// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, MONO out, JBM Prof 5
 ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_160k_omasatechs_3ism.bin 48 testv/stvOMASA_3ISM_2MASA2TC48c.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP MONO 48 netsimoutput testv/stvOMASA_3ISM_2MASA2TC48c.wav_MONO_sw_48-48_JBM5.tst
 
-// OMASA 2Dir1TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, JBM Prof 5
+// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, JBM Prof 5
 ../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA1TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/stvOMASA_3ISM_2MASA1TC48c.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP STEREO 32 netsimoutput testv/stvOMASA_3ISM_2MASA1TC48c.wav_STEREO_sw_48-32_JBM5.tst
 
-// OMASA 1Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.2 out, JBM Prof 5
+// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.2 out, JBM Prof 5
 ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/stvOMASA_3ISM_1MASA2TC32c.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP 5_1_2 48 netsimoutput testv/stvOMASA_3ISM_1MASA2TC32c.wav_5_1_2_sw_32-48_JBM5.tst
 
-// OMASA 1Dir1TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, JBM Prof 5
+// OMASA 1Dir1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, JBM Prof 5
 ../IVAS_cod -ism_masa 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA1TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_1MASA1TC48c.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP BINAURAL 48 netsimoutput testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_sw_48-48_JBM5.tst
 
-// OMASA 1Dir2TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, FOA out, JBM Prof 5
+// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, FOA out, JBM Prof 5
 ../IVAS_cod -ism_masa 4 2 NULL testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_80k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_1MASA2TC48c.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP FOA 48 netsimoutput testv/stvOMASA_4ISM_1MASA2TC48c.wav_FOA_sw_48-48_JBM5.tst
@@ -1569,29 +1569,29 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 
 
 
-// OMASA 2Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, MONO out
+// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, MONO out
 ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_160k_omasatechs_3ism.bin 48 testv/stvOMASA_3ISM_2MASA2TC48c.wav bit
 ../IVAS_dec MONO 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_MONO_sw_48-48.tst
 
-// OMASA 2Dir1TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, FER at 10%
+// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, FER at 10%
 ../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA1TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/stvOMASA_3ISM_2MASA1TC48c.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
 ../IVAS_dec STEREO 32 bit_error testv/stvOMASA_3ISM_2MASA1TC48c.wav_STEREO_sw_48-32_FER10.tst
 
-// OMASA 1Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.4 out
+// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.4 out
 ../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/stvOMASA_3ISM_1MASA2TC32c.wav bit
 ../IVAS_dec 5_1_4 48 bit testv/stvOMASA_3ISM_1MASA2TC32c.wav_5_1_4_sw_32-48.tst
 
-// OMASA 1Dir1TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 5%
+// OMASA 1Dir1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 5%
 ../IVAS_cod -ism_masa 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA1TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_1MASA1TC48c.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 48 bit_error testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_sw_48-48_FER5.tst
 
-// OMASA 1Dir2TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, HOA3 out
+// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, HOA3 out
 ../IVAS_cod -ism_masa 4 2 NULL testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_80k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_1MASA2TC48c.wav bit
 ../IVAS_dec HOA3 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_HOA3_sw_48-48.tst
 
-// OMASA 2Dir2TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out
+// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out
 ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit
 ../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_ROOM_REVERB_sw_48-48.tst
 
-- 
GitLab


From 43f33d6bdcf59aad6dfdb48d6c6a70ede8e4fd25 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 11:56:48 +0100
Subject: [PATCH 149/163] Shorten test names

---
 scripts/config/self_test.prm | 92 ++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm
index ef7e879851..fc77c76ed6 100644
--- a/scripts/config/self_test.prm
+++ b/scripts/config/self_test.prm
@@ -303,27 +303,27 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 32000 32 testv/stv32n.wav bit
 ../IVAS_dec MONO 32 bit testv/stv32n.wav_1ISM_32000_32-32_DTX_MONO.tst
 
-// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, head rotation, random FER at 5%
+// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, HR, random FER at 5%
 ../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit_error testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR.tst
 
-// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, random FER at 5%
+// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, random FER at 5%
 ../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL 48 bit_error testv/stv1ISM48s.wav_64000_48-48_FER5_binaural_HR.tst
 
-// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, head rotation, external orientation, random FER at 5%
+// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, HR, exo, random FER at 5%
 ../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit_error testv/stv1ISM48s.wav_64000_48-48_FER5_binaural_room_HR_EXOF.tst
 
-// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, random FER at 5%
+// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), HR, random FER at 5%
 ../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_FER5_binaural_file_TDHR.tst
 
-// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, external orientation, random FER at 5%
+// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), HR, exo, random FER at 5%
 ../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_FER5_binaural_file_TDHR_EXOF.tst
@@ -374,11 +374,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 80000 48 testv/stvST48n.wav bit
 ../IVAS_dec STEREO 48 bit testv/stvST48n.wav_2ISM_80000_48-48_DTX_STEREO.tst
 
-// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation
+// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), HR
 ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit
 ../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_binaural_file_TDHR.tst
 
-// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation, external orientation
+// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), HR, exo
 ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit
 ../IVAS_dec -t testv/headrot_case01_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_binaural_file_TDHR_EXOF.tst
 
@@ -421,7 +421,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_binauralfile.tst
 
-// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, random FER at 5%
+// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, random FER at 5%
 ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case02_3000_q.csv BINAURAL 48 bit_error testv/stv3ISM48s.wav_192000_48-48_binaural_file_TDHR_FER5.tst
@@ -447,7 +447,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48n.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stv4ISM48n.wav_32000_48-48_DTX_BINAURAL.tst
 
-// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, external orientation
+// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit
 ../IVAS_dec -t testv/headrot_case03_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural_file_TDHR_EXOF.tst
 
@@ -493,11 +493,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_binaural.tst
 
-// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation
+// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR
 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
 ../IVAS_dec -t testv/headrot_case03_3000_q.csv BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_binaural_file_TDHR.tst
 
-// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, external orientation
+// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
 ../IVAS_dec -t testv/headrot_case03_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_binaural_file_TDHR_EXOF.tst
 
@@ -505,11 +505,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stv4ISM48s.wav bit
 ../IVAS_dec 5_1 48 bit testv/stv4ISM48s.wav_512000_48-48_5_1.tst
 
-// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, Orientation tracking
+// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, HR, OT
 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 48 bit testv/stv4ISM48s.pcm_256000_48-48_TDHR_OtrAvg.tst
 
-// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, external orientation, Orientation tracking
+// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, HR, exo, OT
 ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL 48 bit testv/stv4ISM48s.pcm_256000_48-48_TDHR_EXOF_OtrAvg.tst
 
@@ -521,12 +521,12 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 4 testv/stvISM1.csv NULL NULL testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48n.wav bit
 ../IVAS_dec HOA3 48 bit testv/stv4ISM48n.wav_brate_sw_48-48_DTX_hoa3.tst
 
-// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, directivity configuration, random FER at 5%
+// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, directivity configuration, random FER at 5%
 ../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -render_config testv/config_directivity_txt.cfg -t testv/headrot_case04_3000_q.csv BINAURAL 48 bit_error testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_DirConfig_FER5.tst
 
-// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, external orientation, directivity configuration, random FER at 5%
+// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, exo, directivity configuration, random FER at 5%
 ../IVAS_cod -ism +4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -render_config testv/config_directivity.cfg -t testv/headrot_case04_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit_error testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_EXOF_DirConfig_FER5.tst
@@ -573,15 +573,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_Binaural_Headrot.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, external orientation
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, exo
 ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_Binaural_Headrot_EXOF.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, Orientation tracking
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, OT
 ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 32 bit testv/stv3OA32c.pcm_SBA_24400_32-32_Binaural_Headrot_OtrAvg.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, external orientation, Orientation tracking
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, exo, OT
 ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL 32 bit testv/stv3OA32c.pcm_SBA_24400_32-32_Binaural_Headrot_EXOF_OtrAvg.tst
 
@@ -594,7 +594,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 -dtx 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_DTX_Binaural_Headrot.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation, external orientation
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation, exo
 ../IVAS_cod -sba 3 -dtx 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_DTX_Binaural_Headrot_EXOF.tst
 
@@ -636,15 +636,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Headrot.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, exo
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Headrot_EXOF.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, Orientation tracking
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, OT
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrAvg.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, Orientation tracking, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, OT, exo
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrAvg.tst
 
@@ -652,7 +652,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPos.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, reference vector tracking, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, reference vector tracking, exo
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrRefPos.tst
 
@@ -660,7 +660,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPosLev.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, reference vector tracking in level mode, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, reference vector tracking in level mode, exo
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrRefPosLev.tst
 
@@ -673,7 +673,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 -dtx 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_DTX_Binaural_Headrot.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation, exo
 ../IVAS_cod -sba 3 -dtx 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_DTX_Binaural_Headrot_EXOF.tst
 
@@ -719,7 +719,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 80000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_80000_32-32_Binaural_Headrot.tst
 
-// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, external orientation
+// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, exo
 ../IVAS_cod -sba 3 80000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_80000_32-32_Binaural_Headrot_EXOF.tst
 
@@ -735,15 +735,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_128000_32-32_Binaural_room_Headrot.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, external orientation
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, exo
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_128000_32-32_Binaural_room_Headrot_EXOF.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, Orientation tracking
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, OT
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_OtrAvg.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, Orientation tracking, external orientation
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, OT, exo
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_EXOF_OtrAvg.tst
 
@@ -781,7 +781,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 256000 32 testv/stvFOA32c.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stvFOA32c.wav_SBA_256000_32-32_BINAURAL_ROOM.tst
 
-// SBA at 256 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, external orientation
+// SBA at 256 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, exo
 ../IVAS_cod -sba 1 256000 32 testv/stvFOA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/stvFOA32c.wav_SBA_256000_32-32_BinauralRoom_Headrot_EXOF.tst
 
@@ -798,7 +798,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -sba 3 512000 48 testv/stv3OA48c.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_binaural.tst
 
-// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
 ../IVAS_cod -sba 3 512000 48 testv/stv3OA48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_Binaural_Headrot_EXOF.tst
 
@@ -904,7 +904,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom_Headrot.tst
 
-// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, external orientation
+// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, exo
 ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom_Headrot_EXOF.tst
 
@@ -934,7 +934,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 1 testv/stv2MASA1TC48c.met 128000 48 testv/stv2MASA1TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv2MASA1TC48c.wav_128000_48-48_BINAURAL_Headrot.tst
 
-// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
 ../IVAS_cod -masa 1 testv/stv2MASA1TC48c.met 128000 48 testv/stv2MASA1TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv2MASA1TC48c.wav_128000_48-48_BINAURAL_Headrot_EXOF.tst
 
@@ -959,15 +959,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom_Headrot.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, external orientation
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, exo
 ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom_Headrot_EXOF.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, Orientation tracking
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, OT
 ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_OtrAvg.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, Orientation tracking, external orientation
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, OT, exo
 ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_EXOF_OtrAvg.tst
 
@@ -1006,7 +1006,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 64000 48 testv/stv2MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv2MASA2TC48c.wav_64000_48-48_BINAURAL_Headrot.tst
 
-// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
 ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 64000 48 testv/stv2MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv2MASA2TC48c.wav_64000_48-48_BINAURAL_Headrot_EXOF.tst
 
@@ -1107,7 +1107,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 24400 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_24400_48-48_Binaural_Headrot.tst
 
-// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
 ../IVAS_cod -mc 5_1 24400 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_24400_48-48_Binaural_Headrot_EXOF.tst
 
@@ -1124,7 +1124,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_Headrot.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
 ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_Headrot_EXOF.tst
 
@@ -1132,7 +1132,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_room_Headrot.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, external orientation
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, exo
 ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_room_Headrot_EXOF.tst
 
@@ -1149,7 +1149,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 128000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_128000_48-48_Binaural_Headrot.tst
 
-// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
 ../IVAS_cod -mc 5_1 128000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_128000_48-48_Binaural_Headrot_EXOF.tst
 
@@ -1166,19 +1166,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec MONO 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_mono.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, head rotation
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_BinauralRoom_Headrot.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, head rotation, external orientation
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_BinauralRoom_Headrot_EXOF.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, head rotation, Orientation tracking
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, OT
 ../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.pcm_MC51_256000_48-48_BinauralRoom_Headrot_OtrAvg.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, head rotation, Orientation tracking, external orientation
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, OT, exo
 ../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.pcm_MC51_256000_48-48_BinauralRoom_EXOF_OtrAvg.tst
 
@@ -1305,7 +1305,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
 ../IVAS_dec -render_config testv/rend_config_ER_v3.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv714MC48c.wav_MC714_512000_48-48_MC_ER_v3.tst
 
-// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config early reflections, head rotation
+// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config early reflections, HR
 ../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -render_config testv/rend_config_ER_v1.cfg -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_ER_v1_hrot.tst
 
-- 
GitLab


From 6388f89e3432ebb49345da1f4ddabdfdb443a4aa Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 14:11:54 +0100
Subject: [PATCH 150/163] Force copy to allow overwrite when forming testvec
 folder

---
 .gitlab-ci.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab295e5c27..a82b2eee33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1237,9 +1237,9 @@ ivas-conformance:
     - git checkout main # This should be set to a relevant reference
     - py .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
-    - cp IVAS_cod.exe IVAS_cod_ref.exe
-    - cp IVAS_dec.exe IVAS_dec_ref.exe
-    - cp IVAS_rend.exe IVAS_rend_ref.exe
+    - cp -force IVAS_cod.exe IVAS_cod_ref.exe
+    - cp -force IVAS_dec.exe IVAS_dec_ref.exe
+    - cp -force IVAS_rend.exe IVAS_rend_ref.exe
     - git restore .
     - git checkout $source_branch_commit_sha
     
@@ -1256,20 +1256,21 @@ ivas-conformance:
     
     
     # Copy input data and output ref data
+    - rm -r -force testvec
     - mkdir testvec
     - mkdir testvec/binauralRenderer_interface
     - mkdir testvec/testv
     - mkdir testvec/testv/renderer
     - mkdir testvec/bin    
-    - cp -r scripts/testv/* testvec/testv
-    - cp -r scripts/ls_layouts testvec
-    - cp -r scripts/switchPaths testvec
-    - cp -r scripts/trajectories testvec
-    - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
-    - cp -r tests/ref testvec/testv/ref
-    - cp -r tests/dut/* testvec/testv/ref
-    - cp -r tests/renderer/cut testvec/testv/renderer/ref
-    - cp -r conformance-test testvec/
+    - cp -r -force scripts/testv/* testvec/testv
+    - cp -r -force scripts/ls_layouts testvec
+    - cp -r -force scripts/switchPaths testvec
+    - cp -r -force scripts/trajectories testvec
+    - cp -r -force scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
+    - cp -r -force tests/ref testvec/testv/ref
+    - cp -r -force tests/dut/* testvec/testv/ref
+    - cp -r -force tests/renderer/cut testvec/testv/renderer/ref
+    - cp -r -force conformance-test testvec/
     - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
     
-- 
GitLab


From 79f1767a9646731d94584f6824e09a8e8a237f41 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 14:59:35 +0100
Subject: [PATCH 151/163] Ignore errors to do cp/rm without stopping in
 PowerShell

---
 .gitlab-ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a82b2eee33..8cac3e5f65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1256,21 +1256,21 @@ ivas-conformance:
     
     
     # Copy input data and output ref data
-    - rm -r -force testvec
+    - rm -r -force -ErrorAction Ignore testvec
     - mkdir testvec
     - mkdir testvec/binauralRenderer_interface
     - mkdir testvec/testv
     - mkdir testvec/testv/renderer
     - mkdir testvec/bin    
-    - cp -r -force scripts/testv/* testvec/testv
-    - cp -r -force scripts/ls_layouts testvec
-    - cp -r -force scripts/switchPaths testvec
-    - cp -r -force scripts/trajectories testvec
-    - cp -r -force scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
-    - cp -r -force tests/ref testvec/testv/ref
-    - cp -r -force tests/dut/* testvec/testv/ref
-    - cp -r -force tests/renderer/cut testvec/testv/renderer/ref
-    - cp -r -force conformance-test testvec/
+    - cp -r -force -ErrorAction Ignore scripts/testv/* testvec/testv
+    - cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec
+    - cp -r -force -ErrorAction Ignore scripts/switchPaths testvec
+    - cp -r -force -ErrorAction Ignore scripts/trajectories testvec
+    - cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
+    - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref
+    - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref
+    - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref
+    - cp -r -force -ErrorAction Ignore conformance-test testvec/
     - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
     
-- 
GitLab


From 2964ed1044eb09211148d2ad356c54d23998ff39 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 15:33:48 +0100
Subject: [PATCH 152/163] Change cleanup of testvec not to halt when it does
 not exist

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8cac3e5f65..5411c7959c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1256,7 +1256,7 @@ ivas-conformance:
     
     
     # Copy input data and output ref data
-    - rm -r -force -ErrorAction Ignore testvec
+    - if (Test-Path testvec) {rm -r -force testvec}
     - mkdir testvec
     - mkdir testvec/binauralRenderer_interface
     - mkdir testvec/testv
-- 
GitLab


From 53e521e31e6411e2fc06ae62710aee04324dc95d Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 15:49:11 +0100
Subject: [PATCH 153/163] Fix copying of scripts

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5411c7959c..66c7e1d839 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1271,7 +1271,10 @@ ivas-conformance:
     - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref
     - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref
     - cp -r -force -ErrorAction Ignore conformance-test testvec/
-    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec
+    - cp Readme_IVAS_dec.txt testvec
+    - cp Readme_IVAS_enc.txt testvec 
+    - cp Readme_IVAS_rend.txt testvec
+    - cp Readme_IVAS_JBM_dec.txt testvec
     - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
     
     # Test run generated scripts in testvec
-- 
GitLab


From 8977758eda0ee6d60802eb2cf78df73bdb809b86 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 16:04:19 +0100
Subject: [PATCH 154/163] Fix for exec copying

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66c7e1d839..6496590d97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1275,7 +1275,9 @@ ivas-conformance:
     - cp Readme_IVAS_enc.txt testvec 
     - cp Readme_IVAS_rend.txt testvec
     - cp Readme_IVAS_JBM_dec.txt testvec
-    - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin
+    - cp IVAS_cod.exe testvec/bin
+    - cp IVAS_dec.exe testvec/bin
+    - cp IVAS_rend.exe testvec/bin
     
     # Test run generated scripts in testvec
     - cd testvec    
-- 
GitLab


From b8e34f0d1d7c8a94a60f1922abc23f6c4b1f5147 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 16:23:02 +0100
Subject: [PATCH 155/163] Move scripts into scripts folder

---
 .gitlab-ci.yml                                     | 14 ++++++++------
 dec_header.txt => scripts/dec_header.txt           |  0
 enc_header.txt => scripts/enc_header.txt           |  0
 jbm_header.txt => scripts/jbm_header.txt           |  0
 parse_commands.py => scripts/parse_commands.py     |  0
 rend_header.txt => scripts/rend_header.txt         |  0
 script_footer.txt => scripts/script_footer.txt     |  0
 .../conformance-test}/conftest.py                  |  0
 .../conformance-test}/pytest.ini                   |  0
 .../conformance-test}/test_26252.py                |  0
 10 files changed, 8 insertions(+), 6 deletions(-)
 rename dec_header.txt => scripts/dec_header.txt (100%)
 rename enc_header.txt => scripts/enc_header.txt (100%)
 rename jbm_header.txt => scripts/jbm_header.txt (100%)
 rename parse_commands.py => scripts/parse_commands.py (100%)
 rename rend_header.txt => scripts/rend_header.txt (100%)
 rename script_footer.txt => scripts/script_footer.txt (100%)
 rename {conformance-test => tests/conformance-test}/conftest.py (100%)
 rename {conformance-test => tests/conformance-test}/pytest.ini (100%)
 rename {conformance-test => tests/conformance-test}/test_26252.py (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6496590d97..efa6dc698c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1252,7 +1252,9 @@ ivas-conformance:
 
     # Output creation
     - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
-    - python parse_commands.py report_cmd.html Readme_IVAS.txt
+    - cd scripts
+    - python parse_commands.py ../report_cmd.html Readme_IVAS.txt
+    - cd ..
     
     
     # Copy input data and output ref data
@@ -1270,11 +1272,11 @@ ivas-conformance:
     - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref
     - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref
     - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref
-    - cp -r -force -ErrorAction Ignore conformance-test testvec/
-    - cp Readme_IVAS_dec.txt testvec
-    - cp Readme_IVAS_enc.txt testvec 
-    - cp Readme_IVAS_rend.txt testvec
-    - cp Readme_IVAS_JBM_dec.txt testvec
+    - cp -r -force -ErrorAction Ignore tests/conformance-test testvec/
+    - cp scripts/Readme_IVAS_dec.txt testvec
+    - cp scripts/Readme_IVAS_enc.txt testvec 
+    - cp scripts/Readme_IVAS_rend.txt testvec
+    - cp scripts/Readme_IVAS_JBM_dec.txt testvec
     - cp IVAS_cod.exe testvec/bin
     - cp IVAS_dec.exe testvec/bin
     - cp IVAS_rend.exe testvec/bin
diff --git a/dec_header.txt b/scripts/dec_header.txt
similarity index 100%
rename from dec_header.txt
rename to scripts/dec_header.txt
diff --git a/enc_header.txt b/scripts/enc_header.txt
similarity index 100%
rename from enc_header.txt
rename to scripts/enc_header.txt
diff --git a/jbm_header.txt b/scripts/jbm_header.txt
similarity index 100%
rename from jbm_header.txt
rename to scripts/jbm_header.txt
diff --git a/parse_commands.py b/scripts/parse_commands.py
similarity index 100%
rename from parse_commands.py
rename to scripts/parse_commands.py
diff --git a/rend_header.txt b/scripts/rend_header.txt
similarity index 100%
rename from rend_header.txt
rename to scripts/rend_header.txt
diff --git a/script_footer.txt b/scripts/script_footer.txt
similarity index 100%
rename from script_footer.txt
rename to scripts/script_footer.txt
diff --git a/conformance-test/conftest.py b/tests/conformance-test/conftest.py
similarity index 100%
rename from conformance-test/conftest.py
rename to tests/conformance-test/conftest.py
diff --git a/conformance-test/pytest.ini b/tests/conformance-test/pytest.ini
similarity index 100%
rename from conformance-test/pytest.ini
rename to tests/conformance-test/pytest.ini
diff --git a/conformance-test/test_26252.py b/tests/conformance-test/test_26252.py
similarity index 100%
rename from conformance-test/test_26252.py
rename to tests/conformance-test/test_26252.py
-- 
GitLab


From 707906f6ff949a49c8f16755def94de63440741f Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 16:50:25 +0100
Subject: [PATCH 156/163] parse_commands.py needs to be run from project root

---
 .gitlab-ci.yml            | 13 +++++--------
 scripts/parse_commands.py | 14 +++++++-------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efa6dc698c..c67f7e0ac2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1252,10 +1252,7 @@ ivas-conformance:
 
     # Output creation
     - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
-    - cd scripts
-    - python parse_commands.py ../report_cmd.html Readme_IVAS.txt
-    - cd ..
-    
+    - python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt
     
     # Copy input data and output ref data
     - if (Test-Path testvec) {rm -r -force testvec}
@@ -1273,10 +1270,10 @@ ivas-conformance:
     - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref
     - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref
     - cp -r -force -ErrorAction Ignore tests/conformance-test testvec/
-    - cp scripts/Readme_IVAS_dec.txt testvec
-    - cp scripts/Readme_IVAS_enc.txt testvec 
-    - cp scripts/Readme_IVAS_rend.txt testvec
-    - cp scripts/Readme_IVAS_JBM_dec.txt testvec
+    - cp Readme_IVAS_dec.txt testvec
+    - cp Readme_IVAS_enc.txt testvec 
+    - cp Readme_IVAS_rend.txt testvec
+    - cp Readme_IVAS_JBM_dec.txt testvec
     - cp IVAS_cod.exe testvec/bin
     - cp IVAS_dec.exe testvec/bin
     - cp IVAS_rend.exe testvec/bin
diff --git a/scripts/parse_commands.py b/scripts/parse_commands.py
index f2cefd52e9..af98e668f5 100644
--- a/scripts/parse_commands.py
+++ b/scripts/parse_commands.py
@@ -39,7 +39,7 @@ if __name__ == '__main__':
                     cmds_rend.extend(re.findall(r"Running command\\n(.*?)\\n", line))
 
     with open(txt_file.replace('.','_enc.'),'w', newline='\n') as outfile:
-        with open('enc_header.txt','r') as header:
+        with open('scripts/enc_header.txt','r') as header:
             outfile.write(header.read())
         for cmd in cmds_enc:
             args = []
@@ -57,13 +57,13 @@ if __name__ == '__main__':
             if bts:
                 outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'/dut',REF_PATH + r'/ref')+' '+bts.group(1)+' >> $LOG_FILE 2>&1\n')
             outfile.write('\n')
-        with open('script_footer.txt','r') as footer:
+        with open('scripts/script_footer.txt','r') as footer:
             outfile.write(footer.read())                        
 
     with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_JBM_dec.'),'w', newline='\n') as outfile_jbm:
-        with open('dec_header.txt','r') as header:
+        with open('scripts/dec_header.txt','r') as header:
             outfile_dec.write(header.read())
-        with open('jbm_header.txt','r') as header:            
+        with open('scripts/jbm_header.txt','r') as header:            
             outfile_jbm.write(header.read())
         for cmd in cmds_dec:
             absolute_out = re.search(r"\s(([\S]+)(.wav))$", cmd)
@@ -111,13 +111,13 @@ if __name__ == '__main__':
                     diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'/dut',REF_PATH + r'/ref')+' '+output+' >> $LOG_FILE 2>&1')
                 outfile.write(('; ').join(diff_cmds))
             outfile.write('\n\n')
-        with open('script_footer.txt','r') as footer:
+        with open('scripts/script_footer.txt','r') as footer:
             outfile_dec.write(footer.read())    
             footer.seek(0)
             outfile_jbm.write(footer.read())
 
     with open(txt_file.replace('.','_rend.'),'w', newline='\n') as outfile:
-        with open('rend_header.txt','r') as header:
+        with open('scripts/rend_header.txt','r') as header:
             outfile.write(header.read())
         for cmd in cmds_rend:
             args = []
@@ -148,5 +148,5 @@ if __name__ == '__main__':
             if out and "cut" in out.group(1):
                 outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'/renderer/cut',REF_PATH + r'/renderer/ref')+' '+out.group(1)+' >> $LOG_FILE 2>&1\n')
                 outfile.write('\n')            
-        with open('script_footer.txt','r') as footer:
+        with open('scripts/script_footer.txt','r') as footer:
             outfile.write(footer.read())                
\ No newline at end of file
-- 
GitLab


From c24e05f2e0a205dc709f6dd2e378d800bc6ab544 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 13 Feb 2024 16:55:49 +0100
Subject: [PATCH 157/163] Remove obsolete tests/split_rendering/conftest.py

---
 tests/split_rendering/conftest.py | 44 -------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 tests/split_rendering/conftest.py

diff --git a/tests/split_rendering/conftest.py b/tests/split_rendering/conftest.py
deleted file mode 100644
index c4c8b05174..0000000000
--- a/tests/split_rendering/conftest.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository. All Rights Reserved.
-
-   This software is protected by copyright law and by international treaties.
-   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
-   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
-   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
-   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
-   contributors to this repository retain full ownership rights in their respective contributions in
-   the software. This notice grants no license of any kind, including but not limited to patent
-   license, nor is any license granted by implication, estoppel or otherwise.
-
-   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
-   contributions.
-
-   This software is provided "AS IS", without any express or implied warranties. The software is in the
-   development stage. It is intended exclusively for experts who have experience with such software and
-   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
-   and fitness for a particular purpose are hereby disclaimed and excluded.
-
-   Any dispute, controversy or claim arising under or in relation to providing this software shall be
-   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
-   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
-   the United Nations Convention on Contracts on the International Sales of Goods.
-"""
-
-
-def pytest_addoption(parser):
-    parser.addoption(
-        "--create_ref",
-        action="store_true",
-        default=False,
-    )
-    parser.addoption(
-        "--create_cut",
-        action="store_true",
-        default=False,
-    )
-- 
GitLab


From ed932a58c9dfe1b49c5a3e19ebe234ce05ad8293 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 14 Feb 2024 13:02:28 +0100
Subject: [PATCH 158/163] Cleanup in parse_commands.py and test_param_file.py

---
 scripts/parse_commands.py                     | 23 -------------------
 .../test_param_file.py                        |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/scripts/parse_commands.py b/scripts/parse_commands.py
index af98e668f5..fe1a1840ad 100644
--- a/scripts/parse_commands.py
+++ b/scripts/parse_commands.py
@@ -82,19 +82,6 @@ if __name__ == '__main__':
                         arg = re.sub('tests/dut', REF_PATH + r'/ref', arg) # Input argument
                 args.append(arg)
             cmd = ' '.join(args)
-
-            #arg1 = cmd.split()[0]
-            #root_folder = arg1[0:arg1.find("ivas-codec/")+10]
-            #cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')
-            #cmd = cmd.replace(r'\\', '/')
-            #cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            #cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths            
-            # inputs = cmd.count(root_folder) - 1
-            # if ".fer " in cmd:
-            #     cmd = cmd.replace(root_folder + r'/tests/ref', REF_PATH + r'ref', 1)
-            # else:
-            #     cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)
-            # cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)
             
             if 'VOIP' in cmd:
                 outfile = outfile_jbm
@@ -132,16 +119,6 @@ if __name__ == '__main__':
                 args.append(arg)
             cmd = ' '.join(args)
 
-            # arg1 = cmd.split()[0]
-            # root_folder = arg1[0:arg1.find("ivas-codec/")+10]
-        
-            # cmd = cmd.replace(r'\\', '/')
-  
-            # cmd = cmd.replace(root_folder + r'/IVAS_rend', '$CUT_REND_BIN')
-            # cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)
-            # cmd = cmd.replace(root_folder + r'/tests/renderer/data/', TESTV_PATH + r'renderer/data/')            
-            # cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            
-
             if "cut" in cmd:
                 outfile.write(cmd+'\n')
             out = re.search(r"-o\s(([\S]+)(.wav|.raw|.pcm))", cmd)
diff --git a/tests/codec_be_on_mr_nonselection/test_param_file.py b/tests/codec_be_on_mr_nonselection/test_param_file.py
index caf725a3c6..b502f44f01 100644
--- a/tests/codec_be_on_mr_nonselection/test_param_file.py
+++ b/tests/codec_be_on_mr_nonselection/test_param_file.py
@@ -165,7 +165,7 @@ def test_param_file_tests(
         not bitrate.isdigit()
         and "-dtx" in enc_split
         and "-sba" in enc_split
-        and testv_file.split("/")[test_vector_path.count("/")+1].startswith("stv")
+        and Path(testv_file).name.startswith("stv")
     ):
         sba_br_switching_dtx = 1
         cut_file = pre_proc_input(testv_file, fs)
-- 
GitLab


From aa3be0aa5cee83589f5c22cbff67221e4838ec38 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 14 Feb 2024 13:19:44 +0100
Subject: [PATCH 159/163] Fix long test names in self_test_ltv.prm

---
 scripts/config/self_test_ltv.prm | 124 +++++++++++++++----------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm
index 1951ef3b8e..8db2af9693 100644
--- a/scripts/config/self_test_ltv.prm
+++ b/scripts/config/self_test_ltv.prm
@@ -302,27 +302,27 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv 32000 32 testv/ltv32_1ISM.wav bit
 ../IVAS_dec MONO 32 bit testv/ltv32_1ISM.wav_1ISM_32000_32-32_DTX_MONO.tst
 
-// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, head rotation, random FER at 5%
+// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, HR, random FER at 5%
 ../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_room_HR.tst
 
-// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, random FER at 5%
+// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, random FER at 5%
 ../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_HR.tst
 
-// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, head rotation, external orientation, random FER at 5%
+// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, HR, exo, random FER at 5%
 ../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_room_HR_EXOF.tst
 
-// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, random FER at 5%
+// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), HR, random FER at 5%
 ../IVAS_cod -ism 1 testv/ltvISM1.csv 80000 48 testv/ltv48_1ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/ltv48_1ISM.wav_80000_48-16_binaural_file_TDHR_FER5.tst
 
-// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, external orientation, random FER at 5%
+// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), HR, exo, random FER at 5%
 ../IVAS_cod -ism 1 testv/ltvISM1.csv 80000 48 testv/ltv48_1ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/ltv48_1ISM.wav_80000_48-16_binaural_file_TDHR_EXOF_FER5.tst
@@ -373,11 +373,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 80000 48 testv/ltv48_2ISM.wav bit
 ../IVAS_dec STEREO 48 bit testv/ltv48_2ISM.wav_2ISM_80000_48-48_DTX_STEREO.tst
 
-// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation
+// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), HR
 ../IVAS_cod -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 128000 48 testv/ltv48_2ISM.wav bit
 ../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/ltv48_2ISM.wav_128000_48-32_binaural_file_TDHR.tst
 
-// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation, external orientation
+// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), HR, exo
 ../IVAS_cod -ism 2 testv/ltvISM1.csv testv/ltvISM2.csv 128000 48 testv/ltv48_2ISM.wav bit
 ../IVAS_dec -t testv/headrot_case01_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/ltv48_2ISM.wav_128000_48-32_binaural_file_TDHR_EXOF.tst
 
@@ -420,7 +420,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism 3 testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 192000 48 testv/ltv48_3ISM.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/ltv48_3ISM.wav_192000_48-48_binauralfile.tst
 
-// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, random FER at 5%
+// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, random FER at 5%
 ../IVAS_cod -ism 3 testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 192000 48 testv/ltv48_3ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case02_3000_q.csv BINAURAL 48 bit_error testv/ltv48_3ISM.wav_192000_48-48_binaural_file_TDHR_FER5.tst
@@ -446,7 +446,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 32000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/ltv48_4ISM.wav_32000_48-48_DTX_BINAURAL.tst
 
-// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, external orientation
+// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 32000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec -t testv/headrot_case03_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_4ISM.wav_32000_48-48_binaural_file_TDHR_EXOF.tst
 
@@ -492,11 +492,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/ltv48_4ISM.wav_256000_48-48_binaural.tst
 
-// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation
+// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec -t testv/headrot_case03_3000_q.csv BINAURAL 48 bit testv/ltv48_4ISM.wav_256000_48-48_binaural_file_TDHR.tst
 
-// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, external orientation
+// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec -t testv/headrot_case03_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_4ISM.wav_256000_48-48_binaural_file_TDHR_EXOF.tst
 
@@ -504,11 +504,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 512000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec 5_1 48 bit testv/ltv48_4ISM.wav_512000_48-48_5_1.tst
 
-// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, Orientation tracking
+// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, HR, OT
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 48 bit testv/ltv48_4ISM.wav_256000_48-48_TDHR_OtrAvg.tst
 
-// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, external orientation, Orientation tracking
+// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, HR, exo, OT
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL 48 bit testv/ltv48_4ISM.wav_256000_48-48_TDHR_EXOF_OtrAvg.tst
 
@@ -520,12 +520,12 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 4 testv/ltvISM1.csv NULL NULL testv/ltvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec HOA3 48 bit testv/ltv48_4ISM.wav_brate_sw_48-48_DTX_hoa3.tst
 
-// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, directivity configuration, random FER at 5%
+// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, directivity configuration, random FER at 5%
 ../IVAS_cod -ism +4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -render_config testv/config_directivity_txt.cfg -t testv/headrot_case04_3000_q.csv BINAURAL 48 bit_error testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_DirConfig_FER5.tst
 
-// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, external orientation, directivity configuration, random FER at 5%
+// 4 ISM with extended metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, exo, directivity configuration, random FER at 5%
 ../IVAS_cod -ism +4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 256000 48 testv/ltv48_4ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -render_config testv/config_directivity.cfg -t testv/headrot_case04_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit_error testv/stv+4ISM48s.wav_256000_48-48_binaural_file_TDHR_EXOF_DirConfig_FER5.tst
@@ -564,19 +564,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 32 bit_error testv/ltv32_HOA3.wav_SBA_24400_32-32_Binaural_Subframe_FER5.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, HR
 ../IVAS_cod -sba 3 24400 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_24400_32-32_Binaural_Headrot.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, external orientation
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -sba 3 24400 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_24400_32-32_Binaural_Headrot_EXOF.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, Orientation tracking
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, HR, OT
 ../IVAS_cod -sba 3 24400 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_24400_32-32_Binaural_Headrot_OtrAvg.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, external orientation, Orientation tracking
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, HR, exo, OT
 ../IVAS_cod -sba 3 24400 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_24400_32-32_Binaural_Headrot_EXOF_OtrAvg.tst
 
@@ -585,11 +585,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 32 bit_error testv/ltv32_HOA3.wav_SBA_24400_32-32_DTX_Binaural_FER5.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, HR
 ../IVAS_cod -sba 3 -dtx 24400 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_24400_32-32_DTX_Binaural_Headrot.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation, external orientation
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, HR, exo
 ../IVAS_cod -sba 3 -dtx 24400 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_24400_32-32_DTX_Binaural_Headrot_EXOF.tst
 
@@ -627,35 +627,35 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom_Subframe.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom_Headrot.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, exo
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom_Headrot_EXOF.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, OT
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrAvg.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, OT, exo
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrAvg.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, reference vector tracking
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, reference vector tracking
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPos.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, reference vector tracking, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, reference vector tracking, exo
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrRefPos.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, reference vector tracking in level mode
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, reference vector tracking in level mode
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPosLev.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, reference vector tracking in level mode, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, reference vector tracking in level mode, exo
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrRefPosLev.tst
 
@@ -664,11 +664,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 32 bit_error testv/ltv32_HOA3.wav_SBA_48000_32-32_DTX_Binaural_FER5.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation
+// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, HR
 ../IVAS_cod -sba 3 -dtx 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_DTX_Binaural_Headrot.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation, external orientation
+// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, HR, exo
 ../IVAS_cod -sba 3 -dtx 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_DTX_Binaural_Headrot_EXOF.tst
 
@@ -706,11 +706,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 32 bit_error testv/ltv32_HOA3.wav_SBA_80000_32-32_Binaural_FER5.tst
 
-// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation
+// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, HR
 ../IVAS_cod -sba 3 80000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_80000_32-32_Binaural_Headrot.tst
 
-// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, external orientation
+// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -sba 3 80000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/ltv32_HOA3.wav_SBA_80000_32-32_Binaural_Headrot_EXOF.tst
 
@@ -722,19 +722,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 96000 48 testv/ltv48_FOA.wav bit
 ../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_SBA_96000_48-48_FOA.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_128000_32-32_Binaural_room_Headrot.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, external orientation
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, exo
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_128000_32-32_Binaural_room_Headrot_EXOF.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, OT
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_OtrAvg.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking, external orientation
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, OT, exo
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_EXOF_OtrAvg.tst
 
@@ -772,7 +772,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 256000 32 testv/ltv32_FOA.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/ltv32_FOA.wav_SBA_256000_32-32_BINAURAL_ROOM.tst
 
-// SBA at 256 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, external orientation
+// SBA at 256 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, exo
 ../IVAS_cod -sba 1 256000 32 testv/ltv32_FOA.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_FOA.wav_SBA_256000_32-32_BinauralRoom_Headrot_EXOF.tst
 
@@ -789,7 +789,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -sba 3 512000 48 testv/ltv48_HOA3.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/ltv48_HOA3.wav_SBA_512000_48-48_binaural.tst
 
-// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -sba 3 512000 48 testv/ltv48_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_HOA3.wav_SBA_512000_48-48_Binaural_Headrot_EXOF.tst
 
@@ -855,11 +855,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom_Subframe.tst
 
-// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation
+// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom_Headrot.tst
 
-// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation, external orientation
+// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, exo
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom_Headrot_EXOF.tst
 
@@ -885,11 +885,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 128000 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/ltv48_MASA1TC.wav_128000_48-48_BINAURAL_Subframe.tst
 
-// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 128000 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/ltv48_MASA1TC.wav_128000_48-48_BINAURAL_Headrot.tst
 
-// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 128000 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_MASA1TC.wav_128000_48-48_BINAURAL_Headrot_EXOF.tst
 
@@ -910,19 +910,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_BinauralRoom.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_BinauralRoom_Headrot.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation, external orientation
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, exo
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_BinauralRoom_Headrot_EXOF.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, OT
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_OtrAvg.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking, external orientation
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, OT, exo
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_EXOF_OtrAvg.tst
 
@@ -957,11 +957,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec EXT 48 bit_error testv/ltv48_MASA2TC.wav_64000_48-48_external_FER5.tst
 
-// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 64000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/ltv48_MASA2TC.wav_64000_48-48_BINAURAL_Headrot.tst
 
-// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 64000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_MASA2TC.wav_64000_48-48_BINAURAL_Headrot_EXOF.tst
 
@@ -1058,11 +1058,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -mc 5_1 24400 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_24400_48-48_Binaural_Subframe.tst
 
-// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -mc 5_1 24400 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_24400_48-48_Binaural_Headrot.tst
 
-// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -mc 5_1 24400 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_24400_48-48_Binaural_Headrot_EXOF.tst
 
@@ -1075,19 +1075,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 64000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_64000_48-48_Binaural.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -mc 5_1 64000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_64000_48-48_Binaural_Headrot.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -mc 5_1 64000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_64000_48-48_Binaural_Headrot_EXOF.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR
 ../IVAS_cod -mc 5_1 64000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MC51.wav_MC51_64000_48-48_Binaural_room_Headrot.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation, external orientation
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, exo
 ../IVAS_cod -mc 5_1 64000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MC51.wav_MC51_64000_48-48_Binaural_room_Headrot_EXOF.tst
 
@@ -1100,11 +1100,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 128000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_128000_48-48_Binaural.tst
 
-// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -mc 5_1 128000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_128000_48-48_Binaural_Headrot.tst
 
-// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, external orientation
+// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -mc 5_1 128000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_128000_48-48_Binaural_Headrot_EXOF.tst
 
@@ -1121,19 +1121,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec MONO 48 bit testv/ltv48_MC51.wav_MC51_256000_48-48_mono.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, head rotation
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MC51.wav_MC51_256000_48-48_BinauralRoom_Headrot.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, head rotation, external orientation
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, exo
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MC51.wav_MC51_256000_48-48_BinauralRoom_Headrot_EXOF.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, head rotation, Orientation tracking
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, OT
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.pcm_MC51_256000_48-48_BinauralRoom_Headrot_OtrAvg.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, head rotation, Orientation tracking, external orientation
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, OT, exo
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.pcm_MC51_256000_48-48_BinauralRoom_EXOF_OtrAvg.tst
 
@@ -1248,7 +1248,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 7_1_4 512000 48 testv/ltv48_MC714.wav bit
 ../IVAS_dec -render_config testv/rend_config_ER_v3.cfg BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MC714.wav_MC714_512000_48-48_MC_ER_v3.tst
 
-// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config early reflections, head rotation
+// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config early reflections, HR
 ../IVAS_cod -mc 5_1 512000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -render_config testv/rend_config_ER_v1.cfg -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MC51.wav_MC51_512000_48-48_MC_ER_v1_hrot.tst
 
-- 
GitLab


From 8b650cdd5a43bbbe3b59ebbc1b7eab8394590553 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 21 Feb 2024 09:20:39 +0100
Subject: [PATCH 160/163] Added lock functionality for creation of fer
 bitstreams. Synchronized test names in self_test.prm and self_test_ltv.prm

---
 scripts/config/self_test.prm     | 104 ++++++++++++-------------
 scripts/config/self_test_ltv.prm | 125 ++++++++++++++++---------------
 tests/conftest.py                |  15 ++--
 3 files changed, 125 insertions(+), 119 deletions(-)

diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm
index a24dac7a4d..0d930c6692 100644
--- a/scripts/config/self_test.prm
+++ b/scripts/config/self_test.prm
@@ -569,19 +569,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 32 bit_error testv/stv3OA32c.wav_SBA_24400_32-32_Binaural_Subframe_FER5.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, HR
 ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_Binaural_Headrot.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, exo
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_Binaural_Headrot_EXOF.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, OT
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, HR, OT
 ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 32 bit testv/stv3OA32c.pcm_SBA_24400_32-32_Binaural_Headrot_OtrAvg.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, exo, OT
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, HR, exo, OT
 ../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL 32 bit testv/stv3OA32c.pcm_SBA_24400_32-32_Binaural_Headrot_EXOF_OtrAvg.tst
 
@@ -590,11 +590,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 32 bit_error testv/stv3OA32c.wav_SBA_24400_32-32_DTX_Binaural_FER5.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, HR
 ../IVAS_cod -sba 3 -dtx 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_DTX_Binaural_Headrot.tst
 
-// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation, exo
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, HR, exo
 ../IVAS_cod -sba 3 -dtx 24400 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_DTX_Binaural_Headrot_EXOF.tst
 
@@ -611,7 +611,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 32000 32 testv/stvFOA32c.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stvFOA32c.wav_SBA_32000_32-32_BINAURAL_ROOM.tst
 
-// SBA at 32 kbps, 48kHz in, 48kHz out, MONO out, DTX,bandwidth switching
+// SBA at 32 kbps, 48kHz in, 48kHz out, MONO out, DTX, bandwidth switching
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -dtx -sba 1 32000 48 testv/stvFOA48c.wav bit
 ../IVAS_dec MONO 48 bit testv/stvFOA48c.wav_SBA_32000_48-48_DTX_MONO.tst
 
@@ -632,35 +632,35 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Subframe.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Headrot.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, exo
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Headrot_EXOF.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, OT
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, OT
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrAvg.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, OT, exo
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, OT, exo
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrAvg.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, reference vector tracking
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, reference vector tracking
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPos.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, reference vector tracking, exo
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, reference vector tracking, exo
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrRefPos.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, reference vector tracking in level mode
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, reference vector tracking in level mode
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPosLev.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, reference vector tracking in level mode, exo
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, reference vector tracking in level mode, exo
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrRefPosLev.tst
 
@@ -669,11 +669,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 32 bit_error testv/stv3OA32c.wav_SBA_48000_32-32_DTX_Binaural_FER5.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation
+// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, HR
 ../IVAS_cod -sba 3 -dtx 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_DTX_Binaural_Headrot.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, Headrotation, exo
+// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, DTX on, HR, exo
 ../IVAS_cod -sba 3 -dtx 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_DTX_Binaural_Headrot_EXOF.tst
 
@@ -715,11 +715,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 32 bit_error testv/stv3OA32c.wav_SBA_80000_32-32_Binaural_FER5.tst
 
-// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation
+// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, HR
 ../IVAS_cod -sba 3 80000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_80000_32-32_Binaural_Headrot.tst
 
-// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, exo
+// SBA at 80 kbps, 32kHz in, 32kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -sba 3 80000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_80000_32-32_Binaural_Headrot_EXOF.tst
 
@@ -731,19 +731,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 96000 48 testv/stvFOA48c.wav bit
 ../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_96000_48-48_FOA.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_128000_32-32_Binaural_room_Headrot.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, exo
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.wav_SBA_128000_32-32_Binaural_room_Headrot_EXOF.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, OT
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, OT
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_OtrAvg.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, OT, exo
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, OT, exo
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_EXOF_OtrAvg.tst
 
@@ -781,7 +781,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 256000 32 testv/stvFOA32c.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stvFOA32c.wav_SBA_256000_32-32_BINAURAL_ROOM.tst
 
-// SBA at 256 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, Headrotation, exo
+// SBA at 256 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -sba 1 256000 32 testv/stvFOA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/stvFOA32c.wav_SBA_256000_32-32_BinauralRoom_Headrot_EXOF.tst
 
@@ -798,7 +798,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -sba 3 512000 48 testv/stv3OA48c.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_binaural.tst
 
-// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
+// SBA 3OA at 512 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -sba 3 512000 48 testv/stv3OA48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv3OA48c.wav_SBA_512000_48-48_Binaural_Headrot_EXOF.tst
 
@@ -850,35 +850,35 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 -max_band fb ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvFOA48c.wav bit
 ../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_sw_48-48_FOA.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, Headrotation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, HR
 ../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_REVERB 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoomReverb_Headrot.tst
 
-// Planar SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, Headrotation
+// Planar SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, HR
 ../IVAS_cod -sba -2 48000 32 testv/stv2OA32c.wav bit
 ../IVAS_dec -t testv/headrot.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/stv2OA32c.pcm_planarSBA_48000_32-32_BinauralRoomReverb_Config_renderer_Headrot.tst
 
-// SBA at 48 kbps, 32kHz in, 48kHz out, BINAURAL_ROOM_REVERB out (Model from file), Headrotation
+// SBA at 48 kbps, 32kHz in, 48kHz out, BINAURAL_ROOM_REVERB out (Model from file), HR
 ../IVAS_cod -sba 1 48000 32 testv/stvFOA32c.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin -t testv/headrot.csv BINAURAL_ROOM_REVERB 48 bit testv/stvFOA32c.pcm_SBA_48000_32-48_BinauralRoomReverb_Headrot_BinauralFile.tst
 
-// Planar SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, Headrotation
+// Planar SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, HR
 ../IVAS_cod -sba -3 48000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin -t testv/headrot.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/stv3OA32c.pcm_planarSBA_48000_32-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst
 
-// SBA at 128 kbps, 32kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out Headrotation
+// SBA at 128 kbps, 32kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out HR
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_REVERB 32 bit testv/stv3OA32c.pcm_SBA_12800032-32_BinauralRoomReverb_Headrot.tst
 
-// SBA at 128 kbps, 32kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, Headrotation
+// SBA at 128 kbps, 32kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, HR
 ../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/stv3OA32c.pcm_SBA_12800032-32_BinauralRoomReverb_Config_renderer_Headrot.tst
 
-// SBA at 128 kbps, 32kHZ in, 16kHz out, BINAURAL_ROOM_REVERB out (Model from file), Headrotation
+// SBA at 128 kbps, 32kHZ in, 16kHz out, BINAURAL_ROOM_REVERB out (Model from file), HR
 ../IVAS_cod -sba 2 128000 32 testv/stv2OA32c.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_REVERB 16 bit testv/stv2OA32c.pcm_SBA_12800032-16_BinauralRoomReverb_Headrot_BinauralFile.tst
 
-// Planar SBA at 128 kbps, 48kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, Headrotation
+// Planar SBA at 128 kbps, 48kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, HR
 ../IVAS_cod -sba -1 128000 48 testv/stvFOA48c.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin -t testv/headrot_case00_3000_q.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/stvFOA48c.pcm_planarSBA_12800032-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst
 
@@ -901,11 +901,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom_Subframe.tst
 
-// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation
+// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom_Headrot.tst
 
-// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, exo
+// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom_Headrot_EXOF.tst
 
@@ -931,11 +931,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 1 testv/stv2MASA1TC48c.met 128000 48 testv/stv2MASA1TC48c.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stv2MASA1TC48c.wav_128000_48-48_BINAURAL_Subframe.tst
 
-// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -masa 1 testv/stv2MASA1TC48c.met 128000 48 testv/stv2MASA1TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv2MASA1TC48c.wav_128000_48-48_BINAURAL_Headrot.tst
 
-// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
+// MASA 2dir 1TC at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -masa 1 testv/stv2MASA1TC48c.met 128000 48 testv/stv2MASA1TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv2MASA1TC48c.wav_128000_48-48_BINAURAL_Headrot_EXOF.tst
 
@@ -956,19 +956,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom_Headrot.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, exo
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom_Headrot_EXOF.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, OT
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, OT
 ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_OtrAvg.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, OT, exo
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, OT, exo
 ../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_EXOF_OtrAvg.tst
 
@@ -1003,11 +1003,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec EXT 48 bit_error testv/stv2MASA2TC48c.wav_64000_48-48_external_FER5.tst
 
-// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 64000 48 testv/stv2MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv2MASA2TC48c.wav_64000_48-48_BINAURAL_Headrot.tst
 
-// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
+// MASA 2dir 2TC at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 64000 48 testv/stv2MASA2TC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv2MASA2TC48c.wav_64000_48-48_BINAURAL_Headrot_EXOF.tst
 
@@ -1024,7 +1024,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 2 testv/stv2MASA2TC48c.met 384000 48 testv/stv2MASA2TC48c.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv2MASA2TC48c.wav_384000_48-48_BinauralRoom.tst
 
-// MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out, bandwidth switching
+// MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM IR out, bandwidth switching
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -masa 2 testv/stv2MASA2TC48c.met 384000 48 testv/stv2MASA2TC48c.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stv2MASA2TC48c.wav_384000_48-48_BinauralRoom_Subframe.tst
 
@@ -1103,11 +1103,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -mc 5_1 24400 48 testv/stv51MC48c.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stv51MC48c.wav_MC51_24400_48-48_Binaural_Subframe.tst
 
-// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -mc 5_1 24400 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_24400_48-48_Binaural_Headrot.tst
 
-// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
+// Multi-channel 5_1 at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -mc 5_1 24400 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_24400_48-48_Binaural_Headrot_EXOF.tst
 
@@ -1120,19 +1120,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_Headrot.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_Headrot_EXOF.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_room_Headrot.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, Headrotation, exo
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_room_Headrot_EXOF.tst
 
@@ -1145,11 +1145,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 128000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec BINAURAL 48 bit testv/stv51MC48c.wav_MC51_128000_48-48_Binaural.tst
 
-// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation
+// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, HR
 ../IVAS_cod -mc 5_1 128000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_128000_48-48_Binaural_Headrot.tst
 
-// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, Headrotation, exo
+// Multi-channel 5_1 at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, HR, exo
 ../IVAS_cod -mc 5_1 128000 48 testv/stv51MC48c.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/stv51MC48c.wav_MC51_128000_48-48_Binaural_Headrot_EXOF.tst
 
diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm
index 09564f01a6..aacd0afc63 100644
--- a/scripts/config/self_test_ltv.prm
+++ b/scripts/config/self_test_ltv.prm
@@ -303,7 +303,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv 32000 32 testv/ltv32_1ISM.wav bit
 ../IVAS_dec MONO 32 bit testv/ltv32_1ISM.wav_1ISM_32000_32-32_DTX_MONO.tst
 
-// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, HR, random FER at 5%
+// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, HR, random FER at 5%
 ../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_room_HR.tst
@@ -313,7 +313,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_HR.tst
 
-// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, HR, exo, random FER at 5%
+// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, HR, exo, random FER at 5%
 ../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_room_HR_EXOF.tst
@@ -358,7 +358,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec EXT 48 bit_error testv/ltv48_2ISM.wav_48000_48-48_EXT_FER5.tst
 
-// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out
+// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out
 ../IVAS_cod -ism 2 testv/ltvISM3.csv testv/ltvISM4.csv 64000 48 testv/ltv48_2ISM.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_2ISM.wav_64000_48-48_binaural_room.tst
 
@@ -451,17 +451,17 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 32000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec -t testv/headrot_case03_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_4ISM.wav_32000_48-48_binaural_file_TDHR_EXOF.tst
 
-// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, random FER at 5%
+// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, random FER at 5%
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 32000 48 testv/ltv48_4ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit_error testv/ltv48_4ISM.wav_32000_48-48_binaural_room_FER5.tst
 
-// 4 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL ROOM out, random FER at 5%
+// 4 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL ROOM IR out, random FER at 5%
 ../IVAS_cod -dtx -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 48000 48 testv/ltv48_4ISM.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit_error testv/ltv48_4ISM.wav_48000_48-48_DTX_TD_binaural_room_FER5.tst
 
-// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out
+// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out
 ../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 64000 48 testv/ltv48_4ISM.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_4ISM.wav_64000_48-48_binaural_room.tst
 
@@ -624,43 +624,43 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec STEREO 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_stereo.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom_Subframe.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom_Headrot.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, exo
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_48000_32-32_BinauralRoom_Headrot_EXOF.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, OT
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, OT
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrAvg.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, OT, exo
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, OT, exo
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrAvg.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, reference vector tracking
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, reference vector tracking
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPos.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, reference vector tracking, exo
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, reference vector tracking, exo
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrRefPos.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, reference vector tracking in level mode
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, reference vector tracking in level mode
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPosLev.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, reference vector tracking in level mode, exo
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, reference vector tracking in level mode, exo
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_EXOF_OtrRefPosLev.tst
 
@@ -731,19 +731,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 96000 48 testv/ltv48_FOA.wav bit
 ../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_SBA_96000_48-48_FOA.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_128000_32-32_Binaural_room_Headrot.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, exo
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_HOA3.wav_SBA_128000_32-32_Binaural_room_Headrot_EXOF.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, OT
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, OT
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_OtrAvg.tst
 
-// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, OT, exo
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, OT, exo
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_EXOF_OtrAvg.tst
 
@@ -781,7 +781,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 256000 32 testv/ltv32_FOA.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/ltv32_FOA.wav_SBA_256000_32-32_BINAURAL_ROOM.tst
 
-// SBA at 256 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, HR, exo
+// SBA at 256 kbps, 32kHz in, 32kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -sba 1 256000 32 testv/ltv32_FOA.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 32 bit testv/ltv32_FOA.wav_SBA_256000_32-32_BinauralRoom_Headrot_EXOF.tst
 
@@ -850,35 +850,35 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -sba 1 -max_band fb ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/ltv48_FOA.wav bit
 ../IVAS_dec FOA 48 bit testv/ltv48_FOA.wav_sw_48-48_FOA.tst
 
-// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, Headrotation
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, HR
 ../IVAS_cod -sba 3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_REVERB 32 bit testv/ltv32_HOA3.pcm_SBA_48000_32-32_BinauralRoomReverb_Headrot.tst
 
-// Planar SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, Headrotation
+// Planar SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, HR
 ../IVAS_cod -sba -2 48000 32 testv/ltv32_HOA2.wav bit
 ../IVAS_dec -t testv/headrot.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/ltv32_HOA2.pcm_planarSBA_48000_32-32_BinauralRoomReverb_Config_renderer_Headrot.tst
 
-// SBA at 48 kbps, 32kHz in, 48kHz out, BINAURAL_ROOM_REVERB out (Model from file), Headrotation
+// SBA at 48 kbps, 32kHz in, 48kHz out, BINAURAL_ROOM_REVERB out (Model from file), HR
 ../IVAS_cod -sba 1 48000 32 testv/ltv32_FOA.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin -t testv/headrot.csv BINAURAL_ROOM_REVERB 48 bit testv/ltv32_FOA.pcm_SBA_48000_32-48_BinauralRoomReverb_Headrot_BinauralFile.tst
 
-// Planar SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, Headrotation
+// Planar SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, HR
 ../IVAS_cod -sba -3 48000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin -t testv/headrot.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/ltv32_HOA3.pcm_planarSBA_48000_32-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst
 
-// SBA at 128 kbps, 32kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out Headrotation
+// SBA at 128 kbps, 32kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out HR
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_REVERB 32 bit testv/ltv32_HOA3.pcm_SBA_12800032-32_BinauralRoomReverb_Headrot.tst
 
-// SBA at 128 kbps, 32kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, Headrotation
+// SBA at 128 kbps, 32kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out, Config renderer, HR
 ../IVAS_cod -sba 3 128000 32 testv/ltv32_HOA3.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/ltv32_HOA3.pcm_SBA_12800032-32_BinauralRoomReverb_Config_renderer_Headrot.tst
 
-// SBA at 128 kbps, 32kHZ in, 16kHz out, BINAURAL_ROOM_REVERB out (Model from file), Headrotation
+// SBA at 128 kbps, 32kHZ in, 16kHz out, BINAURAL_ROOM_REVERB out (Model from file), HR
 ../IVAS_cod -sba 2 128000 32 testv/ltv32_HOA2.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_REVERB 16 bit testv/ltv32_HOA2.pcm_SBA_12800032-16_BinauralRoomReverb_Headrot_BinauralFile.tst
 
-// Planar SBA at 128 kbps, 48kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, Headrotation
+// Planar SBA at 128 kbps, 48kHZ in, 32kHz out, BINAURAL_ROOM_REVERB out (Model from file), Config renderer, HR
 ../IVAS_cod -sba -1 128000 48 testv/ltv48_FOA.wav bit
 ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin -t testv/headrot_case00_3000_q.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/ltv48_FOA.pcm_planarSBA_12800032-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst
 
@@ -893,19 +893,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec HOA3 48 bit_error testv/ltv48_MASA1TC.wav_16400_48-48_HOA3_FER5.tst
 
-// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out
+// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom.tst
 
-// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out
+// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom_Subframe.tst
 
-// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR
+// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom_Headrot.tst
 
-// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, exo
+// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -masa 1 testv/ltv48_MASA1TC.met 24400 48 testv/ltv48_MASA1TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA1TC.wav_24400_48-48_BinauralRoom_Headrot_EXOF.tst
 
@@ -952,23 +952,23 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 24400 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec STEREO 48 bit testv/ltv48_MASA2TC.wav_24400_48-48_STEREO.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_BinauralRoom.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_BinauralRoom_Headrot.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, exo
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA2TC.wav_32000_48-48_BinauralRoom_Headrot_EXOF.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, OT
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, OT
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_OtrAvg.tst
 
-// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, OT, exo
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, OT, exo
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 32000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_EXOF_OtrAvg.tst
 
@@ -1020,13 +1020,14 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec 5_1_4 48 bit_error testv/ltv48_MASA2TC.wav_192000_48-48_5_1_4_FER5.tst
 
+// MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out
+../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 384000 48 testv/ltv48_MASA2TC.wav bit
+../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA2TC.wav_384000_48-48_BinauralRoom_Subframe.tst
+
 // MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM IR out, bandwidth switching
 ../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -masa 2 testv/ltv48_MASA2TC.met 384000 48 testv/ltv48_MASA2TC.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA2TC.wav_384000_48-48_BinauralRoom.tst
 
-// MASA 2dir 2TC at 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out
-../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 384000 48 testv/ltv48_MASA2TC.wav bit
-../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MASA2TC.wav_384000_48-48_BinauralRoom_Subframe.tst
 
 // MASA 2dir 2TC at 512 kbps, 48kHz in, 48kHz out, 5_1 out
 ../IVAS_cod -masa 2 testv/ltv48_MASA2TC.met 512000 48 testv/ltv48_MASA2TC.wav bit
@@ -1128,11 +1129,11 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 64000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL 48 bit testv/ltv48_MC51.wav_MC51_64000_48-48_Binaural_Headrot_EXOF.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -mc 5_1 64000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MC51.wav_MC51_64000_48-48_Binaural_room_Headrot.tst
 
-// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, exo
+// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -mc 5_1 64000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MC51.wav_MC51_64000_48-48_Binaural_room_Headrot_EXOF.tst
 
@@ -1158,7 +1159,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec STEREO 48 bit_error testv/ltv48_MC51.wav_MC51_256000_48-48_stereo_FER5.tst
 
-// Multi-channel 5_1 at 192 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out
+// Multi-channel 5_1 at 192 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out
 ../IVAS_cod -mc 5_1 192000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/ltv48_MC51.wav_MC51_192000_48-48_BinauralRoom.tst
 
@@ -1166,19 +1167,19 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec MONO 48 bit testv/ltv48_MC51.wav_MC51_256000_48-48_mono.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MC51.wav_MC51_256000_48-48_BinauralRoom_Headrot.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, exo
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, exo
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit testv/ltv48_MC51.wav_MC51_256000_48-48_BinauralRoom_Headrot_EXOF.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, OT
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, OT
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.pcm_MC51_256000_48-48_BinauralRoom_Headrot_OtrAvg.tst
 
-// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, HR, OT, exo
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM IR out, HR, OT, exo
 ../IVAS_cod -mc 5_1 256000 48 testv/ltv48_MC51.wav bit
 ../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL_ROOM_IR 48 bit testv/stv51MC48c.pcm_MC51_256000_48-48_BinauralRoom_EXOF_OtrAvg.tst
 
@@ -1423,37 +1424,37 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP EXT 48 netsimoutput testv/ltv48_MASA2TC.wav_sw_48-48_EXT_JBM5.tst
 
-// OMASA 2Dir2TC 1ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_IR out, JBM Prof 5
+// OMASA 2Dir2TC 1ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_IR out, JBM Prof 5
 ../IVAS_cod -ism_masa 1 2 testv/ltv48_OMASA_1ISM_2TC_ISM1.csv testv/ltv48_OMASA_1ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_1ism.bin 48 testv/ltv48_OMASA_1ISM_2TC.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP BINAURAL_ROOM_IR 48 netsimoutput testv/ltv48_OMASA_1ISM_2TC.wav_BINAURAL_ROOM_IR_sw_48-48_JBM5.tst
 
-// OMASA 2Dir2TC 2ISM at bitrate switching techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, 7.1 out, JBM Prof 5
+// OMASA 2Dir2TC 2ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, 7.1 out, JBM Prof 5
 ../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_2ISM_2TC_ISM1.csv NULL testv/ltv48_OMASA_2ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_2ism.bin 48 testv/ltv48_OMASA_2ISM_2TC.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP 7_1 48 netsimoutput testv/ltv48_OMASA_2ISM_2TC.wav_7_1_sw_48-48_JBM5.tst
 
-// OMASA 2Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, MONO out, JBM Prof 5
+// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, MONO out, JBM Prof 5
 ../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_160k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_2TC.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP MONO 48 netsimoutput testv/ltv48_OMASA_3ISM_2TC.wav_MONO_sw_48-48_JBM5.tst
 
-// OMASA 2Dir1TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, JBM Prof 5
+// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, JBM Prof 5
 ../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_3ISM_1TC_ISM1.csv testv/ltv48_OMASA_3ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_1TC.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP STEREO 32 netsimoutput testv/ltv48_OMASA_3ISM_1TC.wav_STEREO_sw_48-32_JBM5.tst
 
-// OMASA 1Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.2 out, JBM Prof 5
+// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.2 out, JBM Prof 5
 ../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP 5_1_2 48 netsimoutput testv/ltv32_OMASA_3ISM_2TC.wav_5_1_2_sw_32-48_JBM5.tst
 
-// OMASA 1Dir1TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, JBM Prof 5
+// OMASA 1Dir1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, JBM Prof 5
 ../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_4ISM_1TC_ISM1.csv testv/ltv48_OMASA_4ISM_1TC_ISM2.csv testv/ltv48_OMASA_4ISM_1TC_ISM3.csv testv/ltv48_OMASA_4ISM_1TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_1TC.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP BINAURAL 48 netsimoutput testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_sw_48-48_JBM5.tst
 
-// OMASA 1Dir2TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, FOA out, JBM Prof 5
+// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, FOA out, JBM Prof 5
 ../IVAS_cod -ism_masa 4 2 NULL testv/ltv48_OMASA_4ISM_2TC_ISM2.csv testv/ltv48_OMASA_4ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_80k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit
 networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
 ../IVAS_dec -Tracefile tracefile_dec -VOIP FOA 48 netsimoutput testv/ltv48_OMASA_4ISM_2TC.wav_FOA_sw_48-48_JBM5.tst
@@ -1571,29 +1572,29 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_dec EXT 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_EXT_384000_48-48.tst
 
 
-// OMASA 2Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, MONO out
+// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, MONO out
 ../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_160k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_2TC.wav bit
 ../IVAS_dec MONO 48 bit testv/ltv48_OMASA_3ISM_2TC.wav_MONO_sw_48-48.tst
 
-// OMASA 2Dir1TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, FER at 10%
+// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, FER at 10%
 ../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_3ISM_1TC_ISM1.csv testv/ltv48_OMASA_3ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_1TC.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
 ../IVAS_dec STEREO 32 bit_error testv/ltv48_OMASA_3ISM_1TC.wav_STEREO_sw_48-32.tst
 
-// OMASA 1Dir2TC 3ISM at bitrate switching techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.4 out
+// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.4 out
 ../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit
 ../IVAS_dec 5_1_4 48 bit testv/ltv32_OMASA_3ISM_2TC.wav_5_1_4_sw_32-48.tst
 
-// OMASA 1Dir1TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 5%
+// OMASA 1Dir1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 5%
 ../IVAS_cod -ism_masa 4 1 testv/ltv48_OMASA_4ISM_1TC_ISM1.csv testv/ltv48_OMASA_4ISM_1TC_ISM2.csv testv/ltv48_OMASA_4ISM_1TC_ISM3.csv testv/ltv48_OMASA_4ISM_1TC_ISM4.csv testv/ltv48_OMASA_4ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_1TC.wav bit
 eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
 ../IVAS_dec BINAURAL 48 bit_error testv/ltv48_OMASA_4ISM_1TC.wav_BINAURAL_sw_48-48_FER5.tst
 
-// OMASA 1Dir2TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, HOA3 out
+// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, HOA3 out
 ../IVAS_cod -ism_masa 4 2 NULL testv/ltv48_OMASA_4ISM_2TC_ISM2.csv testv/ltv48_OMASA_4ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_80k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit
 ../IVAS_dec HOA3 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_HOA3_sw_48-48.tst
 
-// OMASA 2Dir2TC 4ISM at bitrate switching techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out
+// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out
 ../IVAS_cod -ism_masa 4 2 testv/ltv48_OMASA_4ISM_2TC_ISM1.csv testv/ltv48_OMASA_4ISM_2TC_ISM2.csv testv/ltv48_OMASA_4ISM_2TC_ISM3.csv testv/ltv48_OMASA_4ISM_2TC_ISM4.csv testv/ltv48_OMASA_4ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/ltv48_OMASA_4ISM_2TC.wav bit
 ../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/ltv48_OMASA_4ISM_2TC.wav_BINAURAL_ROOM_REVERB_sw_48-48.tst
 
@@ -1683,7 +1684,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
 ../IVAS_cod -ism_sba 4 1 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 512000 32 testv/ltv32_OSBA_4ISM_FOA.wav bit
 ../IVAS_dec STEREO 48 bit testv/ltv32_OSBA_4ISM_FOA.wav_STEREO_512000_32-48.tst
 
-// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 48 out, EXT out
+// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 48kHz out, EXT out
 ../IVAS_cod -ism_sba 4 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/ltv32_OSBA_4ISM_HOA3.wav bit
 ../IVAS_dec EXT 48 bit testv/ltv32_OSBA_4ISM_HOA3.wav_EXT_sw_13k2_512k_32-32.tst
 
diff --git a/tests/conftest.py b/tests/conftest.py
index c3ac758fa4..503915a0c7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -42,6 +42,9 @@ import textwrap
 from pathlib import Path
 from subprocess import STDOUT, CalledProcessError, TimeoutExpired, run
 from typing import Optional, Union
+import threading
+
+lock = threading.Lock() # Lock for fer bitstreams
 
 logger = logging.getLogger(__name__)
 USE_LOGGER_FOR_DBG = False  # current tests do not make use of the logger feature
@@ -171,8 +174,6 @@ def pytest_addoption(parser):
         help="MLD limit for comparison (default: 0)",
         default="0",
     )
-
-<<<<<<< HEAD
     parser.addoption(
         "--create_ref",
         action="store_true",
@@ -183,8 +184,6 @@ def pytest_addoption(parser):
         action="store_true",
         default=False,
     )
-=======
->>>>>>> main
 
 @pytest.fixture(scope="session", autouse=True)
 def update_ref(request):
@@ -488,12 +487,18 @@ class DecoderFrontend:
                 str(input_bitstream_path) + eid_output_suffix,
             ]
 
+            # If the same bitstream is combined with the same error patterns multiple times, 
+            # the following section may create a race condition. Hence, it is guarded by a 
+            # lock and the file is only created if it does not exist already.
+            lock.aquire()
             try:
-                result = run(eid_command, check=True)
+                if not os.path.exists(str(input_bitstream_path) + eid_output_suffix):
+                    result = run(eid_command, check=True)
             except Exception as e:
                 print(result.stderr)
                 print(result.stdout)
                 pytest.fail(f"eid-xor operation failed!")
+            lock.release()
 
             input_bitstream_path += eid_output_suffix
 
-- 
GitLab


From ace603875fd9075dd62f30bcfadcaace8ddd8b38 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 21 Feb 2024 09:38:05 +0100
Subject: [PATCH 161/163] Fix syntax error in tests/conftest.py

---
 tests/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 503915a0c7..3fa55b15d2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -490,7 +490,7 @@ class DecoderFrontend:
             # If the same bitstream is combined with the same error patterns multiple times, 
             # the following section may create a race condition. Hence, it is guarded by a 
             # lock and the file is only created if it does not exist already.
-            lock.aquire()
+            lock.acquire()
             try:
                 if not os.path.exists(str(input_bitstream_path) + eid_output_suffix):
                     result = run(eid_command, check=True)
-- 
GitLab


From 00f8c8c6acebde050e23f7f8b036c5ecf8862e61 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 21 Feb 2024 10:58:43 +0100
Subject: [PATCH 162/163] Remove lock -- file names are unique and lock should
 not be needed

---
 tests/conftest.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 3fa55b15d2..0525bbf628 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -42,9 +42,6 @@ import textwrap
 from pathlib import Path
 from subprocess import STDOUT, CalledProcessError, TimeoutExpired, run
 from typing import Optional, Union
-import threading
-
-lock = threading.Lock() # Lock for fer bitstreams
 
 logger = logging.getLogger(__name__)
 USE_LOGGER_FOR_DBG = False  # current tests do not make use of the logger feature
@@ -487,10 +484,6 @@ class DecoderFrontend:
                 str(input_bitstream_path) + eid_output_suffix,
             ]
 
-            # If the same bitstream is combined with the same error patterns multiple times, 
-            # the following section may create a race condition. Hence, it is guarded by a 
-            # lock and the file is only created if it does not exist already.
-            lock.acquire()
             try:
                 if not os.path.exists(str(input_bitstream_path) + eid_output_suffix):
                     result = run(eid_command, check=True)
@@ -498,7 +491,6 @@ class DecoderFrontend:
                 print(result.stderr)
                 print(result.stdout)
                 pytest.fail(f"eid-xor operation failed!")
-            lock.release()
 
             input_bitstream_path += eid_output_suffix
 
-- 
GitLab


From 65dedc3346064481d9870164e0809ece017dfced Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 23 Feb 2024 11:25:34 +0100
Subject: [PATCH 163/163] Unify py->python for Windows jobs. Cleanup debugging
 html reports

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6eb57675be..4795924c08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -405,7 +405,7 @@ build-codec-windows-msbuild:
   script:
     - *print-common-info-windows
     - *activate-WX-windows
-    - py .\scripts\strip_split_rendering.py
+    - python .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug
 
 # ---------------------------------------------------------------
@@ -1236,7 +1236,7 @@ ivas-conformance:
     # Prepare reference exec, use tests and scripts from reference
     - $source_branch_commit_sha = $(git rev-parse HEAD)
     - git checkout main # This should be set to a relevant reference
-    - py .\scripts\strip_split_rendering.py
+    - python .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
     - cp -force IVAS_cod.exe IVAS_cod_ref.exe
     - cp -force IVAS_dec.exe IVAS_dec_ref.exe
@@ -1247,7 +1247,7 @@ ivas-conformance:
     # Reference creation
     - python tests/create_short_testvectors.py
     - python scripts/prepare_combined_format_inputs.py
-    - python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --html=report1.html --self-contained-html --keep_files
+    - python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files
     - python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
     - python -m pytest tests/renderer/test_renderer.py --create_ref --keep_files
 
@@ -1291,8 +1291,6 @@ ivas-conformance:
     when: always
     paths:
       - report-junit.xml
-      - report1.html
-      - report_cmd.html
       - report.html
       - Readme_IVAS_dec.txt  
       - Readme_IVAS_enc.txt  
-- 
GitLab