From d2dd57834897ad9db455160fc382cdc4fd00904d Mon Sep 17 00:00:00 2001 From: azmill Date: Wed, 4 Oct 2023 13:53:51 +1100 Subject: [PATCH 01/15] Adding in extra CFLAGS to enabled mult-threaded GCOV runs --- CMakeLists.txt | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fec05bd3ed..6ca9451842 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,8 +89,8 @@ if(UNIX) endif() # GCOV if(GCOV) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage -fprofile-update=atomic") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -fprofile-update=atomic") endif() # STRIP if(STRIP) diff --git a/Makefile b/Makefile index ce3d0a4a5e..92a463acf3 100644 --- a/Makefile +++ b/Makefile @@ -96,8 +96,8 @@ LDFLAGS += -g3 endif ifeq "$(GCOV)" "1" -CFLAGS += -fprofile-arcs -ftest-coverage -LDFLAGS += -fprofile-arcs -ftest-coverage +CFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic +LDFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic endif ifeq "$(STRIP)" "1" -- GitLab From c8c89fab099f7b57cf64dab807a652ec4d5b41cf Mon Sep 17 00:00:00 2001 From: azmill Date: Wed, 4 Oct 2023 14:04:13 +1100 Subject: [PATCH 02/15] Modifying CI script to run code-cov on a specific branch --- .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47c15f52b1..c574985ae0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ variables: - 'default' - 'test-be-release' - 'test-long-self-test' + - 'code-cov-on-branch' default: @@ -1502,6 +1503,40 @@ coverage-test-on-main-scheduled: - coverage.info - coverage +# GCOV/LCOV coverage analysis of self_test suite +coverage-test-on-branch: + extends: + - .test-job-linux-needs-testv-dir + tags: + - ivas-linux + stage: test + rules: + # only run in scheduled pipeline that passes this env vars + - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'code-cov-on-branch' + timeout: 4 hours + script: + - *print-common-info + - *update-ltv-repo + - make GCOV=1 -j + - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script + - python3 tests/create_short_testvectors.py + - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec + - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec + - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec + - bash ci/smoke_test.sh coverage + - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py + - bash ci/ivas_voip_be_test.sh coverage + - lcov -c -d obj -o coverage.info + - commit_sha=$(git rev-parse HEAD) + - genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha" + artifacts: + name: "main-coverage-sha-$CI_COMMIT_SHORT_SHA" + when: always + expire_in: 1 week + paths: + - coverage.info + - coverage + # --------------------------------------------------------------- # Complexity measurement jobs # --------------------------------------------------------------- -- GitLab From 3bbe5b4a1b4a4c768904e05f93995209014c559f Mon Sep 17 00:00:00 2001 From: azmill Date: Wed, 4 Oct 2023 14:16:01 +1100 Subject: [PATCH 03/15] More modifications to make code cov run on a branch --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c574985ae0..edb78c3bb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,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 == 'code-cov-on-branch' + variables: + IVAS_PIPELINE_NAME: 'Test code coverage pipeline: $CI_COMMIT_BRANCH' - if: $CI_PIPELINE_SOURCE == 'trigger' stages: @@ -1511,7 +1514,6 @@ coverage-test-on-branch: - ivas-linux stage: test rules: - # only run in scheduled pipeline that passes this env vars - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'code-cov-on-branch' timeout: 4 hours script: -- GitLab From 4834e45f67d2b7aa176bfd6f7c88bfdb9576137e Mon Sep 17 00:00:00 2001 From: azmill Date: Wed, 4 Oct 2023 14:22:21 +1100 Subject: [PATCH 04/15] Enabling pytest multi-threaded runs for code coverage --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index edb78c3bb8..4bb9bca234 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1522,11 +1522,11 @@ coverage-test-on-branch: - make GCOV=1 -j - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script - python3 tests/create_short_testvectors.py - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec + - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec -k + - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec -k + - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec -k - bash ci/smoke_test.sh coverage - - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py + - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py -k - bash ci/ivas_voip_be_test.sh coverage - lcov -c -d obj -o coverage.info - commit_sha=$(git rev-parse HEAD) -- GitLab From c21eb797b3f49bccd685a4cf3df0493ab8c4146d Mon Sep 17 00:00:00 2001 From: azmill Date: Wed, 4 Oct 2023 15:20:44 +1100 Subject: [PATCH 05/15] Wrong arg for enabling multi-threaded pytest --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bb9bca234..1cdac9a7c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1522,11 +1522,11 @@ coverage-test-on-branch: - make GCOV=1 -j - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script - python3 tests/create_short_testvectors.py - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec -k - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec -k - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec -k + - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec + - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec + - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n auto --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec - bash ci/smoke_test.sh coverage - - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py -k + - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py - bash ci/ivas_voip_be_test.sh coverage - lcov -c -d obj -o coverage.info - commit_sha=$(git rev-parse HEAD) -- GitLab From cb139c798cab17122092a5d7a67bed43d83795fc Mon Sep 17 00:00:00 2001 From: azmill Date: Wed, 4 Oct 2023 19:16:59 +1100 Subject: [PATCH 06/15] Updating smoke tests to run in parallel --- ci/smoke_test.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index e12615704d..e6adcda852 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -45,9 +45,11 @@ fi if [ -z "$1" ] || [ "$1" == "test" ]; then WORKERS="" BUILD=1 + PARALLEL="" elif [ "$1" == "coverage" ]; then WORKERS="-t 1" BUILD=0 + PARALLEL="&" else usage fi @@ -85,12 +87,12 @@ echo "\n======================= 0. preparing combined format test inputs ======= ism_modes=$(./scripts/runIvasCodec.py -l | grep ^ISM) non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ^ISM) echo "\n======================= 1. non-ism modes no FEC =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $WORKERS | tee smoke_test_output.txt +./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $WORKERS | tee smoke_test_output.txt PARALLEL echo "\n======================= 2. ism modes no FEC =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $WORKERS $ism_md_cmd | tee smoke_test_output.txt +./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $WORKERS $ism_md_cmd | tee smoke_test_output.txt PARALLEL # run the decoding again, but with 15% frame loss echo "\n======================= 3. all modes with FEC =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt +./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt PARALLEL # run JBM modes - EXT is excluded as not supported yet # OMASA disabled for now -- GitLab From 2ab8536b5c1eab3c1768bae27f4faf6c2ac63d2a Mon Sep 17 00:00:00 2001 From: azmill Date: Thu, 5 Oct 2023 13:15:02 +1100 Subject: [PATCH 07/15] Fixing the smoke tests parallel runs --- ci/smoke_test.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index e6adcda852..020bdb0c6b 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -87,21 +87,21 @@ echo "\n======================= 0. preparing combined format test inputs ======= ism_modes=$(./scripts/runIvasCodec.py -l | grep ^ISM) non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ^ISM) echo "\n======================= 1. non-ism modes no FEC =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $WORKERS | tee smoke_test_output.txt PARALLEL +eval "./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $WORKERS | tee smoke_test_output.txt" "$PARALLEL" echo "\n======================= 2. ism modes no FEC =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $WORKERS $ism_md_cmd | tee smoke_test_output.txt PARALLEL +eval "./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $WORKERS $ism_md_cmd | tee smoke_test_output.txt" "$PARALLEL" # run the decoding again, but with 15% frame loss echo "\n======================= 3. all modes with FEC =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt PARALLEL +eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt" "$PARALLEL" # run JBM modes - EXT is excluded as not supported yet # OMASA disabled for now modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l | grep -v ^MASA | grep -v ^ISM | grep -v OMASA) modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v ^ISM+ | grep -v OMASA) echo "\n======================= 4. JBM, modes with no EXT =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt +eval "./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt" "$PARALLEL" echo "\n======================= 5. JBM, modes with EXT =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -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 +eval "./scripts/runIvasCodec.py $verbosity_cmd -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" "$PARALLEL" # run all modes with binaural output using external files modes_with_bin_out="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4" @@ -110,14 +110,14 @@ bin_out_modes="BINAURAL BINAURAL_ROOM_IR" echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n" wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_) hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin" -./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt +eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n" swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _swb_) hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin" -./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt +eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n" fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _fb_) hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin" -./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt +eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" -- GitLab From c3eeb704606b2c4b7eb34a382e835087d5f02098 Mon Sep 17 00:00:00 2001 From: azmill Date: Thu, 5 Oct 2023 15:29:42 +1100 Subject: [PATCH 08/15] Fixing the eval inputs so that the \n are removed --- ci/smoke_test.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index 020bdb0c6b..2f659eceff 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -86,6 +86,9 @@ echo "\n======================= 0. preparing combined format test inputs ======= # treat ISM modes separately because passing the metadata files to MASA modes causes crashes ism_modes=$(./scripts/runIvasCodec.py -l | grep ^ISM) non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ^ISM) +# trim the \n characters so it works with eval +ism_modes=$(echo "$ism_modes" | tr '\n' ' ') +non_ism_modes=$(echo "$non_ism_modes" | tr '\n' ' ') echo "\n======================= 1. non-ism modes no FEC =======================\n\n" eval "./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $WORKERS | tee smoke_test_output.txt" "$PARALLEL" echo "\n======================= 2. ism modes no FEC =======================\n\n" @@ -98,6 +101,9 @@ eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D # OMASA disabled for now modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l | grep -v ^MASA | grep -v ^ISM | grep -v OMASA) modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v ^ISM+ | grep -v OMASA) +# trim the \n characters so it works with eval +modes_with_no_ext_out=$(echo "$modes_with_no_ext_out" | tr '\n' ' ') +modes_with_ext_out=$(echo "$modes_with_ext_out" | tr '\n' ' ') echo "\n======================= 4. JBM, modes with no EXT =======================\n\n" eval "./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt" "$PARALLEL" echo "\n======================= 5. JBM, modes with EXT =======================\n\n" @@ -106,6 +112,8 @@ eval "./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_ext_out -p $cfg $ # run all modes with binaural output using external files modes_with_bin_out="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4" bin_out_modes="BINAURAL BINAURAL_ROOM_IR" +modes_with_bin_out=$(echo "$modes_with_bin_out" | tr '\n' ' ') +bin_out_modes=$(echo "$bin_out_modes" | tr '\n' ' ') echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n" wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_) -- GitLab From 04165cf5583190bca8330c026bdc12a6f90b7fe2 Mon Sep 17 00:00:00 2001 From: azmill Date: Thu, 5 Oct 2023 15:51:25 +1100 Subject: [PATCH 09/15] eval updates needed more fixing --- ci/smoke_test.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index 2f659eceff..ae417b881a 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -49,7 +49,8 @@ if [ -z "$1" ] || [ "$1" == "test" ]; then elif [ "$1" == "coverage" ]; then WORKERS="-t 1" BUILD=0 - PARALLEL="&" + PARALLEL="" + # PARALLEL="&" else usage fi @@ -112,20 +113,24 @@ eval "./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_ext_out -p $cfg $ # run all modes with binaural output using external files modes_with_bin_out="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4" bin_out_modes="BINAURAL BINAURAL_ROOM_IR" -modes_with_bin_out=$(echo "$modes_with_bin_out" | tr '\n' ' ') -bin_out_modes=$(echo "$bin_out_modes" | tr '\n' ' ') echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n" wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_) +# trim the \n characters so it works with eval +wb_modes=$(echo "$wb_modes" | tr '\n' ' ') hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin" eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n" swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _swb_) +# trim the \n characters so it works with eval +swb_modes=$(echo "$swb_modes" | tr '\n' ' ') hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin" eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n" fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _fb_) +# trim the \n characters so it works with eval +fb_modes=$(echo "$fb_modes" | tr '\n' ' ') hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin" eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" -- GitLab From 91e9331482dd132d0ed7e3abd8e43c9ed4f2591a Mon Sep 17 00:00:00 2001 From: azmill Date: Thu, 5 Oct 2023 16:54:03 +1100 Subject: [PATCH 10/15] eval updates needed even more fixing --- ci/smoke_test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index ae417b881a..ebf36a7948 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -49,8 +49,7 @@ if [ -z "$1" ] || [ "$1" == "test" ]; then elif [ "$1" == "coverage" ]; then WORKERS="-t 1" BUILD=0 - PARALLEL="" - # PARALLEL="&" + PARALLEL="&" else usage fi -- GitLab From eb4f1c91f7cfa0e74d97eec304288b3e85905241 Mon Sep 17 00:00:00 2001 From: azmill Date: Thu, 5 Oct 2023 17:22:17 +1100 Subject: [PATCH 11/15] eval updates escaping double quotes --- ci/smoke_test.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index ebf36a7948..a6f3f6efca 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -95,7 +95,7 @@ echo "\n======================= 2. ism modes no FEC =======================\n\n" eval "./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $WORKERS $ism_md_cmd | tee smoke_test_output.txt" "$PARALLEL" # run the decoding again, but with 15% frame loss echo "\n======================= 3. all modes with FEC =======================\n\n" -eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt" "$PARALLEL" +eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D=\"-fec 15\" --decoder_only | tee smoke_test_output_plc.txt" "$PARALLEL" # run JBM modes - EXT is excluded as not supported yet # OMASA disabled for now @@ -118,18 +118,16 @@ wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_) # trim the \n characters so it works with eval wb_modes=$(echo "$wb_modes" | tr '\n' ' ') hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin" -eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" +eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg $WORKERS -D=\"-hrtf ${hrtf_wb}\" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n" swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _swb_) # trim the \n characters so it works with eval swb_modes=$(echo "$swb_modes" | tr '\n' ' ') hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin" -eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" +eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg $WORKERS -D=\"-hrtf ${hrtf_swb}\" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n" fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _fb_) -# trim the \n characters so it works with eval -fb_modes=$(echo "$fb_modes" | tr '\n' ' ') hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin" -eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" +./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt -- GitLab From 94f24ab0e182e84a7780711aa0ebeca18eeff66f Mon Sep 17 00:00:00 2001 From: azmill Date: Mon, 16 Oct 2023 18:35:25 +1100 Subject: [PATCH 12/15] Reverting smoke tests back and changing the number of workers --- ci/smoke_test.sh | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index a6f3f6efca..c221da44e2 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -45,11 +45,9 @@ fi if [ -z "$1" ] || [ "$1" == "test" ]; then WORKERS="" BUILD=1 - PARALLEL="" elif [ "$1" == "coverage" ]; then - WORKERS="-t 1" + WORKERS="" BUILD=0 - PARALLEL="&" else usage fi @@ -86,46 +84,36 @@ echo "\n======================= 0. preparing combined format test inputs ======= # treat ISM modes separately because passing the metadata files to MASA modes causes crashes ism_modes=$(./scripts/runIvasCodec.py -l | grep ^ISM) non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ^ISM) -# trim the \n characters so it works with eval -ism_modes=$(echo "$ism_modes" | tr '\n' ' ') -non_ism_modes=$(echo "$non_ism_modes" | tr '\n' ' ') echo "\n======================= 1. non-ism modes no FEC =======================\n\n" -eval "./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $WORKERS | tee smoke_test_output.txt" "$PARALLEL" +./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $WORKERS | tee smoke_test_output.txt echo "\n======================= 2. ism modes no FEC =======================\n\n" -eval "./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $WORKERS $ism_md_cmd | tee smoke_test_output.txt" "$PARALLEL" +./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $WORKERS $ism_md_cmd | tee smoke_test_output.txt # run the decoding again, but with 15% frame loss echo "\n======================= 3. all modes with FEC =======================\n\n" -eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D=\"-fec 15\" --decoder_only | tee smoke_test_output_plc.txt" "$PARALLEL" +./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt # run JBM modes - EXT is excluded as not supported yet # OMASA disabled for now modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l | grep -v ^MASA | grep -v ^ISM | grep -v OMASA) modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v ^ISM+ | grep -v OMASA) -# trim the \n characters so it works with eval -modes_with_no_ext_out=$(echo "$modes_with_no_ext_out" | tr '\n' ' ') -modes_with_ext_out=$(echo "$modes_with_ext_out" | tr '\n' ' ') echo "\n======================= 4. JBM, modes with no EXT =======================\n\n" -eval "./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt" "$PARALLEL" +./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt echo "\n======================= 5. JBM, modes with EXT =======================\n\n" -eval "./scripts/runIvasCodec.py $verbosity_cmd -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" "$PARALLEL" +./scripts/runIvasCodec.py $verbosity_cmd -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="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4" +modes_with_bin_out="SBA PlanarSBA MASA MC ISM1 ISM2 ISM3 ISM4" bin_out_modes="BINAURAL BINAURAL_ROOM_IR" echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n" wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_) -# trim the \n characters so it works with eval -wb_modes=$(echo "$wb_modes" | tr '\n' ' ') hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin" -eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg $WORKERS -D=\"-hrtf ${hrtf_wb}\" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" +./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n" swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _swb_) -# trim the \n characters so it works with eval -swb_modes=$(echo "$swb_modes" | tr '\n' ' ') hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin" -eval "./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg $WORKERS -D=\"-hrtf ${hrtf_swb}\" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt" "$PARALLEL" +./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n" fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _fb_) -- GitLab From b25aa7a42c4e1f858554406f19b3038aa562239f Mon Sep 17 00:00:00 2001 From: azmill Date: Tue, 17 Oct 2023 15:59:26 +1100 Subject: [PATCH 13/15] Fixing stray change in smoke tests script --- ci/smoke_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index c221da44e2..bc5cc2dfe0 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -102,7 +102,7 @@ echo "\n======================= 5. JBM, modes with EXT =======================\n ./scripts/runIvasCodec.py $verbosity_cmd -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 a32186cdbc322e73598d4fb477cd4cd83900d06e Mon Sep 17 00:00:00 2001 From: azmill Date: Thu, 19 Oct 2023 09:41:38 +1100 Subject: [PATCH 14/15] Removing the test code coverage job --- .gitlab-ci.yml | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cee9e41a29..3e16cff863 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,6 @@ variables: - 'default' - 'test-be-release' - 'test-long-self-test' - - 'code-cov-on-branch' default: @@ -51,9 +50,6 @@ 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 == 'code-cov-on-branch' - variables: - IVAS_PIPELINE_NAME: 'Test code coverage pipeline: $CI_COMMIT_BRANCH' - if: $CI_PIPELINE_SOURCE == 'trigger' stages: @@ -1483,39 +1479,6 @@ coverage-test-on-main-scheduled: # only run in scheduled pipeline that passes this env vars - if: $COVERAGE_TEST timeout: 4 hours - script: - - *print-common-info - - *update-ltv-repo - - make GCOV=1 -j - - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script - - python3 tests/create_short_testvectors.py - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec - - bash ci/smoke_test.sh coverage - - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py - - bash ci/ivas_voip_be_test.sh coverage - - lcov -c -d obj -o coverage.info - - commit_sha=$(git rev-parse HEAD) - - genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha" - artifacts: - name: "main-coverage-sha-$CI_COMMIT_SHORT_SHA" - when: always - expire_in: 1 week - paths: - - coverage.info - - coverage - -# GCOV/LCOV coverage analysis of self_test suite -coverage-test-on-branch: - extends: - - .test-job-linux-needs-testv-dir - tags: - - ivas-linux - stage: test - rules: - - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'code-cov-on-branch' - timeout: 4 hours script: - *print-common-info - *update-ltv-repo -- GitLab From 7b2a8e46c2b8cef29337d19b7ef0c9c23b96c5dd Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 19 Oct 2023 10:18:34 +0200 Subject: [PATCH 15/15] remove obsolete WORKERS variable from smoke_test.sh --- ci/smoke_test.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index bc5cc2dfe0..4e3be38db3 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -43,10 +43,8 @@ if [ ! -d "lib_com" ]; then fi if [ -z "$1" ] || [ "$1" == "test" ]; then - WORKERS="" BUILD=1 elif [ "$1" == "coverage" ]; then - WORKERS="" BUILD=0 else usage @@ -85,21 +83,21 @@ echo "\n======================= 0. preparing combined format test inputs ======= ism_modes=$(./scripts/runIvasCodec.py -l | grep ^ISM) non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ^ISM) echo "\n======================= 1. non-ism modes no FEC =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $WORKERS | tee smoke_test_output.txt +./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg | tee smoke_test_output.txt echo "\n======================= 2. ism modes no FEC =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $WORKERS $ism_md_cmd | tee smoke_test_output.txt +./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $ism_md_cmd | tee smoke_test_output.txt # run the decoding again, but with 15% frame loss echo "\n======================= 3. all modes with FEC =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt +./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt # run JBM modes - EXT is excluded as not supported yet # OMASA disabled for now modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l | grep -v ^MASA | grep -v ^ISM | grep -v OMASA) modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v ^ISM+ | grep -v OMASA) echo "\n======================= 4. JBM, modes with no EXT =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt +./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt echo "\n======================= 5. JBM, modes with EXT =======================\n\n" -./scripts/runIvasCodec.py $verbosity_cmd -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 +./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_ext_out -p $cfg $duration_arg --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="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4" @@ -108,14 +106,14 @@ bin_out_modes="BINAURAL BINAURAL_ROOM_IR" echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n" wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_) hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin" -./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt +./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n" swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _swb_) hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin" -./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt +./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n" fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _fb_) hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin" -./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt +./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt -- GitLab