Commit f2e11319 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into flaot-1469-test_format_switching-py-doesn-t-run

parents bc29359c 08cd8642

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


# Compiler output Unix

IVAS_cod

IVAS_cod_fmtsw

IVAS_dec

IVAS_rend

ISAR_post_rend
@@ -16,6 +17,7 @@ build*/**/* 


# Compiler output VS2017

IVAS_cod.exe

IVAS_cod_fmtsw.exe

IVAS_dec.exe

IVAS_rend.exe

ISAR_post_rend.exe

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ file(GLOB libDecSrcs "lib_dec/*.c") 
file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_com lib_rend lib_debug lib_isar)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar lib_util)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar)



file(GLOB libUtilSrcs "lib_util/*.c")

file(GLOB libUtilHeaders "lib_util/*.h")
@@ -175,7 +175,7 @@ target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar) 


if(NOT WMOPS)

  add_executable(ivas_lc3plus_unit_test scripts/split_rendering/lc3plus_float/ivas_lc3plus_unit_test.c)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_com lib_debug lib_isar)

endif()



file(GLOB libISARSrcs "lib_isar/*.c")

LICENSE.md

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2026 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

Workspace_msvc/lib_dec.vcxproj

+3 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_isar;..\lib_rend;..\lib_lc3plus;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_isar;..\lib_rend;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -109,7 +109,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_isar;..\lib_rend;..\lib_lc3plus;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_isar;..\lib_rend;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />
@@ -205,12 +205,12 @@ 
    <ClCompile Include="..\lib_dec\init_dec.c" />

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

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

    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal.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_dec.c" />

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

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

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

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

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />
@@ -220,7 +220,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -49,9 +46,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -515,6 +509,9 @@ 
      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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