Commit 4731543c authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into 137-sid-todo-qmetadata-masa

parents ab71e8df daca8536

.gitlab-ci.yml

+14 −7
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ variables: 
  SANITIZER_TESTS: "CLANG1 CLANG2"

  OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"

  OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"

  EXIT_CODE_NON_BE: 123

  EXIT_CODE_FAIL: 1
@@ -69,7 +69,9 @@ stages: 
  # compare to last target branch commit before pipeline was created

  - target_commit=$(git log $CI_MERGE_REQUEST_TARGET_BRANCH_NAME -1 --oneline --before=${CI_PIPELINE_CREATED_AT} --format=%H)





.check-for-testvectors: &check-for-testvectors

  # check if the testvector files specified in scripts/config/ci_linux*.json are present

  - python3 -m pytest ci/test_vectors_available.py



.merge-request-comparison-setup-codec:

  &merge-request-comparison-setup-codec ### build test binaries, initial clean for paranoia reasons
@@ -660,30 +662,35 @@ clang-format-check: 
    expose_as: 'formatting patch'



# check for crashes if first received frame on decoder side is an SID

.check-first-frame-is-sid:

check-first-frame-is-sid:

  extends:

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

    - .rules-merge-request

  tags:

    - ivas-linux

  stage: test

  needs: ["build-codec-linux-cmake"]

  # needs: ["build-codec-linux-cmake"]

  script:

    - *print-common-info

    - *update-ltv-repo

    - *check-for-testvectors

    - cmake .

    - make -j



    # TODO: for some MASA modes, we currently do not have testvectors that actually trigger DTX

    - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -v MASA)

    - echo $modes

    - scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500

    # SBA is run separately to use shorter part of file

    - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -v MASA | grep -v SBA)

    - scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 0:20 || exit_code_no_sba=$?

    - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep SBA)

    - scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 70:80 || exit_code_sba=$?

    - if [ $exit_code_no_sba != 0 || $exit_code_sba != 0]; then exit 1; fi

  artifacts:

    paths:

      - out/logs

    when: on_failure

    name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--sidstart"

    expose_as: "logs-sidstart"

    expire_in: "5 days"



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

# Test jobs for main branch

apps/decoder.c

+20 −155

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+6 −29

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+0 −221

File changed.

Preview size limit exceeded, changes collapsed.

ci/test_vectors_available.py

0 → 100644
+19 −0
Original line number Diff line number Diff line 
import pytest

import pathlib

import json

import itertools



TEST_CONFIG_DIR = pathlib.Path(__file__).parent.parent.joinpath("scripts/config")

TEST_CONFIGS = [f for f in TEST_CONFIG_DIR.iterdir() if f.name.startswith("ci_linux")]



def get_testvectors_from_config(config) -> list:

    with open(config) as f:

        cfg = json.load(f)

    return list(cfg["inpaths"].values())



TESTVECTORS = sorted(set(itertools.chain(*[get_testvectors_from_config(cfg) for cfg in TEST_CONFIGS])))



@pytest.mark.parametrize("testvector", TESTVECTORS)

def test_vectors_available(testvector):

    if not pathlib.Path(testvector).exists():

        raise FileNotFoundError(f"Testvector {testvector} can not be found")