Commit 1a3aba2d authored by stoutjesdijk's avatar stoutjesdijk 🎧
Browse files

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

Merge remote-tracking branch 'origin/main' into 103-Digest-room-acoustics-parameters-for-Parametric-Binaural-Renderer
parents 12253fdf c1229fde

.gitlab-ci.yml

+43 −0
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ stages: 
    echo "Commit time was $CI_COMMIT_TIMESTAMP"

    date | xargs echo "System time is"



.print-common-info-windows: &print-common-info-windows

  - |

    echo "Printing common information for build job."

    echo "Current job is run on commit $CI_COMMIT_SHA"

    echo "Commit time was $CI_COMMIT_TIMESTAMP"

    ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression



.get-previous-merge-commit-sha: &get-previous-merge-commit-sha

  - previous_merge_commit=$(git --no-pager log --merges HEAD~1 -n 1 --pretty=format:%H)
@@ -156,6 +163,11 @@ stages: 
  tags:

    - ivas-linux



.build-job-windows:

  stage: build

  timeout: "4 minutes"

  tags:

    - ivas-windows



# template for test jobs on linux that need the TESTV_DIR

.test-job-linux-needs-testv-dir:
@@ -172,6 +184,12 @@ stages: 
    exit_codes:

      - 123



.build-job-windows-with-check-for-warnings:

  extends: .build-job-windows

  stage: build

  allow_failure:

    exit_codes:

      - 123





# ---------------------------------------------------------------
@@ -262,6 +280,31 @@ build-codec-sanitizers-linux: 
    - *print-common-info

    - bash ci/build_codec_sanitizers_linux.sh



build-codec-windows-cmake:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null

    - cmake -G "Visual Studio 15 2017" . -Bbuild

    - cmake --build build -j | tee -variable winoutdata

    - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8

    - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression

    - ("exit $LASTEXITCODE") | Invoke-Expression



build-codec-windows-msbuild:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null

    - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug | tee -variable winoutdata

    - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8

    - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression

    - ("exit $LASTEXITCODE") | Invoke-Expression



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

# Test jobs for merge requests

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

Workspace_msvc/lib_com.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -244,9 +244,9 @@ 
    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c" />

    <ClCompile Include="..\lib_com\ivas_fb_mixer.c" />

    <ClCompile Include="..\lib_com\ivas_filters.c" />

    <ClCompile Include="..\lib_com\ivas_ism_com.c" />

    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c" />

    <ClCompile Include="..\lib_com\ivas_dirac_com.c" />

    <ClCompile Include="..\lib_com\ivas_ism_config.c" />

    <ClCompile Include="..\lib_com\ivas_masa_com.c" />

    <ClCompile Include="..\lib_com\ivas_mct_com.c" />

    <ClCompile Include="..\lib_com\ivas_mc_com.c" />

Workspace_msvc/lib_com.vcxproj.filters

+3 −3
Original line number Diff line number Diff line
@@ -379,9 +379,6 @@ 
    <ClCompile Include="..\lib_com\swb_bwe_com_lr.c">

      <Filter>common_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_config.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>
@@ -466,6 +463,9 @@ 
    <ClCompile Include="..\lib_com\ivas_td_decorr.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">

apps/decoder.c

+12 −172

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+1 −16

File changed.

Preview size limit exceeded, changes collapsed.