Commit eb28ee4d authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 92-spar-code-redundancies-2

parents 487815fe d76dee82

.gitlab-ci.yml

+38 −14
Original line number Diff line number Diff line 
variables:

  TESTV_DIR: "/usr/local/testv"

  LTV_DIR: "/usr/local/ltv"

  BUILD_OUTPUT: "build_output.txt"

  EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"

  SANITIZER_TESTS: "CLANG1 CLANG2"
@@ -88,6 +89,11 @@ stages: 
    - if [ $exit_code -eq 1 ] && [ $non_be_flag != 0 ]; then echo "Non-bitexact  cases with non-BE tag encountered"; exit $EXIT_CODE_NON_BE; fi

    - exit 0



.update-ltv-repo: &update-ltv-repo

  - cd $LTV_DIR

  - git pull

  - cd -



# ---------------------------------------------------------------

# Job templates

# ---------------------------------------------------------------
@@ -528,10 +534,13 @@ codec-comparison-on-main-push: 
# ---------------------------------------------------------------

.sanitizer-test-template:

  extends:

    # TODO: still needed since MASA ltv vectors are not there yet

    #       when they were added, we can add a needs-ltv-dir template

    - .test-job-linux-needs-testv-dir

  stage: test

  tags:

    - sanitizer_test_main

  timeout: "2 hours"

  artifacts:

    name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"

    when: always
@@ -545,6 +554,7 @@ sanitizer-test-mono: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS



sanitizer-test-stereo:
@@ -552,8 +562,9 @@ sanitizer-test-stereo: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 20 minutes

      start_in: 1 hour

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS



sanitizer-test-stereodmxevs:
@@ -561,8 +572,9 @@ sanitizer-test-stereodmxevs: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 40 minutes

      start_in: 2 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py StereoDmxEvs mono --tests $SANITIZER_TESTS



sanitizer-test-ism1:
@@ -570,8 +582,9 @@ sanitizer-test-ism1: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 1 hour

      start_in: 3 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS



sanitizer-test-ism2:
@@ -579,8 +592,9 @@ sanitizer-test-ism2: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 1 hour 30 minutes

      start_in: 4 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS



sanitizer-test-ism3:
@@ -588,8 +602,9 @@ sanitizer-test-ism3: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 2 hours

      start_in: 6 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS



sanitizer-test-ism4:
@@ -597,8 +612,9 @@ sanitizer-test-ism4: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 2 hours 30 minutes

      start_in: 8 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS



sanitizer-test-mc-5_1:
@@ -606,8 +622,9 @@ sanitizer-test-mc-5_1: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 3 hours

      start_in: 10 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py 5_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-mc-5_1_2:
@@ -615,8 +632,9 @@ sanitizer-test-mc-5_1_2: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 4 hours

      start_in: 12 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py 5_1_2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-mc-5_1_4:
@@ -624,8 +642,9 @@ sanitizer-test-mc-5_1_4: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 5 hours

      start_in: 14 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py 5_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-mc-7_1:
@@ -633,8 +652,9 @@ sanitizer-test-mc-7_1: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 6 hours

      start_in: 16 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py 7_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-mc-7_1_4:
@@ -642,8 +662,9 @@ sanitizer-test-mc-7_1_4: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 7 hours

      start_in: 18 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py 7_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-masa:
@@ -651,8 +672,9 @@ sanitizer-test-masa: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 8 hours

      start_in: 20 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS



sanitizer-test-sba:
@@ -660,8 +682,9 @@ sanitizer-test-sba: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 9 hours

      start_in: 22 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py SBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-planarsba:
@@ -669,8 +692,9 @@ sanitizer-test-planarsba: 
  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

      start_in: 10 hours

      start_in: 24 hours

  script:

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



# GCOV/LCOV coverage analysis of self_test suite

ci/run_scheduled_sanitizer_test.py

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import pathlib 




DURATION = "120"

CFG = "ci_linux.json"

CFG = "ci_linux_ltv.json"

SUPPORTED_TESTS = ["CLANG1", "CLANG2", "CLANG3", "VALGRIND"]

EP_FILE = "ep_015.g192"

GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {int(DURATION) * 50} {EP_FILE}"

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
#define FIX_I173_I174                                   /* Issues 173 and 174: Remove frame and subframe index from ISm metadata and headtracking respectively. */

#define FIX_TCX_DEC_RECONF_BFI

#define FIX_SBA_DTX_DECODE_ERROR                        /* Issue 176: SBA decoder error with DTX at 80kbps SWB, Issue 21: SBA front-VAD threshold (203) */

#define FIX_MSAN_ERROR_STEREO_RATE_SWITCHING            /* addresses Issue 177 */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_post_proc.c

+4 −0
Original line number Diff line number Diff line
@@ -478,7 +478,11 @@ void stereo_dft_dec_core_switching( 
                mvr2r( output, pAp_input, st->L_frame );

            }



#ifdef FIX_MSAN_ERROR_STEREO_RATE_SWITCHING

            if ( st->last_core == ACELP_CORE && !( st->prev_bfi == 1 && st->last_core == ACELP_CORE && st->last_con_tcx == 1 ) && !st->tcxonly ) /* ACELP -> TCX/HQ-Core */

#else

            if ( st->last_core == ACELP_CORE && !( st->prev_bfi == 1 && st->last_core == ACELP_CORE && st->last_con_tcx == 1 ) ) /* ACELP -> TCX/HQ-Core */

#endif

            {

                mvr2r( tcx_core_buf, tmp_fade, ap_fade_len );

                for ( i = 0; i < ap_fade_len; i++ )

scripts/config/ci_linux_ltv.json

0 → 100644
+25 −0
Original line number Diff line number Diff line 
{

    "afspPath": "not_needed",

    "utilPath": "/tools",

    "inpaths": {

        "MONO": "/usr/local/ltv/ltv48_MONO.wav",

        "STEREO": "/usr/local/ltv/ltv48_STEREO.wav",

        "FOA": "/usr/local/ltv/ltv48_FOA.wav",

        "HOA2": "/usr/local/ltv/ltv48_HOA2.wav",

        "HOA3": "/usr/local/ltv/ltv48_HOA3.wav",

        "SBA": "/usr/local/ltv/ltv48_HOA3.wav",

        "MASA1TC1DIR": "/usr/local/testv/test_MASA_1dir1TC.wav",

        "MASA1TC2DIR": "/usr/local/testv/test_MASA_2dir1TC.wav",

        "MASA2TC1DIR": "/usr/local/testv/test_MASA_1dir2TC.wav",

        "MASA2TC2DIR": "/usr/local/testv/test_MASA_2dir2TC.wav",

        "5_1": "/usr/local/ltv/ltv48_MC51.wav",

        "5_1_2": "/usr/local/ltv/ltv48_MC512.wav",

        "5_1_4": "/usr/local/ltv/ltv48_MC514.wav",

        "7_1": "/usr/local/ltv/ltv48_MC71.wav",

        "7_1_4": "/usr/local/ltv/ltv48_MC714.wav",

        "ISM1": "/usr/local/ltv/ltv48_1ISM.wav",

        "ISM2": "/usr/local/ltv/ltv48_2ISM.wav",

        "ISM3": "/usr/local/ltv/ltv48_3ISM.wav",

        "ISM4": "/usr/local/ltv/ltv48_4ISM.wav"

    }

}