Commit 8bb155da authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/ivas-codec-sym-hrir

parents 08bfd79d e4f2974f

.gitignore

+0 −8
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
IVAS_cod

IVAS_dec

IVAS_rend

IVAS_crend_unit_test

obj/

*.a

*.o
@@ -17,7 +16,6 @@ build*/**/* 
IVAS_cod.exe

IVAS_dec.exe

IVAS_rend.exe

IVAS_crend_unit_test.exe

*.user

.vs/

Debug_*/
@@ -25,12 +23,6 @@ Release_*/ 
*.obj

*.pdb



# Unittests

scripts/ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test

scripts/ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test.exe

scripts/ivas_pytests/tests/unit_tests/crend/Debug_*/

scripts/ivas_pytests/tests/unit_tests/crend/Release_*/



# Standalone TD object renderer

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe

.gitlab-ci.yml

+77 −1
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ build-codec-instrumented-linux: 
  extends:

    - .build-job-linux

    - .rules-basis

  timeout: "6 minutes"

  script:

    - *print-common-info

    - bash ci/build_codec_instrumented_linux.sh
@@ -658,12 +659,38 @@ clang-format-check: 
    name: "$ARTIFACT_BASE_NAME"

    expose_as: 'formatting patch'



# check for crashes if first received frame on decoder side is an 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"]

  script:

    - *print-common-info

    - *update-ltv-repo

    - 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

  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"



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

# Test jobs for main branch

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



# check bitexactness to EVS windows binaries

be-2-evs-windows:

.be-2-evs-windows: # Temporarily disabled -- Ericsson Windows runner used for HL activities which the reduces capacity for this job. To be resumed after selection

  extends:

    - .rules-main-push

  tags:
@@ -986,6 +1013,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:

Workspace_msvc/lib_com.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

Workspace_msvc/lib_debug.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <MinimalRebuild>false</MinimalRebuild>

      <ExceptionHandling />

Workspace_msvc/lib_dec.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>