diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01a59853c14928147954966b1181e7dca9bc9620..76ed6e06b5777b6b53d89528264a47e46f3d04b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF deduplicate-renderer-tests + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF ci/test-remove-renderer-short # If you need to set some config variable only in a local branch, then add an overwrite here # One example is DISABLE_HRTF - this will be set on a branch which is about to be merged and will be removed in a subsequent second MR # this is more easily done directly here in the child repo diff --git a/scripts/ivas_conformance/README.md b/scripts/ivas_conformance/README.md index 884611e0a7728f741a502e0c3e41effd2a5ae9fa..e7f03aac731d7119aa9207d6e4a65dc9c5516cd9 100644 --- a/scripts/ivas_conformance/README.md +++ b/scripts/ivas_conformance/README.md @@ -96,7 +96,7 @@ CUT_OUTPUTS +- failedCmds.txt : Log of all the shell commands that failed execution +- dec/ : Folder containing all decoder tests CUT outputs +- enc/ : Folder containing all encoder tests CUT outputs - +- renderer_short/ : Folder containing all renderer tests CUT outputs + +- renderer/ : Folder containing all renderer tests CUT outputs +- split_rendering/ : Folder containing all split rendering enc/dec tests ``` diff --git a/scripts/ivas_conformance/ivas_be_conf_test_gen.sh b/scripts/ivas_conformance/ivas_be_conf_test_gen.sh index 6e7f2bb55c5e5a426afff58270e4c21b1f171be0..0e2f191bf3cb86cc3cce515164c46880178c1b19 100644 --- a/scripts/ivas_conformance/ivas_be_conf_test_gen.sh +++ b/scripts/ivas_conformance/ivas_be_conf_test_gen.sh @@ -14,7 +14,7 @@ rm -rf testvec mkdir testvec mkdir testvec/binauralRenderer_interface mkdir testvec/testv -mkdir testvec/testv/renderer_short +mkdir testvec/testv/renderer mkdir testvec/testv/split_rendering mkdir testvec/bin cp -r scripts/testv/* testvec/testv @@ -24,7 +24,7 @@ cp -r scripts/switchPaths testvec 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/renderer/ref testvec/testv/renderer_short/ref +cp -r tests/renderer/ref testvec/testv/renderer/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 diff --git a/scripts/ivas_conformance/runConformance.py b/scripts/ivas_conformance/runConformance.py index 3fe69b1805d2a9a3cd9f97704aa5bd716185c65c..56c79841290847211c9e68ab854e7ba8c6de9857 100644 --- a/scripts/ivas_conformance/runConformance.py +++ b/scripts/ivas_conformance/runConformance.py @@ -828,7 +828,7 @@ class MLDConformance: "$CUT_PATH/ref/param_file/", f"{self.testvDir}/ref/param_file/" ) command = command.replace( - "$CUT_PATH/renderer_short/ref/", f"{self.testvDir}/renderer_short/ref/" + "$CUT_PATH/renderer/ref/", f"{self.testvDir}/renderer/ref/" ) command = command.replace( "$CUT_PATH/split_rendering/ref", @@ -845,7 +845,7 @@ class MLDConformance: "$CUT_PATH/ref/param_file/dec/", f"{self.outputDir}/dec/" ) command = command.replace( - "$CUT_PATH/renderer_short/ref/", f"{self.outputDir}/renderer_short/ref/" + "$CUT_PATH/renderer/ref/", f"{self.outputDir}/renderer/ref/" ) command = command.replace( "$CUT_PATH/split_rendering/cut/", diff --git a/scripts/rend_header.txt b/scripts/rend_header.txt index ce2e274c6698bccd11aef138606b7106fa7167fd..a83b0a17bc7009126d8fb221623eaccb282b0abb 100644 --- a/scripts/rend_header.txt +++ b/scripts/rend_header.txt @@ -15,7 +15,7 @@ LOG_FILE=Readme_IVAS_rend_log.txt rm -rf tmp rm -rf $CUT_PATH -mkdir -p $CUT_PATH/renderer_short/ref -mkdir -p $CUT_PATH/renderer_short/data +mkdir -p $CUT_PATH/renderer/ref +mkdir -p $CUT_PATH/renderer/data