From ea2b4ed8acfa0c2cf51a043dfccd2b3e8a8e64dc Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Mon, 15 May 2023 13:26:15 +0200 Subject: [PATCH 1/3] Amend ivas_modes.json and ci/smoke_test.sh to trigger expand ISM coverage, including extended metadata --- ci/smoke_test.sh | 2 +- scripts/config/ivas_modes.json | 76 ++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index d3206fce1a..3d88f146e3 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -55,7 +55,7 @@ fi cfg=./scripts/config/ci_linux.json dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat -ism_md_cmd="--metadata_files /usr/local/testv/stvISM1.csv /usr/local/testv/stvISM2.csv /usr/local/testv/stvISM3.csv /usr/local/testv/stvISM4.csv" +ism_md_cmd="--metadata_files /usr/local/ltv/stvISM1.csv /usr/local/ltv/stvISM2.csv /usr/local/ltv/stvISM3.csv /usr/local/ltv/stvISM4.csv" if [ $BUILD -eq 1 ];then # Enable memory macros to find unbalanced memory allocations/deallocations diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index ab08c4e5cd..b0d98fc08d 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -2316,18 +2316,30 @@ "mono": false, "bitrates": { "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, 64000, 80000, 96000, 128000 ], "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, 64000, 80000, 96000, 128000 ], "fb": [ + 32000, + 48000, 64000, 80000, 96000, @@ -2359,18 +2371,30 @@ "mono": false, "bitrates": { "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, 64000, 80000, 96000, 128000 ], "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, 64000, 80000, 96000, 128000 ], "fb": [ + 32000, + 48000, 64000, 80000, 96000, @@ -2403,6 +2427,10 @@ "mono": false, "bitrates": { "wb": [ + 16400, + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2412,6 +2440,10 @@ 256000 ], "swb": [ + 16400, + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2421,6 +2453,8 @@ 256000 ], "fb": [ + 32000, + 48000, 64000, 80000, 96000, @@ -2455,6 +2489,10 @@ "mono": false, "bitrates": { "wb": [ + 16400, + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2464,6 +2502,10 @@ 256000 ], "swb": [ + 16400, + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2473,6 +2515,8 @@ 256000 ], "fb": [ + 32000, + 48000, 64000, 80000, 96000, @@ -2508,6 +2552,9 @@ "mono": false, "bitrates": { "wb": [ + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2518,6 +2565,9 @@ 384000 ], "swb": [ + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2528,6 +2578,8 @@ 384000 ], "fb": [ + 32000, + 48000, 64000, 80000, 96000, @@ -2563,6 +2615,9 @@ "mono": false, "bitrates": { "wb": [ + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2573,6 +2628,9 @@ 384000 ], "swb": [ + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2583,6 +2641,8 @@ 384000 ], "fb": [ + 32000, + 48000, 64000, 80000, 96000, @@ -2619,6 +2679,9 @@ "mono": false, "bitrates": { "wb": [ + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2630,6 +2693,9 @@ 512000 ], "swb": [ + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2641,6 +2707,8 @@ 512000 ], "fb": [ + 32000, + 48000, 64000, 80000, 96000, @@ -2677,6 +2745,9 @@ "mono": false, "bitrates": { "wb": [ + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2688,6 +2759,9 @@ 512000 ], "swb": [ + 24400, + 32000, + 48000, 64000, 80000, 96000, @@ -2699,6 +2773,8 @@ 512000 ], "fb": [ + 32000, + 48000, 64000, 80000, 96000, -- GitLab From 15be0a5c92f1a304199903ae1fabd186ce7dc857 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Mon, 15 May 2023 13:32:09 +0200 Subject: [PATCH 2/3] Correct names on metadata test files in ci/smoke_test.sh --- ci/smoke_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index 3d88f146e3..9e22fce70a 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -55,7 +55,7 @@ fi 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/stvISM1.csv /usr/local/ltv/stvISM2.csv /usr/local/ltv/stvISM3.csv /usr/local/ltv/stvISM4.csv" +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" if [ $BUILD -eq 1 ];then # Enable memory macros to find unbalanced memory allocations/deallocations -- GitLab From 3dd12fb0687315df8054af8c7ad1d4dbc3976719 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 May 2023 14:51:32 +0200 Subject: [PATCH 3/3] add jobs for scheduled sanitizer tests forISM+ modes --- .gitlab-ci.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5f33f3c6f..7f085c32f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -976,6 +976,55 @@ sanitizer-test-planarsba: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py PlanarSBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS +### --- sanitizer schedule D --- + +.sanitizer-test-schedule-D: + extends: + - .sanitizer-test-template + +sanitizer-test-ism+1: + extends: .sanitizer-test-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + timeout: 2 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py ISM+1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS + +sanitizer-test-ism+2: + extends: .sanitizer-test-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 2 hours + timeout: 3 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py ISM+2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS + +sanitizer-test-ism+3: + extends: .sanitizer-test-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 5 hours + timeout: 3 hour + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py ISM+3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS + +sanitizer-test-ism+4: + extends: .sanitizer-test-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 8 hours + timeout: 4 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py ISM+4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS + + # GCOV/LCOV coverage analysis of self_test suite coverage-test-on-main-scheduled: extends: -- GitLab