Commit e16bbaab authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into 1112-add-missing-coverage-for-split-rendering

parents 6e6ec8fe 75cdc5ff

.gitlab-ci.yml

+10 −18
Original line number Diff line number Diff line
@@ -1307,11 +1307,8 @@ ivas-conformance: 


    # Reference creation

    - python scripts/prepare_combined_format_inputs.py

    - $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer/test_renderer.py", "tests/split_rendering/test_split_rendering.py"

    - python -m pytest $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files



    # Output creation

    - python -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer_short/test_renderer.py", "tests/split_rendering/test_split_rendering.py"

    - python -m pytest -q $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html

    - python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt



    # Copy input data and output ref data
@@ -1325,7 +1322,7 @@ ivas-conformance: 
    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/renderer_short

    - mkdir testvec/testv/split_rendering

    - mkdir testvec/bin

    - cp    -force -ErrorAction Ignore scripts/testv/* testvec/testv
@@ -1335,9 +1332,8 @@ ivas-conformance: 
    - cp -r -force -ErrorAction Ignore scripts/trajectories testvec

    - cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

    - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/cut testvec/testv/split_rendering/ref

    - cp -r -force -ErrorAction Ignore tests/renderer_short/ref testvec/testv/renderer_short/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/ref testvec/testv/split_rendering/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs

    - cp -r -force -ErrorAction Ignore tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns
@@ -1409,11 +1405,8 @@ ivas-conformance-linux: 


    # Reference creation

    - python3 scripts/prepare_combined_format_inputs.py

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py"

    - python3 -m pytest -q $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files



    # Output creation

    - python3 -m pytest -q $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer_short/test_renderer.py tests/split_rendering/test_split_rendering.py"

    - python3 -m pytest -q $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html

    - python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt



    # Copy input data and output ref data
@@ -1421,7 +1414,7 @@ ivas-conformance-linux: 
    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/renderer_short

    - mkdir testvec/testv/split_rendering

    - mkdir testvec/bin

    - cp -r scripts/testv/* testvec/testv
@@ -1431,9 +1424,8 @@ ivas-conformance-linux: 
    - cp -r scripts/trajectories testvec

    - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

    - cp -r tests/ref testvec/testv/ref

    - cp -r tests/dut/* testvec/testv/ref

    - cp -r tests/renderer/cut testvec/testv/renderer/ref

    - cp -r tests/split_rendering/cut testvec/testv/split_rendering/ref

    - cp -r tests/renderer_short/ref testvec/testv/renderer_short/ref

    - cp -r tests/split_rendering/ref testvec/testv/split_rendering/ref

    - cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs

    - cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns

scripts/dec_header.txt

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ LOG_FILE=Readme_IVAS_dec_log.txt 
rm -rf tmp

rm -rf $CUT_PATH

mkdir -p $CUT_PATH

mkdir -p $CUT_PATH/dut/masa_test/dec_output

mkdir -p $CUT_PATH/dut/param_file/dec

mkdir -p $CUT_PATH/dut/sba_bs/raw

mkdir -p $CUT_PATH/ref/masa_test/dec_output

mkdir -p $CUT_PATH/ref/param_file/dec

mkdir -p $CUT_PATH/ref/sba_bs/raw

scripts/dec_isar_header.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ LOG_FILE=Readme_IVAS_ISAR_dec_log.txt 
rm -rf tmp

rm -rf $CUT_PATH

mkdir -p $CUT_PATH

mkdir -p $CUT_PATH/split_rendering/cut

mkdir -p $CUT_PATH/split_rendering/ref

scripts/enc_header.txt

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ LOG_FILE=Readme_IVAS_enc_log.txt 
rm -rf tmp

rm -rf $CUT_PATH

mkdir -p $CUT_PATH

mkdir -p $CUT_PATH/dut/masa_test/bitstreams

mkdir -p $CUT_PATH/dut/param_file/enc

mkdir -p $CUT_PATH/dut/sba_bs/pkt

mkdir -p $CUT_PATH/ref/masa_test/bitstreams

mkdir -p $CUT_PATH/ref/param_file/enc

mkdir -p $CUT_PATH/ref/sba_bs/pkt

scripts/isar_post_rend_header.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ LOG_FILE=Readme_IVAS_isar_post_rend_log.txt 


rm -rf tmp

rm -rf $CUT_PATH

mkdir -p $CUT_PATH/split_rendering/cut 

mkdir -p $CUT_PATH/split_rendering/ref