Commit de79d0a0 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 1163-clean-up-leftover-16-bit-hrtf-rom-switches

parents 4a1acf50 da6dd8ef

.gitlab-ci.yml

+4 −0
Original line number Diff line number Diff line
@@ -2248,9 +2248,13 @@ coverage-test-on-main-scheduled: 
    - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script

    - 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 -v -n auto --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec --use_ltv

    - 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 --use_ltv

    # need to ignore non-zero exit codes as limiter is active and thus the different framesiszes will not be BE in all cases

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only || true

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only || true

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only --use_ltv || true

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only --use_ltv || true

    - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref

    - python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_cut    

    - lcov -c -d obj -o coverage_stv.info # extract coverage of short test vectors here

scripts/reverb/acoustic_environment_hospital_patientroom.cfg

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
[roomAcoustics]

frequencyGridCount = 1;

acousticEnvironmentCount = 1;



[frequencyGrid:0]

method = individualFrequencies;

frequencies = [

        20.0, 25.0, 31.5, 40.0, 

        50.0, 63.0, 80.0, 100.0, 

        125.0, 160.0, 200.0, 250.0, 

        315.0, 400.0, 500.0, 630.0, 

        800.0, 1000.0, 1250.0, 1600.0, 

        2000.0, 2500.0, 3150.0, 4000.0, 

        5000.0, 6300.0, 8000.0, 10000.0, 

        12500.0, 16000.0, 20000.0];



[acousticEnvironment:0]

id = 0;

frequencyGridIndex = 0;

predelay = 0.08163;

rt60 = [

        0.81275, 0.61888, 0.45111, 0.34672, 0.46683, 0.53987, 0.61874, 0.70291, 0.66657, 0.73037,

        0.75090, 0.72470, 0.75486, 0.75857, 0.76844, 0.74999, 0.77622, 0.78227, 0.77441, 0.74688, 

        0.73521, 0.73782, 0.71928, 0.71708, 0.71465, 0.60592, 0.52031, 0.51768, 0.52102, 0.37956,

        0.30786];



dsr = [

        0.00019952621, 0.00019952621, 7.9432844e-05, 5.0118702e-05, 7.943284e-06, 6.3095763e-06, 6.3095763e-06, 7.943284e-06, 1e-05, 1e-05,

        7.943284e-06, 1e-05, 1e-05, 1e-05, 7.943284e-06, 1e-05, 1e-05, 7.943284e-06, 7.943284e-06, 6.3095763e-06,

        6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 3.1622776e-06, 3.1622776e-06, 3.1622776e-06, 6.3095763e-07, 3.1622776e-07,

        3.1622776e-07];

scripts/reverb/acoustic_environment_recreation.cfg

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
[roomAcoustics]

frequencyGridCount = 1;

acousticEnvironmentCount = 1;



[frequencyGrid:0]

nBands = 31;

method = individualFrequencies;

frequencies = [

    20.0, 25.0, 31.5, 40.0, 

    50.0, 63.0, 80.0, 100.0, 

    125.0, 160.0, 200.0, 250.0, 

    315.0, 400.0, 500.0, 630.0, 

    800.0, 1000.0, 1250.0, 1600.0, 

    2000.0, 2500.0, 3150.0, 4000.0, 

    5000.0, 6300.0, 8000.0, 10000.0, 

    12500.0, 16000.0, 20000.0];



[acousticEnvironment:0]

id = 0;

frequencyGridIndex = 0;

predelay = 0.43031;

rt60 = [

        4.51916, 4.89553, 4.83276, 5.00198, 5.34468, 5.76026, 6.36818, 6.95503, 7.27557, 7.62559,

        8.08892, 8.16002, 8.13900, 8.17919, 8.16280, 8.46226, 9.61806, 9.93048, 9.81353, 8.59340, 

        8.38885, 8.36823, 6.51845, 3.76089, 3.75374, 3.57451, 1.28724, 1.22174, 1.22448, 1.71631,

        2.14343];



dsr = [

        1e-06, 7.943284e-07, 1e-06, 1e-06, 1.5848925e-06, 1.9952631e-06, 3.1622776e-06, 3.9810707e-06, 6.3095763e-06, 7.943284e-06,

        1e-05, 7.943284e-06, 7.943284e-06, 7.943284e-06, 7.943284e-06, 7.943284e-06, 5.01187e-06, 5.01187e-06, 3.9810707e-06, 3.1622776e-06,

        3.1622776e-06, 2.511887e-06, 7.943284e-07, 6.3095763e-07, 6.3095763e-07, 5.01187e-08, 1.2589251e-08, 1.2589251e-08, 1.2589265e-09, 1.2589266e-11,

        3.981075e-12];

scripts/reverb/acoustic_environment_renderer.cfg

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
[roomAcoustics]

frequencyGridCount = 1;

acousticEnvironmentCount = 1;



[frequencyGrid:0]

method = individualFrequencies;

frequencies = [

        20.0, 25.0, 31.5, 40.0,

        50.0, 63.0, 80.0, 100.0,

        125.0, 160.0, 200.0, 250.0,

        315.0, 400.0, 500.0, 630.0,

        800.0, 1000.0, 1250.0, 1600.0,

        2000.0, 2500.0, 3150.0, 4000.0,

        5000.0, 6300.0, 8000.0, 10000.0,

        12500.0, 16000.0, 20000.0];



[acousticEnvironment:0]

id = 0;

frequencyGridIndex = 0;

predelay = 0.1;

rt60 = [

        1.3622, 1.4486, 1.3168, 1.5787,

        1.4766, 1.3954, 1.2889, 1.3462,

        1.0759, 1.0401, 1.0970, 1.0850,

        1.0910, 1.0404, 1.0499, 1.0699,

        1.1028, 1.1714, 1.1027, 1.0666,

        1.0550, 1.0553, 1.0521, 1.0569,

        1.0421, 0.97822, 0.80487, 0.75944,

        0.71945, 0.61682, 0.60031];



dsr = [

        1.9952632e-08, 1.9952632e-08, 1.2589251e-08, 1.5848926e-08, 1.2589251e-08, 1.9952632e-08, 2.511887e-08, 3.9810708e-08, 1e-07, 1.9952633e-07,

        3.981071e-07, 6.3095763e-07, 7.943284e-07, 6.3095763e-07, 5.01187e-07, 5.01187e-07, 6.3095763e-07, 6.3095763e-07, 7.943284e-07, 6.3095763e-07,

        5.01187e-07, 6.3095763e-07, 6.3095763e-07, 6.3095763e-07, 5.01187e-07, 2.511887e-07, 1.2589251e-07, 1e-07, 6.309576e-08, 3.1622776e-08,

        2.511887e-08];

scripts/reverb/acoustic_environment_renderer_directivity.cfg

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
[roomAcoustics]

frequencyGridCount = 1;

acousticEnvironmentCount = 1;



[frequencyGrid:0]

method = individualFrequencies;

frequencies = [

        20.0, 25.0, 31.5, 40.0,

        50.0, 63.0, 80.0, 100.0,

        125.0, 160.0, 200.0, 250.0,

        315.0, 400.0, 500.0, 630.0,

        800.0, 1000.0, 1250.0, 1600.0,

        2000.0, 2500.0, 3150.0, 4000.0,

        5000.0, 6300.0, 8000.0, 10000.0,

        12500.0, 16000.0, 20000.0];



[acousticEnvironment:0]

id = 0;

frequencyGridIndex = 0;

predelay = 0.1;

rt60 = [

        1.3622, 1.4486, 1.3168, 1.5787,

        1.4766, 1.3954, 1.2889, 1.3462,

        1.0759, 1.0401, 1.0970, 1.0850,

        1.0910, 1.0404, 1.0499, 1.0699,

        1.1028, 1.1714, 1.1027, 1.0666,

        1.0550, 1.0553, 1.0521, 1.0569,

        1.0421, 0.97822, 0.80487, 0.75944,

        0.71945, 0.61682, 0.60031];



dsr = [

        1.9952632e-08, 1.9952632e-08, 1.2589251e-08, 1.5848926e-08, 1.2589251e-08, 1.9952632e-08, 2.511887e-08, 3.9810708e-08, 1e-07, 1.9952633e-07,

        3.981071e-07, 6.3095763e-07, 7.943284e-07, 6.3095763e-07, 5.01187e-07, 5.01187e-07, 6.3095763e-07, 6.3095763e-07, 7.943284e-07, 6.3095763e-07,

        5.01187e-07, 6.3095763e-07, 6.3095763e-07, 6.3095763e-07, 5.01187e-07, 2.511887e-07, 1.2589251e-07, 1e-07, 6.309576e-08, 3.1622776e-08,

        2.511887e-08];



[directivitySetting]

directivityCount = 1;



[directivityPattern:0]

directivity = [0.0, 360.0, 0.2512]