Commit d831fc0d authored by vaillancour's avatar vaillancour
Browse files

Merge branch 'main' into eval_complexity_0128

parents 79efbd72 7388eeb8

LICENSE.md

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



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

   (C) 2022-2024 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 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_stereo_ica_dec.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

+2 −0
Original line number Diff line number Diff line
@@ -832,6 +832,8 @@ 
    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

apps/decoder.c

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



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

   (C) 2022-2024 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

apps/encoder.c

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



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

   (C) 2022-2024 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