Commit b4c1d135 authored by vaclav's avatar vaclav
Browse files

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

- Merge remote-tracking branch 'remotes/origin/main' into basop-2280-back-and-forth-scaling-in-core-coder
parents 647937cb 187213dc
Loading
Loading
Loading
Loading
+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
+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@
    <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" />
+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" />
+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" />
+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
Loading