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

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

Merge remote-tracking branch 'origin/main' into 1452-default-reverb-configuration-not-affecting-ivas_rend-properly
parents 7a538ced efe53129

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

+1 −2
Original line number Diff line number Diff line
@@ -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">

Workspace_msvc/lib_isar.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,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_isar.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
    <ClCompile Include="..\lib_isar\isar_MSPred.c">

      <Filter>isar_c</Filter>

    </ClCompile>

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

      <Filter>isar_c</Filter>

    </ClCompile>

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

      <Filter>isar_c</Filter>

    </ClCompile>