From f1e7239cdd1af7b5ef99b286784d3659ddc91230 Mon Sep 17 00:00:00 2001 From: kiene Date: Wed, 23 Aug 2023 11:31:41 +0200 Subject: [PATCH 1/5] remove obsolete code --- scripts/pyivastest/IvasModeCollector.py | 9 +--- scripts/pyivastest/IvasModeRunner.py | 67 ------------------------- 2 files changed, 1 insertion(+), 75 deletions(-) diff --git a/scripts/pyivastest/IvasModeCollector.py b/scripts/pyivastest/IvasModeCollector.py index 2a9361a078..b5e386f794 100644 --- a/scripts/pyivastest/IvasModeCollector.py +++ b/scripts/pyivastest/IvasModeCollector.py @@ -425,14 +425,7 @@ class IvasModeCollector(IvasBaseClass.IvasBaseClass): self.logger.info("Adding items to mode {}...".format(mode)) in_config = self.flat_mode_list[mode]["cmd"]["in_config"] - # hack to handle group B SBA bitrates - if in_config == "SBA" and any( - str(br) in mode for br in constants.SPAR_BITRATES - ): - # group B SBA takes FOA only - in_dir = self.in_dirs["FOA"] - else: - in_dir = self.in_dirs[in_config] + in_dir = self.in_dirs[in_config] in_files = [] if self.global_item_list: diff --git a/scripts/pyivastest/IvasModeRunner.py b/scripts/pyivastest/IvasModeRunner.py index 85515e824d..16aed2b923 100644 --- a/scripts/pyivastest/IvasModeRunner.py +++ b/scripts/pyivastest/IvasModeRunner.py @@ -49,68 +49,6 @@ from pyaudio3dtools.spatialaudioformat import Format as spformat import pyaudio3dtools.audiofile as af import pyaudio3dtools.audioarray as ar BW_TO_SR = {"nb": 8, "wb": 16, "swb": 32, "fb": 48} -IN_CONFIG_TO_COPY_AUDIO = { - "SBA": [], - "HOA3": [], - "MASA": [], - "ISM": [], - "MONO": ["--chanA=A"], - "STEREO": ["--chanA=A", "--chanB=B"], - "5_1": [ - "--chanA=A", - "--chanB=B", - "--chanC=C", - "--chanD=D", - "--chanE=E", - "--chanF=F", - ], - "7_1": [ - "--chanA=A", - "--chanB=B", - "--chanC=C", - "--chanD=D", - "--chanE=E", - "--chanF=F", - "--chanG=G", - "--chanH=H", - ], - "5_1_2": [ - "--chanA=A", - "--chanB=B", - "--chanC=C", - "--chanD=D", - "--chanE=E", - "--chanF=F", - "--chanG=G", - "--chanH=H", - ], - "5_1_4": [ - "--chanA=A", - "--chanB=B", - "--chanC=C", - "--chanD=D", - "--chanE=E", - "--chanF=F", - "--chanG=G", - "--chanH=H", - "--chanI=I", - "--chanJ=J", - ], - "7_1_4": [ - "--chanA=A", - "--chanB=B", - "--chanC=C", - "--chanD=D", - "--chanE=E", - "--chanF=F", - "--chanG=G", - "--chanH=H", - "--chanI=I", - "--chanJ=J", - "--chanK=K", - "--chanL=L", - ], -} class Error(Exception): @@ -631,11 +569,6 @@ class IvasModeRunner(IvasModeCollector.IvasModeCollector): af.convertfile(resamp_in_path, pcm_name_transformed, in_fs=fs, out_fs=out_fs) in_config = config["cmd"]["in_config"].upper() - chn_arg = [] - if in_config in IN_CONFIG_TO_COPY_AUDIO: - chn_arg = IN_CONFIG_TO_COPY_AUDIO[ - config["cmd"]["in_config"].upper() - ] pcm_log.flush() pcm_log.close() -- GitLab From a29bfff42570a928d39eb7175b1b31eb8fdb947b Mon Sep 17 00:00:00 2001 From: kiene Date: Wed, 23 Aug 2023 12:05:48 +0200 Subject: [PATCH 2/5] add explicit ambisonics modes to ivas_modes.json --- scripts/config/ivas_modes.json | 714 +++++++++++++++++++++++++++++++-- 1 file changed, 684 insertions(+), 30 deletions(-) diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 5e8c7e8249..263e08de70 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -599,11 +599,497 @@ } } }, - "SBA": { - "SBA_b{bitrate}_{bandwidth}_cbr": { + "FOA": { + "FOA_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "{ambi_order}" + "1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "FOA", + "table_name": "FOA@{table_bitrate} kbps {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "FOA_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-sba", + "1" + ], + "encoptions": [ + "-dtx", + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "FOA", + "table_name": "FOA@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000 + ], + "fb": [ + 32000, + 48000, + 64000, + 80000 + ] + } + }, + "FOA_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-sba", + "1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "FOA", + "table_name": "FOA@{table_bitrate} kbps RS {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + } + }, + "HOA2": { + "HOA2_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-sba", + "2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "HOA2", + "table_name": "HOA2@{table_bitrate} kbps {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "HOA2_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-sba", + "2" + ], + "encoptions": [ + "-dtx", + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "HOA2", + "table_name": "HOA2@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000 + ], + "fb": [ + 32000, + 48000, + 64000, + 80000 + ] + } + }, + "HOA2_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-sba", + "2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "HOA2", + "table_name": "HOA2@{table_bitrate} kbps RS {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + } + }, + "HOA3": { + "HOA3_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-sba", + "3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "HOA3", + "table_name": "HOA3@{table_bitrate} kbps {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "HOA3_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-sba", + "3" + ], + "encoptions": [ + "-dtx", + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "HOA3", + "table_name": "HOA3@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000 + ], + "fb": [ + 32000, + 48000, + 64000, + 80000 + ] + } + }, + "HOA3_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-sba", + "3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "HOA3", + "table_name": "HOA3@{table_bitrate} kbps RS {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + } + }, + "PlanarFOA": { + "PlanarFOA_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-sba", + "1" ], "encoptions": [ "-max_band", @@ -612,12 +1098,13 @@ "dec": { "7_1_4": [], "HOA3": [], + "HOA2": [], "FOA": [], "mono": [], "stereo": [] }, - "in_config": "SBA", - "table_name": "SBA@{table_bitrate} kbps {bandwidth}", + "in_config": "FOA", + "table_name": "Planar FOA@{table_bitrate} kbps {bandwidth}", "nummetadata": 0, "metadatafilenames": [], "rs": false, @@ -671,10 +1158,10 @@ ] } }, - "SBA_b{bitrate}_dtx_{bandwidth}_cbr": { + "PlanarFOA_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "{ambi_order}" + "1" ], "encoptions": [ "-dtx", @@ -684,12 +1171,13 @@ "dec": { "7_1_4": [], "HOA3": [], + "HOA2": [], "FOA": [], "mono": [], "stereo": [] }, - "in_config": "SBA", - "table_name": "SBA@{table_bitrate} kbps DTX {bandwidth}", + "in_config": "FOA", + "table_name": "Planar FOA@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 0, "metadatafilenames": [], "rs": false, @@ -722,10 +1210,10 @@ ] } }, - "SBA_b{bitrate}_{bandwidth}_rs": { + "PlanarFOA_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-sba", - "{ambi_order}" + "1" ], "encoptions": [ "-max_band", @@ -734,12 +1222,13 @@ "dec": { "7_1_4": [], "HOA3": [], + "HOA2": [], "FOA": [], "mono": [], "stereo": [] }, - "in_config": "SBA", - "table_name": "SBA@{table_bitrate} kbps RS {bandwidth}", + "in_config": "FOA", + "table_name": "Planar FOA@{table_bitrate} kbps RS {bandwidth}", "nummetadata": 0, "metadatafilenames": [], "rs": true, @@ -758,11 +1247,11 @@ } } }, - "PlanarSBA": { - "PlanarSBA_b{bitrate}_{bandwidth}_cbr": { + "PlanarHOA2": { + "PlanarHOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "-{ambi_order}" + "2" ], "encoptions": [ "-max_band", @@ -771,12 +1260,13 @@ "dec": { "7_1_4": [], "HOA3": [], + "HOA2": [], "FOA": [], - "stereo": [], - "mono": [] + "mono": [], + "stereo": [] }, - "in_config": "SBA", - "table_name": "Planar SBA@{table_bitrate} kbps {bandwidth}", + "in_config": "HOA2", + "table_name": "Planar HOA2@{table_bitrate} kbps {bandwidth}", "nummetadata": 0, "metadatafilenames": [], "rs": false, @@ -830,10 +1320,10 @@ ] } }, - "PlanarSBA_b{bitrate}_dtx_{bandwidth}_cbr": { + "PlanarHOA2_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "-{ambi_order}" + "2" ], "encoptions": [ "-dtx", @@ -843,12 +1333,175 @@ "dec": { "7_1_4": [], "HOA3": [], + "HOA2": [], "FOA": [], - "stereo": [], - "mono": [] + "mono": [], + "stereo": [] + }, + "in_config": "HOA2", + "table_name": "Planar HOA2@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000 + ], + "fb": [ + 32000, + 48000, + 64000, + 80000 + ] + } + }, + "PlanarHOA2_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-sba", + "2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "HOA2", + "table_name": "Planar HOA2@{table_bitrate} kbps RS {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + } + }, + "PlanarHOA3": { + "PlanarHOA3_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-sba", + "3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] + }, + "in_config": "HOA3", + "table_name": "Planar HOA3@{table_bitrate} kbps {bandwidth}", + "nummetadata": 0, + "metadatafilenames": [], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "PlanarHOA3_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-sba", + "3" + ], + "encoptions": [ + "-dtx", + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "HOA2": [], + "FOA": [], + "mono": [], + "stereo": [] }, - "in_config": "SBA", - "table_name": "Planar SBA@{table_bitrate} kbps DTX {bandwidth}", + "in_config": "HOA3", + "table_name": "Planar HOA3@{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 0, "metadatafilenames": [], "rs": false, @@ -881,10 +1534,10 @@ ] } }, - "PlanarSBA_b{bitrate}_{bandwidth}_rs": { + "PlanarHOA3_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-sba", - "-{ambi_order}" + "3" ], "encoptions": [ "-max_band", @@ -893,12 +1546,13 @@ "dec": { "7_1_4": [], "HOA3": [], + "HOA2": [], "FOA": [], "mono": [], "stereo": [] }, - "in_config": "SBA", - "table_name": "Planar SBA@{table_bitrate} kbps RS {bandwidth}", + "in_config": "HOA3", + "table_name": "Planar HOA3@{table_bitrate} kbps RS {bandwidth}", "nummetadata": 0, "metadatafilenames": [], "rs": true, -- GitLab From e149acbbc70ae9e5f85ed5e49b3543c6622c0ec8 Mon Sep 17 00:00:00 2001 From: kiene Date: Wed, 23 Aug 2023 12:16:17 +0200 Subject: [PATCH 3/5] adjustments in MR pipeline for new mode names --- .gitlab-ci.yml | 4 ++-- ci/smoke_test.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 079d8235e7..5863b683b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -833,9 +833,9 @@ check-first-frame-is-sid: # SBA is run separately to use shorter part of file - exit_code_no_sba=0 - exit_code_sba=0 - - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -v MASA | grep -v SBA) + - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -v MASA | grep -vE "FOA|HOA" ) - scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 0:20 || exit_code_no_sba=$? - - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep SBA) + - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -E "FOA|HOA") - scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 70:80 || exit_code_sba=$? - if [ $exit_code_no_sba -ne 0 ] || [ $exit_code_sba -ne 0 ]; then exit 1; fi artifacts: diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index 96e661238d..0695bcaa72 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -101,7 +101,7 @@ echo "\n======================= 5. JBM, modes with EXT =======================\n ./scripts/runIvasCodec.py -m $modes_with_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 | tee -a smoke_test_output_jbm_noEXT.txt # run all modes with binaural output using external files -modes_with_bin_out="SBA PlanarSBA MASA MC ISM1 ISM2 ISM3 ISM4" +modes_with_bin_out="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4" bin_out_modes="BINAURAL BINAURAL_ROOM_IR" echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n" -- GitLab From a17726430e1f007f649c3b2c8b149cf7f5a35fd7 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 1 Sep 2023 12:37:56 +0200 Subject: [PATCH 4/5] fix signal and bitstream slicing params for FOA tune for other modes --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e18aed222d..038f34e976 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -845,9 +845,12 @@ check-first-frame-is-sid: - exit_code_no_sba=0 - exit_code_sba=0 - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -v MASA | grep -vE "FOA|HOA" ) - - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 0:20 || exit_code_no_sba=$? - - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -E "FOA|HOA") - - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 70:80 || exit_code_sba=$? + - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 || exit_code_no_sba=$? + - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -E "HOA") + - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 || exit_code_sba=$? + # need to do FOA separately as VAD apparently behaves differently there + - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep "FOA") + - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 || exit_code_sba=$? - if [ $exit_code_no_sba -ne 0 ] || [ $exit_code_sba -ne 0 ]; then exit 1; fi artifacts: paths: -- GitLab From 858a6f1f5c0d77139ace3a34a1db08e6950a6bec Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 4 Sep 2023 08:42:48 +0200 Subject: [PATCH 5/5] fix script call to actually run planar HOA3 in planar test --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 038f34e976..804f33f2f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1275,7 +1275,7 @@ sanitizer-test-planarhoa3: start_in: 6 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py HOA3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS ### --- sanitizer schedule D --- -- GitLab