Commit d57a0d7e authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'main' into new-osba-paseline_pc

parents 8287eb9e 8cc6be73

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ split-rendering-pytest-on-merge-request: 
    - .rules-merge-request

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

  # TODO: set reasonable timeout, will most likely take less

  timeout: "20 minutes"

  timeout: "30 minutes"

  stage: compare

  script:

    - *print-common-info

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ 
    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c" />

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

Workspace_msvc/lib_dec.vcxproj

+2 −1
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

+2 −1
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ 
      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>