Commit c66c3665 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 2082-floating-point-leftovers-lib_dec-ivas_omasa_dec_fx-c
parents 79cefa6e ba2aad75

.gitignore

0 → 100644
+86 −0
Original line number Diff line number Diff line 
# .gitignore for IVAS public collaboration Git repository



# Compiler output Unix

IVAS_cod

IVAS_dec

IVAS_rend

ISAR_post_rend

ambi_converter

obj/

*.a

*.o

*.P



# default CMake

build*/**/*



# Compiler output VS2017

IVAS_cod.exe

IVAS_dec.exe

IVAS_rend.exe

ISAR_post_rend.exe

ambi_converter.exe

*.user

.vs/

Debug_*/

Release_*/

*.obj

*.pdb



# Standalone TD object renderer

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe



# General/scripts

.DS_Store

.vscode

.cache

.idea

*.log

*.bak

.\#*

scripts/c-code_instrument/

scripts/ifdef_instrument.list

scripts/ref/

scripts/test/

scripts/out/

scripts/self_test_summary.txt

scripts/cppp/

binary/

tests/**/[c|d]ut

tests/**/ref

tests/*/testv

tests/hrtf_binary_loading/bitstream/*

tests/hrtf_binary_loading/dec_out_*/*

scripts/testv/*_cut*.pcm

scripts/testv/*_cut*.wav

scripts/testv/stvOMASA_*.met

scripts/testv/stvOMASA_*.csv

scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav

scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav

scripts/testv/stvO*

# default reference binary name

IVAS_cod_ref*

IVAS_dec_ref*

IVAS_rend_ref*

ISAR_post_rend_ref*



# Python files that pop up when running scripts

__pycache__/

*.py[cod]

*$py.class



# history

.history/



#externals

Externals/



# coan output files that are created when cleaning out switches

coan_out_*



# Additional ignored locations for the BASOP repo

/ci

/scripts

/tests

/pytest.ini

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ target_link_libraries(ISAR_post_rend lib_basop lib_isar lib_util lib_com) 
target_include_directories(ISAR_post_rend PRIVATE lib_basop lib_isar)



add_executable(ambi_converter apps/ambi_converter.c)

target_link_libraries(ambi_converter lib_util lib_com lib_basop)

target_link_libraries(ambi_converter lib_util lib_com lib_basop lib_debug)

if(UNIX)

  target_link_libraries(ambi_converter m)

endif()

Workspace_msvc/ambi_converter.vcxproj

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ 
      <Project>{2FA8F384-0775-F3B7-F8C3-85209222FC70}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

    <ProjectReference Include="lib_debug.vcxproj">

      <Project>{54509728-928B-44D9-A118-A6F92F08B34F}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

Workspace_msvc/decoder.vcxproj

+1 −3
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\apps\decoder.c" />

    <ClCompile Include="..\lib_util\test_fft.c" />

    <ClCompile Include="..\lib_util\test_mdct.c" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_basop.vcxproj">

Workspace_msvc/lib_enc.vcxproj.filters

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

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

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

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

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

      <Filter>encoder_evs_c</Filter>

    </ClCompile>
@@ -596,6 +593,9 @@ 
    <ClCompile Include="..\lib_enc\rom_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

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

      <Filter>encoder_all_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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