Commit 468864be authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'main' into 700-delivery-package-unused-tables

parents e96304aa 0ede305f

.gitignore

+3 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ scripts/testv/stvOMASA_*.csv 
scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav

scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav

# default reference binary name

IVAS_cod_ref

IVAS_dec_ref

IVAS_rend_ref

IVAS_cod_ref*

IVAS_dec_ref*

IVAS_rend_ref*



# Python files that pop up when running scripts

__pycache__/

.gitlab-ci.yml

+139 −122

File changed.

Preview size limit exceeded, changes collapsed.

apps/decoder.c

+787 −1001

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+120 −78

File changed.

Preview size limit exceeded, changes collapsed.

ci/ivas_voip_be_test.sh

+3 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ fi 
modes=('SBA_b128_wb_cbr' 'MC_7_1_b96_fb_cbr' 'ISM2_b48_fb_cbr')

output_formats=('STEREO' 'FOA' '7_1' 'HOA3')

limit_input_to_x_seconds=30

verbosity_cmd="-z console"



cfg=./scripts/config/ci_linux.json

dly_profile=./scripts/dly_error_profiles/dly_error_profile_0.dat
@@ -71,8 +72,8 @@ output_dir_default="out" 
output_dir_voip="out_voip"



# Run the same modes in VoIP and non-VoIP mode with a neutral delay profile

./scripts/runIvasCodec.py -p $cfg $WORKERS -U $limit_input_to_x_seconds -m "${modes[@]}" --oc "${output_formats[@]}" -o $output_dir_default | tee voip_be_test_output.txt

./scripts/runIvasCodec.py -p $cfg $WORKERS -U $limit_input_to_x_seconds -m "${modes[@]}" --oc "${output_formats[@]}" -o $output_dir_voip -J "$dly_profile" | tee -a voip_be_test_output.txt

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $WORKERS -U $limit_input_to_x_seconds -m "${modes[@]}" --oc "${output_formats[@]}" -o $output_dir_default | tee voip_be_test_output.txt

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $WORKERS -U $limit_input_to_x_seconds -m "${modes[@]}" --oc "${output_formats[@]}" -o $output_dir_voip -J "$dly_profile" | tee -a voip_be_test_output.txt



# Check if Python scripts above failed. They return status 0 even when running a mode fails, so we have to parse log file

if grep -iq failed voip_be_test_output.txt ; then