Commit 8e5da726 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 923-external-command-line-options-in-upper-case-letters
parents 649a8fb3 fc483ef5

.gitlab-ci.yml

+12 −7
Original line number Diff line number Diff line
@@ -93,16 +93,19 @@ stages: 
  # needed when depth is lower than the number of commits in the branch

  - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:$CI_MERGE_REQUEST_TARGET_BRANCH_NAME



.mr-get-target-commit:

  &mr-get-target-commit # compare to last target branch commit before pipeline was created

.mr-get-target-commit: &mr-get-target-commit # compare to last target branch commit before pipeline was created

  - target_commit=$(git log $CI_MERGE_REQUEST_TARGET_BRANCH_NAME -1 --oneline --before=${CI_PIPELINE_CREATED_AT} --format=%H)



.check-for-testvectors:

  &check-for-testvectors # check if the testvector files specified in scripts/config/ci_linux*.json are present

.check-for-testvectors: &check-for-testvectors # check if the testvector files specified in scripts/config/ci_linux*.json are present

  - python3 -m pytest ci/test_vectors_available.py



.merge-request-comparison-setup-codec:

  &merge-request-comparison-setup-codec ### build test binaries, initial clean for paranoia reasons

.disable-debugging-macro: &disable-debugging-macro

# automatically disable #DEBUGGING macro in options.h using /**/-comment

  - sed -i.bak -e "s/^[[:space:]]*\(#define[[:space:]]*DEBUGGING\)/\/\*\1\*\//g" lib_com/options.h



.merge-request-comparison-setup-codec: &merge-request-comparison-setup-codec 

  ### build test binaries, initial clean for paranoia reasons

  - *disable-debugging-macro

  - make clean

  - mkdir build

  - cd build
@@ -113,17 +116,18 @@ stages: 
  - mv IVAS_rend ../IVAS_rend_test

  - cd ..

  - rm -rf build/*

  - git restore .



  ### store the current commit hash

  - source_branch_commit_sha=$(git rev-parse HEAD)



  ### checkout version to compare against

  - *mr-fetch-target-branch



  - *mr-get-target-commit

  - git checkout $target_commit



  ### build reference binaries

  - *disable-debugging-macro

  - cd build

  - cmake ..

  - make -j
@@ -131,6 +135,7 @@ stages: 
  - mv IVAS_dec ../IVAS_dec_ref

  - mv IVAS_rend ../IVAS_rend_ref

  - cd ..

  - git restore .



  # rename test binaries back

  - mv IVAS_cod_test IVAS_cod

ci/smoke_test.sh

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat 
ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"

duration_arg="-U 1:2"

verbosity_cmd="-z console"

ep_file="ci/complexity_measurements/ep_10pct_fer.g192"



if [ $BUILD -eq 1 ];then

	# Enable memory macros to find unbalanced memory allocations/deallocations
@@ -88,7 +89,7 @@ echo "\n======================= 2. ism modes no FEC =======================\n\n" 
./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 -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -f="$ep_file" --decoder_only | tee smoke_test_output_plc.txt



# run JBM modes - EXT is excluded as not supported yet

# OMASA disabled for now

scripts/config/self_test.prm

+243 −162

File changed.

Preview size limit exceeded, changes collapsed.

scripts/config/self_test_evs.prm

+45 −30
Original line number Diff line number Diff line
@@ -28,21 +28,25 @@ 
../IVAS_cod -dtx 0 9600 8 testv/stv8n.wav bit

../IVAS_dec 8 bit testv/stv8n_9k60_8-8_DTX20.tst



// Codec B at 9.60 kbps, 8kHz in, 8kHz out, fixed DTX, random FEC at 5%

// Codec B at 9.60 kbps, 8kHz in, 8kHz out, fixed DTX, random FER at 5%

../IVAS_cod -dtx 9600 8 testv/stv8n.wav bit

../IVAS_dec -fec 5 8 bit testv/stv8n_9k60_8-8_DTX20_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 8 bit_error testv/stv8n_9k60_8-8_DTX20_FER5.tst



// Codec A at 13.20 kbps, 8kHz in, 8kHz out, random FEC at 5%

// Codec A at 13.20 kbps, 8kHz in, 8kHz out, random FER at 5%

../IVAS_cod 13200 8 testv/stv8c.wav bit

../IVAS_dec -fec 5 8 bit testv/stv8c_13k20_8-8_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 8 bit_error testv/stv8c_13k20_8-8_FER5.tst



// Codec A at 13.20 kbps, 8kHz in, 8kHz out, fixed DTX, random FEC at 5%

// Codec A at 13.20 kbps, 8kHz in, 8kHz out, fixed DTX, random FER at 5%

../IVAS_cod -dtx 20 13200 8 testv/stv8c.wav bit

../IVAS_dec -fec 5 8 bit testv/stv8c_13k20_8-8_DTX20_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 8 bit_error testv/stv8c_13k20_8-8_DTX20_FER5.tst



// Codec A at 32 kbps, 32kHz in, 8kHz out, random FEC at 6%

// Codec A at 32 kbps, 32kHz in, 8kHz out, random FER at 5%

../IVAS_cod 32000 32 testv/stv32c.wav bit

../IVAS_dec -fec testv/FEC_6pct2.bin 8 bit stv32c_32k_32-8_FEC6.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 8 bit_error stv32c_32k_32-8_FER5.tst





// Codec A at 5.90 kbps, 16kHz in, 16kHz out, VBR
@@ -61,21 +65,24 @@ 
../IVAS_cod 9600 16 testv/stv16n.wav bit

../IVAS_dec 16 bit testv/stv16n_9k60_16-16.tst



// Codec B at 9.60 kbps, 16kHz in, 16kHz out, random FEC at 5%

// Codec B at 9.60 kbps, 16kHz in, 16kHz out, random FER at 5%

../IVAS_cod 9600 16 testv/stv16n.wav bit

../IVAS_dec -fec 5 16 bit testv/stv16n_9k60_16-16_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 16 bit_error testv/stv16n_9k60_16-16_FER5.tst



// Codec A at 13.20 kbps, 16kHz in, 16kHz out, adaptive DTX

../IVAS_cod -dtx 0 13200 16 testv/stv16n.wav bit

../IVAS_dec 16 bit testv/stv16n_13k20_16-16_DTX.tst



// Codec A at 13.20 kbps, 16kHz in, 16kHz out, fixed DTX, random FEC at 5%

// Codec A at 13.20 kbps, 16kHz in, 16kHz out, fixed DTX, random FER at 5%

../IVAS_cod -dtx 13200 16 testv/stv16n.wav bit

../IVAS_dec -fec 5 16 bit testv/stv16n_13k20_16-16_DTX_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 16 bit_error testv/stv16n_13k20_16-16_DTX_FER5.tst



// Codec B at 16.40 kbps, 16kHz in, 16kHz out, random FEC at 5%

// Codec B at 16.40 kbps, 16kHz in, 16kHz out, random FER at 5%

../IVAS_cod 16400 16 testv/stv16c.wav bit

../IVAS_dec -fec 5 16 bit testv/stv16c_16k40_16-16_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 16 bit_error testv/stv16c_16k40_16-16_FER5.tst



// Codec B at 24.40 kbps, 16kHz in, 16kHz out, fixed DTX

../IVAS_cod -dtx 24400 16 testv/stv16c.wav bit
@@ -93,17 +100,19 @@ 
../IVAS_cod 64000 16 testv/stv16c.wav bit

../IVAS_dec 16 bit testv/stv16c_64k_16-16.tst



// Codec A at 64 kbps, 16kHz in, 16kHz out, random FEC at 5%

// Codec A at 64 kbps, 16kHz in, 16kHz out, random FER at 5%

../IVAS_cod 64000 16 testv/stv16c.wav bit

../IVAS_dec -fec 5 16 bit testv/stv16c_64k_16-16_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 16 bit_error testv/stv16c_64k_16-16_FER5.tst



// Codec B at 96 kbps, 16kHz in, 16kHz out

../IVAS_cod 96000 16 testv/stv16c.wav bit

../IVAS_dec 16 bit testv/stv16c_96k_16-16.tst



// Codec B at 96 kbps, 16kHz in, 16kHz out, random FEC at 5%

// Codec B at 96 kbps, 16kHz in, 16kHz out, random FER at 5%

../IVAS_cod 96000 16 testv/stv16c.wav bit

../IVAS_dec -fec 5 16 bit testv/stv16c_96k_16-16_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 16 bit_error testv/stv16c_96k_16-16_FER5.tst
@@ -123,17 +132,19 @@ 
../IVAS_cod 13200 32 testv/stv32c.wav bit

../IVAS_dec 32 bit testv/stv32c_13k20_32-32.tst



// Codec A at 13.20 kbps, 32kHz in, 32kHz out, random FEC at 5%

// Codec A at 13.20 kbps, 32kHz in, 32kHz out, random FER at 5%

../IVAS_cod 13200 32 testv/stv32c.wav bit

../IVAS_dec -fec 5 32 bit testv/stv32c_13k20_32-32_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 32 bit_error testv/stv32c_13k20_32-32_FER5.tst



// Codec B at 16.40 kbps, 32kHz in, 32kHz out, DTX

../IVAS_cod -dtx 16400 32 testv/stv32c.wav bit

../IVAS_dec 32 bit testv/stv32c_16k40_32-32_DTX.tst



// Codec B at 16.40 kbps, 32kHz in, 32kHz out, fixed DTX, random FEC at 5%

// Codec B at 16.40 kbps, 32kHz in, 32kHz out, fixed DTX, random FER at 5%

../IVAS_cod -dtx 16400 32 testv/stv32c.wav bit

../IVAS_dec -fec 5 32 bit testv/stv32c_16k40_32-32_DTX_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 32 bit_error testv/stv32c_16k40_32-32_DTX_FER5.tst



// Codec B at 24.40 kbps, 32kHz in, 32kHz out

../IVAS_cod 24400 32 testv/stv32c.wav bit
@@ -147,13 +158,15 @@ 
../IVAS_cod 48000 32 testv/stv32c.wav bit

../IVAS_dec 32 bit testv/stv32c_48k_32-32.tst



// Codec B at 48 kbps, 32kHz in, 32kHz out, random FEC at 5%

// Codec B at 48 kbps, 32kHz in, 32kHz out, random FER at 5%

../IVAS_cod 48000 32 testv/stv32c.wav bit

../IVAS_dec -fec 5 32 bit testv/stv32c_48k_32-32_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 32 bit_error testv/stv32c_48k_32-32_FER5.tst



// Codec A at 64 kbps, 32kHz in, 32kHz out, random FEC at 5%

// Codec A at 64 kbps, 32kHz in, 32kHz out, random FER at 5%

../IVAS_cod 64000 32 testv/stv32c.wav bit

../IVAS_dec -fec 5 32 bit testv/stv32c_64k_32-32_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 32 bit_error testv/stv32c_64k_32-32_FER5.tst



// Codec B at 96 kbps, 32kHz in, 32kHz out

../IVAS_cod 96000 32 testv/stv32c.wav bit
@@ -174,9 +187,10 @@ 
../IVAS_cod 16400 48 testv/stv48c.wav bit

../IVAS_dec 48 bit testv/stv48c_16k40_48-48.tst



// Codec B at 24.40 kbps, 48kHz in, 48kHz out, random FEC at 5%

// Codec B at 24.40 kbps, 48kHz in, 48kHz out, random FER at 5%

../IVAS_cod 24400 48 testv/stv48c.wav bit

../IVAS_dec -fec 5 48 bit testv/stv48c_24k40_48-48_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 48 bit_error testv/stv48c_24k40_48-48_FER5.tst



// Codec A at 32 kbps, 48kHz in, 48kHz out, FB

../IVAS_cod -max_band FB 32000 48 testv/stv48c.wav bit
@@ -222,9 +236,10 @@ 
../IVAS_cod -dtx 12650 16 testv/stv16n.wav bit

../IVAS_dec 16 bit testv/stv16n_AMR_WB_12k65_16-16_DTX.tst



// AMR-WB IO at 23.85 kbps, 16kHz in, 16kHz out, adaptive DTX, random FEC at 5%

// AMR-WB IO at 23.85 kbps, 16kHz in, 16kHz out, adaptive DTX, random FER at 5%

../IVAS_cod -dtx 0 23850 16 testv/stv16n.wav bit

../IVAS_dec -fec 5 16 bit testv/stv16n_AMR_WB_23k85_16-16_DTX_FEC5.tst

eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error

../IVAS_dec 16 bit_error testv/stv16n_AMR_WB_23k85_16-16_DTX_FER5.tst



// AMR-WB IO at 19.85 kbps, 32kHz in, 32kHz out

../IVAS_cod 19850 32 testv/stv32c.wav bit

scripts/config/self_test_ltv.prm

+242 −162

File changed.

Preview size limit exceeded, changes collapsed.