From 91f4fe1080d0d50a51b2809a82cb78a76db13d53 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 18 Jun 2025 14:31:04 +0200 Subject: [PATCH 1/4] Set reference branch to float-pc for testing. Use HRTF model files from 78154d0b3f1b2c6c8ff8a234f3f7cf865d467d35 --- .gitlab-ci.yml | 4 ++-- .../binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin | 4 ++-- .../binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin | 4 ++-- .../binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 884708ec4f..c94e3125e6 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 44cb5638949b874ce0f5c3bf4359f9db860d88bc + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 2cd9604cf9a4eb927076e21ff181098a837ea9f6 include: - local: .gitlab-ci/variables.yml @@ -63,7 +63,7 @@ workflow: ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression .get-basop-float-reference: &get-basop-float-reference - - git clone -b $BASOP_REFERENCE_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch --depth 1 ivas-basop + - git clone -b $BASOP_REFERENCE_BRANCH_PC https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch --depth 1 ivas-basop - cd ivas-basop - git status - make -j diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin index 9a988eb588..ffb4662687 100644 --- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin +++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a263c5498fc7ec0407c4f448e78e1f0aaf97163234ef44f2f79a1dfcb5adc37f -size 1968026 +oid sha256:600f05865baeeb01c6435725f87c6a91e6e75e481ffae2ec3d6a7c62aba5fc7c +size 1971974 diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin index 73f151217e..97190b44f8 100644 --- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin +++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8622b0f7969a3126f8ab147c10392916b5e9cbe8d8bd9c04798abd3836e36c76 -size 2431246 +oid sha256:cda90cc841793f0a1ed76b580e46b9989564b055b664ed6746ebfa0033a74f2b +size 2430778 diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin index d847e74613..e1f6981162 100644 --- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin +++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30bcf48f0c851d4e676d5b92be7eb3032442f5106a1072ef8fc9b335d60d0fbf -size 2673694 +oid sha256:c1654ead069a420b97af8755edbb1c358806aa3c5c07db3113789fe0942642de +size 2673946 -- GitLab From e1f03be33ebf0994d2e5e2aeb7097772d92500e3 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 18 Jun 2025 15:11:10 +0200 Subject: [PATCH 2/4] Setup MR pipeline rules for basop-ci-branch-pc --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c94e3125e6..5c829947f8 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 2cd9604cf9a4eb927076e21ff181098a837ea9f6 + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 1ed1eb9dba06245fbcc80bcd24ea43be284f7f8e include: - local: .gitlab-ci/variables.yml @@ -238,7 +238,7 @@ branch-is-up-to-date-with-main-post: .basop-ci-branch-compat-template: extends: - .test-job-linux - - .rules-merge-request-to-basop-ci-branch + - .rules-merge-request-to-basop-ci-branch-pc tags: - ivas-linux before_script: @@ -401,7 +401,7 @@ build-codec-windows-msbuild: codec-smoke-test: extends: - .test-job-linux-needs-testv-dir - - .rules-merge-request-to-basop-ci-branch-or-main + - .rules-merge-request-to-basop-ci-branch-pc-or-main timeout: "20 minutes" tags: - ivas-linux-fast -- GitLab From f4558667e07746223742d8ff347962de55fcdcc3 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 24 Jun 2025 09:26:41 +0200 Subject: [PATCH 3/4] Set --use-main-pc-set for correct filtering of test cases for float-pc --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c829947f8..ad128ace23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -243,7 +243,7 @@ branch-is-up-to-date-with-main-post: - ivas-linux before_script: - !reference [.job-linux, before_script] - - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm + - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm --use-main-pc-set - python3 tests/create_short_testvectors.py - python3 scripts/prepare_combined_format_inputs.py -- GitLab From d189eaedb4ab7e445579c8512cdd1ddcdf1abbfc Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 24 Jun 2025 09:47:21 +0200 Subject: [PATCH 4/4] Fix codec-smoke-test for basop-ci-branch-pc target --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad128ace23..a4a6fa3991 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -412,9 +412,9 @@ codec-smoke-test: # LTV update needed as ltv ISM metadata files are used - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh - # for MRs to basop-ci-branch, we want to test with the BASOP float reference build + # for MRs to basop-ci-branch-pc, we want to test with the BASOP float reference build # per default, the smoke test builds the current repo again with WMOPS activated to catch unbalanced instrumentation macros - - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "basop-ci-branch" ]; then + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "basop-ci-branch-pc" ]; then - python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline - *get-basop-float-reference - bash ci/smoke_test.sh coverage -- GitLab