Commit 0fbf3e06 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into basop-2283-isar-post-renderer-broken-for-externally-rendered-omasa-input-and-binaural_split_coded
parents 4f838d4a cf7f073c

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

+2 −2
Original line number Diff line number Diff line
@@ -209,11 +209,12 @@ 
    <ClCompile Include="..\lib_dec\init_dec_fx.c" />

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder_fx.c" />
@@ -223,7 +224,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec_fx.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

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

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -362,9 +359,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -509,6 +503,12 @@ 
    <ClCompile Include="..\lib_dec\rom_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

Workspace_msvc/lib_isar.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ 
    <ClCompile Include="..\lib_isar\isar_lc3plus_enc.c" />

    <ClCompile Include="..\lib_isar\isar_lc3plus_payload.c" />

    <ClCompile Include="..\lib_isar\isar_MSPred.c" />

    <ClCompile Include="..\lib_isar\isar_NoiseGen.c" />

    <ClCompile Include="..\lib_isar\isar_PerceptualModel.c" />

    <ClCompile Include="..\lib_isar\isar_PredDecoder.c" />

    <ClCompile Include="..\lib_isar\isar_PredEncoder.c" />

Workspace_msvc/lib_rend.vcxproj

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

  </ItemDefinitionGroup>

  <ItemGroup>

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

    <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" />