Commit 768a134f authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' into 1326-complexity-issue-ism-4-32-kbps-fb-to-binaural-basop

parents c9825655 815be7be

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ ivas-pytest-enc-usan: 
  before_script:

    - CLANG_NUM=3

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE=$SHORT_TEST_SUITE_ENCODER

    - TEST_SUITE=$LONG_TEST_SUITE_ENCODER

  <<: *ivas-pytest-sanitizers-anchor

  

### jobs that test flt encoder -> fx decoder
@@ -1397,7 +1397,7 @@ ivas-pytest-dec-usan: 
  before_script:

    - CLANG_NUM=3

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$SHORT_TEST_SUITE

    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER

  <<: *ivas-pytest-sanitizers-anchor



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

Workspace_msvc/lib_com.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ 
    <ClCompile Include="..\lib_com\swb_bwe_com_fx.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\syn_filt_fx.c" />
@@ -316,7 +315,6 @@ 
    <ClInclude Include="..\lib_com\ivas_cnst.h" />

    <ClInclude Include="..\lib_com\ivas_error.h" />

    <ClInclude Include="..\lib_com\ivas_error_utils.h" />

    <ClInclude Include="..\lib_com\ivas_prot.h" />

    <ClInclude Include="..\lib_com\ivas_prot_fx.h" />

    <ClInclude Include="..\lib_com\ivas_rom_com.h" />

    <ClInclude Include="..\lib_com\ivas_stat_com.h" />

Workspace_msvc/lib_com.vcxproj.filters

+1 −7
Original line number Diff line number Diff line
@@ -430,9 +430,6 @@ 
    <ClCompile Include="..\lib_com\rom_com.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -573,9 +570,6 @@ 
    <ClInclude Include="..\lib_com\ivas_error_utils.h">

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>
@@ -619,7 +613,7 @@ 
      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_all_c</Filter>

      <Filter>common_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

Workspace_msvc/lib_rend.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 
    <ClCompile Include="..\lib_rend\lib_rend.c" />

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_rend\ivas_prot_rend.h" />

    <ClInclude Include="..\lib_rend\ivas_prot_rend_fx.h" />

    <ClInclude Include="..\lib_rend\ivas_rom_binauralRenderer.h" />

    <ClInclude Include="..\lib_rend\ivas_rom_binaural_crend_head.h" />

    <ClInclude Include="..\lib_rend\ivas_rom_rend.h" />

Workspace_msvc/lib_rend.vcxproj.filters

+3 −3
Original line number Diff line number Diff line
@@ -125,9 +125,6 @@ 
  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_rend\lib_rend.h" />

    <ClInclude Include="..\lib_rend\ivas_prot_rend.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_rom_rend.h">

      <Filter>rend_h</Filter>

    </ClInclude>
@@ -143,6 +140,9 @@ 
    <ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_prot_rend_fx.h">

      <Filter>rend_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="rend_h">