Commit 77152b7e authored by BOHMRR's avatar BOHMRR
Browse files

Merge branch 'main' into 42-add-sba-pytest-run-to-mr-pipeline

parents ebabc979 d87e63eb

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ codec-smoke-test: 
  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  stage: test

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

  script:

    - bash ci/smoke_test.sh

    ### analyze for failures
@@ -100,6 +101,7 @@ codec-smoke-test: 
self-test-on-merge-request:

  extends: .test-job-linux

  stage: compare

  needs: [ "build-codec-linux-cmake", "codec-smoke-test" ]

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  script:

Workspace_msvc/lib_com.vcxproj

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

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_dec.vcxproj

+1 −2
Original line number Diff line number Diff line
@@ -327,8 +327,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_sba_rendering.c" />

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

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

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>
@@ -539,9 +536,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_reverb_iir_filter.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>
@@ -584,6 +578,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_sba_rendering.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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