Commit 63db65c2 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... 

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 500-head-tracking-api-causes-extra-15ms-of-delay
parents 2aa0d65c 8988cbf3

.gitlab-ci.yml

+5 −2
Original line number Diff line number Diff line
@@ -1471,11 +1471,14 @@ upload-selection-BE-log: 
  script:

    - cp -r $SELECTION_BE_RESULT ./selection-BE-result

    - Get-Content -Path selection-BE-result/public_log--sha-*.txt

    - $has_failed = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line

    - If($has_failed) {exit -1}

    - $has_failed_debugging_active = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line

    - Get-Content -Path selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt

    - $has_failed_debugging_inactive = (Select-String -Path selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line

    - If($has_failed_debugging_active -or $has_failed_debugging_inactive) {exit -1}

  artifacts:

    paths:

      - selection-BE-result/public_log--sha-*.txt

      - selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt

    when: always

    expire_in: 1 week

Workspace_msvc/lib_dec.vcxproj

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

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

Workspace_msvc/lib_dec.vcxproj.filters

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

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

Workspace_msvc/lib_enc.vcxproj

+2 −1
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ 
    <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_osba_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_omasa_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

+2 −1
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ 
    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

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

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

      <Filter>enc_ivas_c</Filter>

    </ClCompile>