Commit 34ecf633 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into 705-renderer-configuration-outputs-false-warning-for-blank-lines

parents 021e46e5 47fc3feb

.gitlab-ci.yml

+5 −5
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ codec-msan: 
    - *print-common-info

    - make clean

    - make -j CLANG=1

    - python3 scripts/self_test.py --create | tee test_output.txt

    - python3 scripts/self_test.py -z console --create | tee test_output.txt

    - run_errors=$(cat test_output.txt | grep -ic "run errors") || true

    - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang memory-sanitizer"; exit 1; fi

  artifacts:
@@ -392,7 +392,7 @@ codec-asan: 
    - *print-common-info

    - make clean

    - make -j CLANG=2

    - python3 scripts/self_test.py --create | tee test_output.txt

    - python3 scripts/self_test.py -z console --create | tee test_output.txt

    - run_errors=$(cat test_output.txt | grep -ic "run errors") || true

    - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang address-sanitizer"; exit 1; fi

  artifacts:
@@ -414,7 +414,7 @@ codec-usan: 
    - *print-common-info

    - make clean

    - make -j CLANG=3

    - UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1 python3 scripts/self_test.py --create

    - UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1 python3 scripts/self_test.py -z console --create

    - grep_exit_code=0

    - grep UndefinedBehaviorSanitizer scripts/ref/logs/* || grep_exit_code=$?

    - if [ $grep_exit_code != 1 ] ; then echo "Run errors in self_test.py with Clang undefined-behavior-sanitizer"; exit 1; fi
@@ -845,9 +845,9 @@ 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 -v SBA)

    - scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 0:20 || exit_code_no_sba=$?

    - 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 SBA)

    - scripts/runIvasCodec.py -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 500 -U 70:80 || exit_code_sba=$?

    - if [ $exit_code_no_sba -ne 0 ] || [ $exit_code_sba -ne 0 ]; then exit 1; fi

  artifacts:

    paths:

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

ci/run_scheduled_sanitizer_test.py

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr 
        DURATION,

        "-p",

        CFG,

        "-z",

        "console",

        "--checks",

        *tests,

        "-m",

ci/smoke_test.sh

+9 −8
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ cfg=./scripts/config/ci_linux.json 
dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat

ism_md_cmd="--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"



if [ $BUILD -eq 1 ];then

	# Enable memory macros to find unbalanced memory allocations/deallocations
@@ -84,21 +85,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 -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

echo "\n======================= 2. ism modes no FEC =======================\n\n"

./scripts/runIvasCodec.py -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

# run the decoding again, but with 15% frame loss

echo "\n======================= 3. all modes with FEC =======================\n\n"

./scripts/runIvasCodec.py -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



# 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 -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 $WORKERS --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 -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 $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"
@@ -107,14 +108,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 -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 $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_)

hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin"

./scripts/runIvasCodec.py -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 $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_)

hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin"

./scripts/runIvasCodec.py -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 $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -167,9 +167,9 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_736_FOA_BR_SWITCH                           /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */

#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/





/* ##################### End NON-BE switches ############################# */



/* ################## End DEVELOPMENT switches ######################### */