Commit ab07534d authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'remotes/origin/Nokia/contribution-omasa-combined-format' into va/contribution-omasa-combined-format-voiceage
parents e2bca22e 5e4f1402

.gitattributes

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ 
*.mat filter=lfs diff=lfs merge=lfs -text

*.met filter=lfs diff=lfs merge=lfs -text

*.pcm filter=lfs diff=lfs merge=lfs -text

*.sofa filter=lfs diff=lfs merge=lfs -text

*.wav filter=lfs diff=lfs merge=lfs -text

*.zip filter=lfs diff=lfs merge=lfs -text

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -66,5 +66,8 @@ __pycache__/ 
#history

.history/



#externals

Externals/



# coan output files that are created when cleaning out switches

coan_out_*

.gitlab-ci.yml

+38 −8
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ variables: 
  EXIT_CODE_NON_BE: 123

  EXIT_CODE_FAIL: 1



default:

  interruptible: true # Make all jobs by default interruptible



# This sets when pipelines are created. Jobs have more specific rules to restrict them.

workflow:
@@ -23,6 +25,7 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'web' # for testing



stages:

  - .pre

  - maintenance

  - build

  - test
@@ -168,6 +171,31 @@ stages: 
      - 123







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

# .pre jobs for setting up things

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



# See: https://gitlab.com/gitlab-org/gitlab/-/issues/194023

# Solution to make main branch pipelines uninterruptible while all other

# pipelines can be interrupted by default. This works because all jobs

# after uninterruptible jobs will be uninterruptible. Resource group

# setting avoids rare case where two fast merges could still interrupt

# pipeline. This should be revisited if there are updates to Gitlab.

uninterruptible:

  stage: .pre

  interruptible: false

  resource_group: uninterruptible

  script:

    - echo "$CI_COMMIT_BRANCH is uninterruptible"

  rules:

    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

      when: always

  tags:

    - ivas-linux







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

# Validation jobs

# ---------------------------------------------------------------
@@ -250,7 +278,8 @@ codec-smoke-test: 
    ### analyze for failures

    - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi

    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi

    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi

    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi

    - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; exit 1; fi

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    paths:
@@ -258,6 +287,7 @@ codec-smoke-test: 
      - smoke_test_output.txt

      - smoke_test_output_plc.txt

      - smoke_test_output_jbm_noEXT.txt

      - smoke_test_output_hrtf.txt

    expose_as: "Smoke test results"



# code selftest testvectors with memory-sanitizer binaries
@@ -795,7 +825,7 @@ sanitizer-test-masa: 
.sanitizer-test-schedule-B:

  extends:

    - .sanitizer-test-template

  timeout: 3 hours

  timeout: 4 hours



sanitizer-test-mc-5_1:

  extends: .sanitizer-test-schedule-B
@@ -810,7 +840,7 @@ sanitizer-test-mc-5_1_2: 
  rules:

    - if: $SANITIZER_SCHEDULE_B

      when: delayed

      start_in: 3 hours

      start_in: 4 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
@@ -820,7 +850,7 @@ sanitizer-test-mc-5_1_4: 
  rules:

    - if: $SANITIZER_SCHEDULE_B

      when: delayed

      start_in: 6 hours

      start_in: 8 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
@@ -830,7 +860,7 @@ sanitizer-test-mc-7_1: 
  rules:

    - if: $SANITIZER_SCHEDULE_B

      when: delayed

      start_in: 9 hours

      start_in: 12 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
@@ -840,7 +870,7 @@ sanitizer-test-mc-7_1_4: 
  rules:

    - if: $SANITIZER_SCHEDULE_B

      when: delayed

      start_in: 12 hours

      start_in: 16 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
@@ -930,8 +960,8 @@ coverage-test-on-main-scheduled: 
  - mv -f wmops/log_*_all.txt wmops/*.js ${public_dir}/

  # move logfiles for links

  - mkdir $public_dir/logs

  # first move logs for "native" sampling rate

  - log_files=$(cat $public_dir/graphs_wmops_flc.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g")

  # first move logs

  - log_files=$(cat $public_dir/graphs*.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g")

  - echo $log_files

  - ls wmops/logs

  - for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done

LICENSE.md

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ SRC_APP = apps 
BUILD        = build

OBJDIR       = obj



SRC_DIRS  = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBUTIL) $(SRC_APP) $(SRC_UTESTS)) 

SRC_DIRS  = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBUTIL) $(SRC_APP)) 



# Name of CLI binaries

CLI_APIDEC   ?= IVAS_dec
@@ -135,7 +135,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS 


###############################################################################



.PHONY: all clean clean_unittests clean_all

.PHONY: all clean



all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND)