Commit 2650b868 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 711-codec-smoke-test-passes-when-test-did-not-run-properly
parents 00eb1478 93521388

.gitignore

+3 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ scripts/testv/stvOMASA_*.csv 
scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav

scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav

# default reference binary name

IVAS_cod_ref

IVAS_dec_ref

IVAS_rend_ref

IVAS_cod_ref*

IVAS_dec_ref*

IVAS_rend_ref*



# Python files that pop up when running scripts

__pycache__/

.gitlab-ci.yml

+32 −35
Original line number Diff line number Diff line
@@ -68,12 +68,12 @@ stages: 
  # needed when depth is lower than the number of commits in the branch

  - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:$CI_MERGE_REQUEST_TARGET_BRANCH_NAME



.mr-get-target-commit: &mr-get-target-commit

  # compare to last target branch commit before pipeline was created

.mr-get-target-commit:

  &mr-get-target-commit # 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

.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:
@@ -162,7 +162,6 @@ stages: 
  rules:

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH





# templates to define stages and platforms

.test-job-linux:

  tags:
@@ -202,7 +201,6 @@ stages: 
    exit_codes:

      - 123





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

# .pre jobs for setting up things

# ---------------------------------------------------------------
@@ -225,8 +223,6 @@ uninterruptible: 
  tags:

    - ivas-linux







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

# Validation jobs

# ---------------------------------------------------------------
@@ -245,7 +241,6 @@ check-if-branch-is-up-to-date-with-main: 
    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else exit 1; fi;





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

# Build jobs

# ---------------------------------------------------------------
@@ -529,8 +524,7 @@ renderer-pytest-on-merge-request: 
    # write to temporary file as workaround for failures observed with piping echo

    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - non_be_flag=$(grep -c --ignore-case "\[rend\(erer\)*[ -]*non[ -]*be\]" tmp.txt) || true

    # TODO: needs splitting the test between reference and cut generation

    #- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

    - ref_using_main=$(grep -c --ignore-case "\[ref[ -]*using[ -]*main\]" tmp.txt) || true



    # store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)
@@ -548,6 +542,9 @@ renderer-pytest-on-merge-request: 
    - make clean

    - make -j IVAS_rend



    ### Run test using scripts and input from main

    - if [ $ref_using_main == 1 ]; then git checkout $target_commit; fi



    # run test

    - exit_code=0

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer_be_comparison.py || exit_code=$?
@@ -608,8 +605,7 @@ split-rendering-pytest-on-merge-request: 
    # write to temporary file as workaround for failures observed with piping echo

    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - non_be_flag=$(grep -c --ignore-case "\[split*[ -]*non[ -]*be\]" tmp.txt) || true

    # TODO: needs splitting the test between reference and cut generation

    #- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

    - ref_using_main=$(grep -c --ignore-case "\[ref[ -]*using[ -]*main\]" tmp.txt) || true



    # store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)
@@ -632,6 +628,9 @@ split-rendering-pytest-on-merge-request: 
    - *enable-split-rendering

    - make -j INCLUDE_SPLIT=1



    ### Run test using scripts and input from main

    - if [ $ref_using_main == 1 ]; then git checkout $target_commit; fi



    # run test

    - exit_code=0

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering_be_comparison.py || exit_code=$?
@@ -810,7 +809,7 @@ clang-format-check: 
      - tmp-formatting-fix/

    when: on_failure

    name: "$ARTIFACT_BASE_NAME"

    expose_as: 'formatting patch'

    expose_as: "formatting patch"



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

check-first-frame-is-sid:
@@ -832,11 +831,13 @@ check-first-frame-is-sid: 


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

    # SBA is run separately to use shorter part of file

    - exit_code_no_sba=0

    - exit_code_sba=0

    - 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

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

  artifacts:

    paths:

      - out/logs
@@ -899,7 +900,6 @@ lc3plus-ensure-no-code-changes: 
    - modified_files=$(git status -s)

    - if [[ $modified_files ]]; then printf 'LC3plus codebase was modified!\n\n'"$modified_files"'\n\n'; exit $EXIT_CODE_FAIL; fi





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

# Test jobs for main branch

# ---------------------------------------------------------------
@@ -1063,7 +1063,6 @@ codec-comparison-on-main-push: 
  extends:

    - .sanitizer-test-template





sanitizer-test-mono:

  extends: .sanitizer-test-schedule-A

  rules:
@@ -1278,7 +1277,6 @@ sanitizer-test-ism+4: 
    - *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:
@@ -1313,13 +1311,12 @@ coverage-test-on-main-scheduled: 
      - coverage.info

      - coverage





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

# Complexity measurement jobs

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



.complexity-measurements-setup: &complexity-measurements-setup

  # create necessary environment

.complexity-measurements-setup:

  &complexity-measurements-setup # create necessary environment

  - mkdir -p wmops/logs



  - job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME)
@@ -1334,8 +1331,8 @@ coverage-test-on-main-scheduled: 
  - rm artifacts.zip

  - rm -rf $public_dir



.complexity-measurements-prepare-artifacts: &complexity-measurements-prepare-artifacts

  # prepare artifacts -> move to public directory

.complexity-measurements-prepare-artifacts:

  &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory

  - public_dir="$CI_JOB_NAME-public"

  - mkdir $public_dir

  - mv -f wmops/log_*_all.txt wmops/*.js ${public_dir}/

CMakeLists.txt

+4 −3
Original line number Diff line number Diff line
@@ -172,15 +172,16 @@ if(NOT INCLUDE_SPLIT) 
  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*lc3plus.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_cldfb_codec.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*splitRend.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_CQMF.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*splitrenderer.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_Pred.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_RMSEnv.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_PerceptualModel.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld_tables.*\.c$")

  list(FILTER libRendSrcs EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld_rom_tables.*\.c$")

  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*lc3plus.*\.h$")

  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*splitRend.*\.h$")

  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*ivas_cldfb_codec.*\.h$")

  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld_tables.*\.h$")

  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld_rom_tables.*\.h$")

endif()



if(INCLUDE_SPLIT)

Workspace_msvc/lib_rend.vcxproj

+8 −14
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ 
    <ClCompile Include="..\lib_rend\ivas_lc3plus_common.c" />

    <ClCompile Include="..\lib_rend\ivas_lc3plus_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_lc3plus_enc.c" />

    <ClCompile Include="..\lib_rend\ivas_lcld_tables.c" />

    <ClCompile Include="..\lib_rend\ivas_lcld_decoder.c" />

    <ClCompile Include="..\lib_rend\ivas_lcld_encoder.c" />

    <ClCompile Include="..\lib_rend\ivas_lcld_rom_tables.c" />

    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />

    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_cldfb_codec_bitstream.c" />

    <ClCompile Include="..\lib_rend\ivas_CQMFDecoder.c" />

    <ClCompile Include="..\lib_rend\ivas_CQMFEncoder.c" />

    <ClCompile Include="..\lib_rend\ivas_MSPred.c" />

    <ClCompile Include="..\lib_rend\ivas_NoiseGen.c" />

    <ClCompile Include="..\lib_rend\ivas_PerceptualModel.c" />
@@ -195,16 +195,10 @@ 
    <ClCompile Include="..\lib_rend\lib_rend.c" />

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_rend\ivas_CQMFDecoder.h" />

    <ClInclude Include="..\lib_rend\ivas_CQMFEncoder.h" />

    <ClInclude Include="..\lib_rend\ivas_lcld_tables.h" />

    <ClInclude Include="..\lib_rend\ivas_MSPred.h" />

    <ClInclude Include="..\lib_rend\ivas_NoiseGen.h" />

    <ClInclude Include="..\lib_rend\ivas_PerceptualModel.h" />

    <ClInclude Include="..\lib_rend\ivas_PredDecoder.h" />

    <ClInclude Include="..\lib_rend\ivas_PredEncoder.h" />

    <ClInclude Include="..\lib_rend\ivas_cldfb_codec_bitstream.h" />

    <ClInclude Include="..\lib_rend\ivas_lcld_prot.h" />

    <ClInclude Include="..\lib_rend\ivas_lcld_rom_tables.h" />

    <ClInclude Include="..\lib_rend\ivas_prot_rend.h" />

    <ClInclude Include="..\lib_rend\ivas_RMSEnvGrouping.h" />

    <ClInclude Include="..\lib_rend\ivas_rom_binauralRenderer.h" />

    <ClInclude Include="..\lib_rend\ivas_rom_binaural_crend_head.h" />

    <ClInclude Include="..\lib_rend\ivas_rom_rend.h" />

Workspace_msvc/lib_rend.vcxproj.filters

+18 −12
Original line number Diff line number Diff line
@@ -155,15 +155,21 @@ 
    <ClCompile Include="..\lib_rend\ivas_splitRendererPre.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lcld_tables.c" />

    <ClCompile Include="..\lib_rend\ivas_CQMFDecoder.c" />

    <ClCompile Include="..\lib_rend\ivas_CQMFEncoder.c" />

    <ClCompile Include="..\lib_rend\ivas_shoebox.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_reflections.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lcld_rom_tables.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lcld_decoder.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lcld_encoder.c">

      <Filter>rend_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_rend\lib_rend.h" />
@@ -194,15 +200,15 @@ 
    <ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_CQMFDecoder.h" />

    <ClInclude Include="..\lib_rend\ivas_CQMFEncoder.h" />

    <ClInclude Include="..\lib_rend\ivas_lcld_tables.h" />

    <ClInclude Include="..\lib_rend\ivas_MSPred.h" />

    <ClInclude Include="..\lib_rend\ivas_NoiseGen.h" />

    <ClInclude Include="..\lib_rend\ivas_PerceptualModel.h" />

    <ClInclude Include="..\lib_rend\ivas_PredDecoder.h" />

    <ClInclude Include="..\lib_rend\ivas_PredEncoder.h" />

    <ClInclude Include="..\lib_rend\ivas_RMSEnvGrouping.h" />

    <ClInclude Include="..\lib_rend\ivas_lcld_prot.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_lcld_rom_tables.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_cldfb_codec_bitstream.h">

      <Filter>rend_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="rend_h">