Commit 6c7cc000 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'main' into nokia/contribution-omasa-combined-format 

IND_LIST_DYN disabled due not implemented yet for OMASA
FIX_356_ISM_METADATA_SYNC disabled due to causing larger difference for OMASA
JBM not working for OMASA and marked todos for further implementation

MASA 2TC 2dir at 384 kbps still non-BE with main.
parents 6d61e915 f6ad1220

.gitignore

+12 −0
Original line number Diff line number Diff line
@@ -72,3 +72,15 @@ Externals/ 


# coan output files that are created when cleaning out switches

coan_out_*

/COMPLEXITY

/res

/tv

/wmops

/Workspace_msvc/renderer.args.json

/Workspace_msvc/encoder.args.json

/Workspace_msvc/decoder.args.json

/scripts/mem_analysis_enc_VBR_5k9.csv

/scripts/mem_analysis_enc_STEREO_sw.png

/scripts/mem_analysis_enc_STEREO_sw.csv

/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv

*.pwv

.gitlab-ci.yml

+63 −3
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ variables: 


default:

  interruptible: true # Make all jobs by default interruptible

  artifacts:

    expire_in: 2 weeks



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

workflow:
@@ -315,7 +313,7 @@ codec-smoke-test: 
  extends:

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

    - .rules-merge-request

  timeout: "5 minutes"

  timeout: "10 minutes"

  stage: test

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

  script:
@@ -328,6 +326,7 @@ codec-smoke-test: 
    - 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"

    expire_in: 1 week

    paths:

      - smoke_test_output.txt

      - smoke_test_output_plc.txt
@@ -352,6 +351,7 @@ codec-msan: 
    - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang memory-sanitizer"; exit 1; fi

  artifacts:

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

    expire_in: 1 week

    paths:

      - scripts/ref/logs/

      - test_output.txt
@@ -374,6 +374,7 @@ codec-asan: 
    - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang address-sanitizer"; exit 1; fi

  artifacts:

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

    expire_in: 1 week

    paths:

      - scripts/ref/logs/

      - test_output.txt
@@ -391,6 +392,7 @@ renderer-smoke-test: 
    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml
@@ -414,6 +416,7 @@ renderer-asan: 
    

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml
@@ -437,6 +440,7 @@ renderer-msan: 
  

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml
@@ -490,6 +494,7 @@ renderer-pytest-on-merge-request: 
      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 2 week

    when: always

    paths:

      - report-junit.xml
@@ -540,6 +545,7 @@ ivas-pytest-on-merge-request: 
      - 123

  artifacts:

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

    expire_in: 2 week

    when: always

    paths:

      - report-junit.xml
@@ -586,6 +592,7 @@ evs-pytest-on-merge-request: 
      - 123

  artifacts:

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

    expire_in: 2 week

    when: always

    paths:

      - report-junit-evs.xml
@@ -644,6 +651,7 @@ clang-format-check: 


    - exit $format_problems

  artifacts:

    expire_in: 2 days

    paths:

      - tmp-formatting-fix/

    when: on_failure
@@ -776,6 +784,7 @@ codec-comparison-on-main-push: 
      - 123

  artifacts:

    name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 2 week

    when: always

    paths:

      - report-junit.xml
@@ -797,6 +806,7 @@ codec-comparison-on-main-push: 
    - sanitizer_test_main

  artifacts:

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

    expire_in: 1 week

    when: always

    paths:

      - ep_015.g192
@@ -976,6 +986,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:
@@ -1060,6 +1119,7 @@ coverage-test-on-main-scheduled: 
  stage: test

  artifacts:

    name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"

    expire_in: 1 week

    paths:

      - $CI_JOB_NAME-public

Workspace_msvc/lib_dec.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />

    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />

    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -521,6 +521,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_omasa_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_util.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ 
    <ClCompile Include="..\lib_util\mime_io.c" />

    <ClCompile Include="..\lib_util\render_config_reader.c" />

    <ClCompile Include="..\lib_util\rtpdump.c" />

    <ClCompile Include="..\lib_util\tsm_scale_file_reader.c" />

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_util\audio_file_reader.h" />
@@ -183,6 +184,7 @@ 
    <ClInclude Include="..\lib_util\rtpdump.h" />

    <ClInclude Include="..\lib_util\tinywavein_c.h" />

    <ClInclude Include="..\lib_util\tinywaveout_c.h" />

    <ClInclude Include="..\lib_util\tsm_scale_file_reader.h" />

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">