From fbcc78cc70fa92c063d7e8bd7cde81248e48921d Mon Sep 17 00:00:00 2001 From: kiene Date: Thu, 28 Sep 2023 13:44:25 +0200 Subject: [PATCH] add MASA to sidstart test and optimize runtime a bit --- .gitlab-ci.yml | 19 ++++++++++--------- scripts/config/ci_linux_sidstart_test.json | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e95420bea..ec586b0450 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -948,18 +948,19 @@ check-first-frame-is-sid: - cmake . - make -j - # TODO: for some MASA modes, we currently do not have testvectors that actually trigger DTX - # SBA modes are 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 -vE "FOA|HOA" ) - - 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=$? + - exit_code_hoa=0 + - exit_code_foa=0 + + # run all modes and cut bitstream to start with an SID. Use stereo output to limit runtime, test is only about decoding + - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -vE "FOA|HOA" ) + - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 --oc stereo || 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 + - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 --oc stereo || exit_code_hoa=$? - 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 + - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 --oc stereo || exit_code_foa=$? + + - if [ $exit_code_no_sba -ne 0 ] || [ $exit_code_hoa -ne 0 ] || [ $exit_code_hoa -ne 0 ]; then exit 1; fi artifacts: paths: - out/logs diff --git a/scripts/config/ci_linux_sidstart_test.json b/scripts/config/ci_linux_sidstart_test.json index f3a564ab31..024b1a213d 100644 --- a/scripts/config/ci_linux_sidstart_test.json +++ b/scripts/config/ci_linux_sidstart_test.json @@ -8,10 +8,10 @@ "HOA2": "/usr/local/ltv/ltv48_HOA2.wav", "HOA3": "/usr/local/ltv/ltv48_HOA3.wav", "SBA": "/usr/local/ltv/ltv48_HOA3.wav", - "MASA1TC1DIR": "/usr/local/testv/stv1MASA1TC48n.wav", - "MASA1TC2DIR": "/usr/local/testv/stv2MASA1TC48c.wav", - "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48n.wav", - "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav", + "MASA1TC1DIR": "/usr/local/ltv/ltv48_MASA1TC.wav", + "MASA1TC2DIR": "/usr/local/ltv/ltv48_MASA1TC.wav", + "MASA2TC1DIR": "/usr/local/ltv/ltv48_MASA2TC.wav", + "MASA2TC2DIR": "/usr/local/ltv/ltv48_MASA2TC.wav", "5_1": "/usr/local/testv/stv51MC48c.wav", "5_1_2": "/usr/local/testv/stv512MC48c.wav", "5_1_4": "/usr/local/testv/stv514MC48c.wav", -- GitLab