Commit c864d68d authored by reutelhuber's avatar reutelhuber
Browse files

update to main

parents d3ce252b e15d8f5a

.gitlab-ci.yml

+25 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ variables: 
  LTV_DIR: "/usr/local/ltv"

  BUILD_OUTPUT: "build_output.txt"

  EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"

  EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"

  SANITIZER_TESTS: "CLANG1 CLANG2"

  OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"

  OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"
@@ -653,6 +654,30 @@ clang-format-check: 
# Test jobs for main branch

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



# check bitexactness to EVS windows binaries

be-2-evs-windows:

  extends:

    - .rules-basis

  tags:

    - ivas-windows

  stage: test

  needs: ["build-codec-windows-msbuild"]

  timeout: "20 minutes" # To be revisited

  script:

    - *print-common-info-windows



    - $winoutdata = $null

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

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



    # copy over to never change the testvector dir

    - cp -r $EVS_BE_WIN_TEST_DIR ./evs_be_win_test

    - cp IVAS_cod.exe ./evs_be_win_test/bin/IVAS_cod.exe

    - cp IVAS_dec.exe ./evs_be_win_test/bin/IVAS_dec.exe



    - cd evs_be_win_test

    - python ../ci/run_evs_be_win_test.py



# check bitexactness to EVS

be-2-evs-linux:

  extends:

Workspace_msvc/lib_dec.vcxproj

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

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

Workspace_msvc/lib_enc.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ 
    <ClCompile Include="..\lib_enc\ivas_entropy_coder.c" />

    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_lfe_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_mc_param_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_pca_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_range_uni_enc.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -587,6 +587,9 @@ 
    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_enc\ivas_stat_enc.h">