Commit e7fca67c authored by bayers's avatar bayers
Browse files

Merge branch '5ms_api_main_merge' of forge.3gpp.org:ivas-codec-pc/ivas-codec... 

Merge branch '5ms_api_main_merge' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 5ms_api_main_merge
parents d5668a87 817418bc

.gitlab-ci-custom.yml

+4 −1142

File changed.

Preview size limit exceeded, changes collapsed.

.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

.gitmodules

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
[submodule "scripts/razel/ivas_razel_runner"]

	path = scripts/razel/ivas_razel_runner

	url = ../../sgi/ivas-razel-runner.git

	branch = rend

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">