Commit 1bd898a7 authored by lintervo's avatar lintervo
Browse files

Merge branch 'main' into 2163_basop_port_mr_2246_masa_prerend_samplerates 

# Conflicts:
#	lib_com/options.h
parents 5025ccf8 efe23912

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar) 


if(NOT WMOPS)

  add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_basop lib_com lib_debug lib_isar)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_basop lib_debug lib_isar)

endif()



file(GLOB libISARSrcs "lib_isar/*.c")
@@ -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/lib_lc3plus.vcxproj

+11 −11
Original line number Diff line number Diff line
@@ -109,19 +109,20 @@ 
    <ClCompile Include="..\lib_lc3plus\basop_mpy_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\basop_util_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\constants.c" />

    <ClCompile Include="..\lib_lc3plus\com_entropy.c" />

    <ClCompile Include="..\lib_lc3plus\cutoff_bandwidth.c" />

    <ClCompile Include="..\lib_lc3plus\dct2_fx.c" />

    <ClCompile Include="..\lib_lc3plus\dct4_fx.c" />

    <ClCompile Include="..\lib_lc3plus\dec_entropy.c" />

    <ClCompile Include="..\lib_lc3plus\dec_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\dec_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\detect_cutoff_warped_fx.c" />

    <ClCompile Include="..\lib_lc3plus\dynmem.c" />

    <ClCompile Include="..\lib_lc3plus\enc_entropy.c" />

    <ClCompile Include="..\lib_lc3plus\enc_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\enc_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\estimate_global_gain_fx.c" />

    <ClCompile Include="..\lib_lc3plus\fft_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\imdct_fx.c" />

    <ClCompile Include="..\lib_lc3plus\lc3.c" />

    <ClCompile Include="..\lib_lc3plus\lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\levinson_fx.c" />

    <ClCompile Include="..\lib_lc3plus\ltpf_coder_fx.c" />

    <ClCompile Include="..\lib_lc3plus\ltpf_decoder_fx.c" />
@@ -166,8 +167,9 @@ 
    <ClCompile Include="..\lib_lc3plus\residual_decoding_fx.c" />

    <ClCompile Include="..\lib_lc3plus\rom_basop_util_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\scale_signal24_fx.c" />

    <ClCompile Include="..\lib_lc3plus\setup_dec_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\setup_enc_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\setup_com_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\setup_dec_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\setup_enc_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\sns_compute_scf_fx.c" />

    <ClCompile Include="..\lib_lc3plus\sns_interpolate_scf_fx.c" />

    <ClCompile Include="..\lib_lc3plus\sns_quantize_scf_fx.c" />
@@ -181,13 +183,11 @@ 
    <ClInclude Include="..\lib_lc3plus\defines.h" />

    <ClInclude Include="..\lib_lc3plus\dynmem.h" />

    <ClInclude Include="..\lib_lc3plus\functions.h" />

    <ClInclude Include="..\lib_lc3plus\lc3.h" />

    <ClInclude Include="..\lib_lc3plus\lc3plus.h" />

    <ClInclude Include="..\lib_lc3plus\license.h" />

    <ClInclude Include="..\lib_lc3plus\rom_basop_util_lc3plus.h" />

    <ClInclude Include="..\lib_lc3plus\setup_dec_lc3.h" />

    <ClInclude Include="..\lib_lc3plus\setup_enc_lc3.h" />

    <ClInclude Include="..\lib_lc3plus\tinywavein_c.h" />

    <ClInclude Include="..\lib_lc3plus\tinywaveout_c.h" />

    <ClInclude Include="..\lib_lc3plus\setup_dec_lc3plus.h" />

    <ClInclude Include="..\lib_lc3plus\setup_enc_lc3plus.h" />

  </ItemGroup>

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

  <ImportGroup Label="ExtensionTargets">

Workspace_msvc/lib_rend.vcxproj

+3 −1
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ 
    </Lib>

  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\lib_rend\ivas_cldfb_ring_buffer.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec_fx.c" />
@@ -175,6 +176,7 @@ 
    <ClCompile Include="..\lib_rend\ivas_rom_rend_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_shoebox_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_td_decorr_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_td_ring_buffer_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_vbap_fx.c" />

    <ClCompile Include="..\lib_rend\lib_rend_fx.c" />

  </ItemGroup>

Workspace_msvc/lib_rend.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ 
    <ClCompile Include="..\lib_rend\ivas_td_decorr_fx.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_cldfb_ring_buffer.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_vbap_fx.c">

      <Filter>rend_c</Filter>

    </ClCompile>

apps/decoder.c

+171 −145

File changed.

Preview size limit exceeded, changes collapsed.