Commit 1a960248 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 11-sba-stereo-items-sound-darker-than-input-during-16khz-decode-in-cpe-modes-such-as-64kbps-187
parents 771d3edc 1a518017

.gitlab-ci.yml

+20 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ stages: 
  - build

  - test

  - compare

  - validate



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

# Generic script anchors
@@ -107,6 +108,25 @@ stages: 
      - 123





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

# Validation jobs

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



check-if-branch-is-up-to-date-with-main:

  extends:

    - .rules-merge-request

  stage: validate

  needs: []

  tags:

    - ivas-linux

  script:

    - echo $CI_COMMIT_SHA

    - echo $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

    - commits_behind_count=$(git rev-list --count $CI_COMMIT_SHA..origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME)

    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else exit 1; fi;





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

# Build jobs

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

Workspace_msvc/lib_dec.vcxproj

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

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.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
@@ -206,6 +206,7 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

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

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

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

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

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

Workspace_msvc/lib_enc.vcxproj.filters

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

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

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

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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