Commit 737d9862 authored by norvell's avatar norvell
Browse files

Merge with main

parents 0ca0d09f 8ffe5d4e
Loading
Loading
Loading
Loading
Loading
+421 −83

File changed.

Preview size limit exceeded, changes collapsed.

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

<!--- Remember to add issue and MR links to the status page in wiki here https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/wikis/IVAS-PC-MR-conversion-status -->
- Original merge request in float repo:
- Branch for float ref update:
- Branch for BASOP update:

/label ~Type:FloatUpdatePorting ~Status::ToDo
+1 −1
Original line number Diff line number Diff line

- Link to issue in BASOP repo:
- Link to original issue in float repo:
- Link to original MR in float repo:
- Requested reviewers:

/label Type:FloatUpdatePorting
+1 −1
Original line number Diff line number Diff line
/******************************************************************************************************

   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
   (C) 2022-2025 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
+189 −63
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@
    <ClCompile Include="..\lib_com\tools_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\oper_32b.c" />
    <ClCompile Include="..\lib_com\swb_bwe_com_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
@@ -161,7 +160,6 @@
    <ClCompile Include="..\lib_com\log2.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\rom_basic_math.c" />
    <ClCompile Include="..\lib_com\swb_bwe_com_lr_fx.c">
      <Filter>common_evs_c</Filter>
    </ClCompile>
@@ -216,7 +214,6 @@
    <ClCompile Include="..\lib_com\cng_exc_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\complex_basop.c" />
    <ClCompile Include="..\lib_com\dlpc_bfi_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
@@ -361,65 +358,192 @@
    <ClCompile Include="..\lib_com\gain_inov_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\float_to_fix_ops.c" />
    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c" />
    <ClCompile Include="..\lib_com\basop32.c" />
    <ClCompile Include="..\lib_com\basop_com_lpc.c" />
    <ClCompile Include="..\lib_com\basop_lsf_tools.c" />
    <ClCompile Include="..\lib_com\basop_tcx_utils.c" />
    <ClCompile Include="..\lib_com\basop_util.c" />
    <ClCompile Include="..\lib_com\bitstream.c" />
    <ClCompile Include="..\lib_com\cldfb.c" />
    <ClCompile Include="..\lib_com\cng_exc.c" />
    <ClCompile Include="..\lib_com\core_com_config.c" />
    <ClCompile Include="..\lib_com\deemph.c" />
    <ClCompile Include="..\lib_com\delay_comp.c" />
    <ClCompile Include="..\lib_com\disclaimer.c" />
    <ClCompile Include="..\lib_com\enh1632.c" />
    <ClCompile Include="..\lib_com\enh40.c" />
    <ClCompile Include="..\lib_com\enr_1_az.c" />
    <ClCompile Include="..\lib_com\env_adj.c" />
    <ClCompile Include="..\lib_com\env_stab.c" />
    <ClCompile Include="..\lib_com\fft.c" />
    <ClCompile Include="..\lib_com\fft_rel.c" />
    <ClCompile Include="..\lib_com\fill_spectrum.c" />
    <ClCompile Include="..\lib_com\findpulse.c" />
    <ClCompile Include="..\lib_com\gs_gains.c" />
    <ClCompile Include="..\lib_com\hq2_core_com.c" />
    <ClCompile Include="..\lib_com\hq_conf.c" />
    <ClCompile Include="..\lib_com\ifft_rel.c" />
    <ClCompile Include="..\lib_com\interleave_spectrum.c" />
    <ClCompile Include="..\lib_com\interpol.c" />
    <ClCompile Include="..\lib_com\int_lsp.c" />
    <ClCompile Include="..\lib_com\ivas_agc_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_dirac_com.c" />
    <ClCompile Include="..\lib_com\ivas_masa_com.c" />
    <ClCompile Include="..\lib_com\ivas_mct_com.c" />
    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c" />
    <ClCompile Include="..\lib_com\ivas_rom_com.c" />
    <ClCompile Include="..\lib_com\ivas_sns_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_tools.c" />
    <ClCompile Include="..\lib_com\lag_wind.c" />
    <ClCompile Include="..\lib_com\lerp.c" />
    <ClCompile Include="..\lib_com\limit_t0.c" />
    <ClCompile Include="..\lib_com\longarith.c" />
    <ClCompile Include="..\lib_com\modif_fs.c" />
    <ClCompile Include="..\lib_com\mslvq_com.c" />
    <ClCompile Include="..\lib_com\preemph.c" />
    <ClCompile Include="..\lib_com\rom_com.c" />
    <ClCompile Include="..\lib_com\swb_tbe_com.c" />
    <ClCompile Include="..\lib_com\tcx_mdct_window.c" />
    <ClCompile Include="..\lib_com\tec_com.c" />
    <ClCompile Include="..\lib_com\tools.c" />
    <ClCompile Include="..\lib_com\wtda.c" />
    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c" />
    <ClCompile Include="..\lib_com\frame_ener_fx.c" />
    <ClCompile Include="..\lib_com\get_gain_fx.c" />
    <ClCompile Include="..\lib_com\gs_preech_fx.c" />
    <ClCompile Include="..\lib_com\hp50_fx.c" />
    <ClCompile Include="..\lib_com\env_stab_trans.c" />
    <ClCompile Include="..\lib_com\basop_com_lpc.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\basop_lsf_tools.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\basop_tcx_utils.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\basop_util.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\basop32.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\bitstream.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\cldfb.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\cng_exc.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\complex_basop.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\core_com_config.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\deemph.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\delay_comp.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\disclaimer.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\enh40.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\enh1632.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\enr_1_az.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\env_adj.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\env_stab.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\env_stab_trans.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\fft.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\fft_rel.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\fill_spectrum.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\findpulse.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\float_to_fix_ops.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\frame_ener_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\get_gain_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\gs_gains.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\gs_preech_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\hp50_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\hq_conf.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\hq2_core_com.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ifft_rel.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\int_lsp.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\interleave_spectrum.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\interpol.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_agc_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_dirac_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_masa_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mct_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_rom_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_sns_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_tools.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\lag_wind.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\lerp.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\limit_t0.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\longarith.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\modif_fs.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\mslvq_com.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\oper_32b.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\preemph.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\rom_basic_math.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\rom_com.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\swb_tbe_com.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\tcx_mdct_window.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\tec_com.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\tools.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\wtda.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\lib_com\basop_proto_func.h">
@@ -493,7 +617,6 @@
    <ClInclude Include="..\lib_com\rom_com_fx.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\prot_fx.h" />
    <ClInclude Include="..\lib_com\count.h">
      <Filter>common_h</Filter>
    </ClInclude>
@@ -504,6 +627,9 @@
    <ClInclude Include="..\lib_com\ivas_prot_fx.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\prot_fx.h">
      <Filter>common_all_c</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="common_evs_c">
Loading