From c7cdf922ed6d9dc8cec7a06ca0eec552b00646df Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Mon, 11 Aug 2025 10:19:29 +0200
Subject: [PATCH] fix MSVC warnings and project files

---
 Workspace_msvc/isar_post_rend.vcxproj    |   2 -
 Workspace_msvc/lib_com.vcxproj.filters   | 588 ++++++++++++-----------
 lib_enc/ivas_corecoder_enc_reconfig_fx.c |   2 +-
 lib_rend/ivas_reverb_utils_fx.c          |   2 +-
 4 files changed, 297 insertions(+), 297 deletions(-)

diff --git a/Workspace_msvc/isar_post_rend.vcxproj b/Workspace_msvc/isar_post_rend.vcxproj
index 19cb1aff7..170ff2054 100644
--- a/Workspace_msvc/isar_post_rend.vcxproj
+++ b/Workspace_msvc/isar_post_rend.vcxproj
@@ -148,8 +148,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\apps\isar_post_rend.c" />
-    <ClCompile Include="..\lib_com\enh64.c" />
-    <ClCompile Include="..\lib_com\enhUL32.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lib_debug.vcxproj">
diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters
index f247d199e..3fbbb7bc5 100644
--- a/Workspace_msvc/lib_com.vcxproj.filters
+++ b/Workspace_msvc/lib_com.vcxproj.filters
@@ -1,646 +1,648 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\lib_com\enh64.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_agc_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\tools_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_arith_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\swb_bwe_com_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\logqnorm_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_cov_smooth_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\bitstream_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_dirac_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\mslvq_com_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_entropy_coder_common_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\hq_tools_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_fb_mixer_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\lpc_tools_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_filters_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\lsf_tools_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_ism_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\rom_basop_util.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_lfe_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\scale_mem_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_limiter_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\gs_gains_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_masa_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\fft_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_mc_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\rom_com_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_mc_param_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\enh32.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_mcmasa_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\window_ola_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_mct_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\wtda_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_mdct_core_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\syn_filt_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_mdct_imdct_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\index_pvq_opt_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\swb_tbe_com_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_omasa_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\weight_a_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_osba_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\residu_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_pca_tools_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\modif_fs_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\preemph_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\pvq_com_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_rom_com.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\range_com_fx.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_rom_com_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\wi_fx.c">
-      <Filter>common_evs_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_rotation_com.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\log2.c">
-      <Filter>common_all_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_sba_config_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\swb_bwe_com_lr_fx.c">
-      <Filter>common_evs_c</Filter>
+    <ClCompile Include="..\lib_com\ivas_sns_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_dft_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_stereo_mdct_bands_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_tools_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c">
+      <Filter>common_ivas_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_com\hq2_bit_alloc_fx.c">
       <Filter>common_evs_c</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib_com\hq2_core_com_fx.c">
+      <Filter>common_evs_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\hq2_noise_inject_fx.c">
+      <Filter>common_evs_c</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib_com\isf_dec_amr_wb_fx.c">
       <Filter>common_evs_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_com\nelp_fx.c">
       <Filter>common_evs_c</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib_com\wi_fx.c">
+      <Filter>common_evs_c</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib_com\ppp_fx.c">
       <Filter>common_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\hq2_core_com_fx.c">
+    <ClCompile Include="..\lib_com\swb_bwe_com_lr_fx.c">
       <Filter>common_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\hq2_noise_inject_fx.c">
+    <ClCompile Include="..\lib_com\swb_bwe_com_hr_fx.c">
       <Filter>common_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\reordvct_fx.c">
+    <ClCompile Include="..\lib_com\ACcontextMapping_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\lsp_conv_poly_fx.c">
+    <ClCompile Include="..\lib_com\ari_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\tns_base.c">
+    <ClCompile Include="..\lib_com\ari_hm_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_com\arith_coder_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\bitallocsum_fx.c">
-      <Filter>common_all_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\bitalloc_fx.c">
+    <ClCompile Include="..\lib_com\basop_com_lpc.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\bits_alloc_fx.c">
+    <ClCompile Include="..\lib_com\basop_lsf_tools.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\cb_shape_fx.c">
+    <ClCompile Include="..\lib_com\basop_tcx_utils.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\cng_exc_fx.c">
+    <ClCompile Include="..\lib_com\basop_util.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\dlpc_bfi_fx.c">
+    <ClCompile Include="..\lib_com\basop32.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\edct_fx.c">
+    <ClCompile Include="..\lib_com\bitalloc_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\enhancer_fx.c">
+    <ClCompile Include="..\lib_com\bitallocsum_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\enhUL32.c">
+    <ClCompile Include="..\lib_com\bits_alloc_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\est_tilt_fx.c">
+    <ClCompile Include="..\lib_com\bitstream.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\fd_cng_com_fx.c">
+    <ClCompile Include="..\lib_com\bitstream_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\fft_evs.c">
+    <ClCompile Include="..\lib_com\cb_shape_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\fft_cldfb_fx.c">
+    <ClCompile Include="..\lib_com\cldfb_evs_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\fft_fx_evs.c">
+    <ClCompile Include="..\lib_com\cldfb_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c">
+    <ClCompile Include="..\lib_com\cng_exc_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\gs_inact_switching_fx.c">
+    <ClCompile Include="..\lib_com\codec_tcx_common_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\gs_noisefill_fx.c">
+    <ClCompile Include="..\lib_com\complex_basop.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\guided_plc_util_fx.c">
+    <ClCompile Include="..\lib_com\core_com_config_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\hq_bit_allocation_fx.c">
+    <ClCompile Include="..\lib_com\deemph_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\hq_conf_fx.c">
+    <ClCompile Include="..\lib_com\delay_comp_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\hvq_pvq_bitalloc_fx.c">
+    <ClCompile Include="..\lib_com\disclaimer.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\igf_base_fx.c">
+    <ClCompile Include="..\lib_com\dlpc_bfi_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mdct_imdct_fx.c">
+    <ClCompile Include="..\lib_com\edct_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_rom_com_fx.c">
+    <ClCompile Include="..\lib_com\enh32.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\limit_t0_fx.c">
+    <ClCompile Include="..\lib_com\enh40.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\low_rate_band_att_fx.c">
+    <ClCompile Include="..\lib_com\enh64.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\lsf_dec_bfi_fx.c">
+    <ClCompile Include="..\lib_com\enh1632.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\lsf_msvq_ma_fx.c">
+    <ClCompile Include="..\lib_com\enhancer_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\math_op.c">
+    <ClCompile Include="..\lib_com\enhUL32.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\phase_dispersion_fx.c">
+    <ClCompile Include="..\lib_com\enr_1_az_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\pred_lt4_fx.c">
+    <ClCompile Include="..\lib_com\env_adj_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\re8_ppv_fx.c">
+    <ClCompile Include="..\lib_com\env_stab_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\re8_util_fx.c">
+    <ClCompile Include="..\lib_com\env_stab_trans_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\recovernorm_fx.c">
+    <ClCompile Include="..\lib_com\est_tilt_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\stab_est_fx.c">
+    <ClCompile Include="..\lib_com\fd_cng_com_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\stat_noise_uv_mod_fx.c">
+    <ClCompile Include="..\lib_com\fft_cldfb_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\swb_bwe_com_hr_fx.c">
+    <ClCompile Include="..\lib_com\fft_evs.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\syn_12k8_fx.c">
+    <ClCompile Include="..\lib_com\fft_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\tcq_position_arith_fx.c">
+    <ClCompile Include="..\lib_com\fft_fx_evs.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\tcx_ltp_fx.c">
+    <ClCompile Include="..\lib_com\fft_rel_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\tcx_mdct_fx.c">
+    <ClCompile Include="..\lib_com\fill_spectrum_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\tcx_utils_fx.c">
+    <ClCompile Include="..\lib_com\findpulse_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\trans_direct_fx.c">
+    <ClCompile Include="..\lib_com\fine_gain_bits_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\trans_inv_fx.c">
+    <ClCompile Include="..\lib_com\float_to_fix_ops.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\vlpc_2st_com_fx.c">
+    <ClCompile Include="..\lib_com\frame_ener_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\weight_fx.c">
+    <ClCompile Include="..\lib_com\gain_inov_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\window_fx.c">
+    <ClCompile Include="..\lib_com\get_gain_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ACcontextMapping_fx.c">
+    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ari_fx.c">
+    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ari_hm_fx.c">
+    <ClCompile Include="..\lib_com\gs_gains_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\fft_rel_fx.c">
+    <ClCompile Include="..\lib_com\gs_inact_switching_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\fine_gain_bits_fx.c">
+    <ClCompile Include="..\lib_com\gs_noisefill_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\gain_inov_fx.c">
+    <ClCompile Include="..\lib_com\gs_preech_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\basop_com_lpc.c">
+    <ClCompile Include="..\lib_com\guided_plc_util_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\basop_lsf_tools.c">
+    <ClCompile Include="..\lib_com\hp50_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\basop_tcx_utils.c">
+    <ClCompile Include="..\lib_com\hq_bit_allocation_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\basop_util.c">
+    <ClCompile Include="..\lib_com\hq_conf_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\basop32.c">
+    <ClCompile Include="..\lib_com\hq_tools_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\bitstream.c">
+    <ClCompile Include="..\lib_com\hvq_pvq_bitalloc_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\complex_basop.c">
+    <ClCompile Include="..\lib_com\ifft_rel_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\disclaimer.c">
+    <ClCompile Include="..\lib_com\igf_base_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\enh40.c">
+    <ClCompile Include="..\lib_com\index_pvq_opt_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\enh1632.c">
+    <ClCompile Include="..\lib_com\int_lsp_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\float_to_fix_ops.c">
+    <ClCompile Include="..\lib_com\interleave_spectrum_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\frame_ener_fx.c">
+    <ClCompile Include="..\lib_com\interpol_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\get_gain_fx.c">
+    <ClCompile Include="..\lib_com\lag_wind_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c">
+    <ClCompile Include="..\lib_com\lerp_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\gs_preech_fx.c">
+    <ClCompile Include="..\lib_com\limit_t0_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\hp50_fx.c">
+    <ClCompile Include="..\lib_com\log2.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_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 Include="..\lib_com\logqnorm_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_com\longarith.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\oper_32b.c">
+    <ClCompile Include="..\lib_com\low_rate_band_att_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\rom_basic_math.c">
+    <ClCompile Include="..\lib_com\lpc_tools_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\rom_com.c">
+    <ClCompile Include="..\lib_com\lsf_dec_bfi_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\tools.c">
+    <ClCompile Include="..\lib_com\lsf_msvq_ma_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c">
+    <ClCompile Include="..\lib_com\lsf_tools_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_arith_fx.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com_fx.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_cov_smooth_fx.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_entropy_coder_common_fx.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_dirac_com_fx.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_fb_mixer_fx.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_filters_fx.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_ism_com_fx.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_lfe_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\lsp_conv_poly_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_masa_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\math_op.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mc_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\modif_fs_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mc_param_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\mslvq_com_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mct_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\oper_32b.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mdct_core_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\phase_dispersion_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_omasa_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\pred_lt4_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_pca_tools_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\preemph_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\pvq_com_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\range_com_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_sba_config_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\re8_ppv_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\re8_util_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\recovernorm_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_dft_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\reordvct_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\residu_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\rom_basic_math.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\rom_basop_util.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\rom_com.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\rom_com_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_tools_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\scale_mem_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\cldfb_fx.c">
+    <ClCompile Include="..\lib_com\stab_est_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\cldfb_evs_fx.c">
+    <ClCompile Include="..\lib_com\stat_noise_uv_mod_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\codec_tcx_common_fx.c">
+    <ClCompile Include="..\lib_com\swb_bwe_com_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\core_com_config_fx.c">
+    <ClCompile Include="..\lib_com\swb_tbe_com_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\deemph_fx.c">
+    <ClCompile Include="..\lib_com\syn_12k8_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\delay_comp_fx.c">
+    <ClCompile Include="..\lib_com\syn_filt_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\enr_1_az_fx.c">
+    <ClCompile Include="..\lib_com\tcq_position_arith_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\env_adj_fx.c">
+    <ClCompile Include="..\lib_com\tcx_ltp_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\env_stab_fx.c">
+    <ClCompile Include="..\lib_com\tcx_mdct_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\env_stab_trans_fx.c">
+    <ClCompile Include="..\lib_com\tcx_mdct_window_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\fill_spectrum_fx.c">
+    <ClCompile Include="..\lib_com\tcx_utils_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\findpulse_fx.c">
+    <ClCompile Include="..\lib_com\tec_com_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ifft_rel_fx.c">
+    <ClCompile Include="..\lib_com\tns_base.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\interleave_spectrum_fx.c">
+    <ClCompile Include="..\lib_com\tools.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\interpol_fx.c">
+    <ClCompile Include="..\lib_com\tools_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\int_lsp_fx.c">
+    <ClCompile Include="..\lib_com\trans_direct_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mcmasa_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\trans_inv_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\lag_wind_fx.c">
+    <ClCompile Include="..\lib_com\vlpc_2st_com_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\lerp_fx.c">
+    <ClCompile Include="..\lib_com\weight_a_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\tcx_mdct_window_fx.c">
+    <ClCompile Include="..\lib_com\weight_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\tec_com_fx.c">
+    <ClCompile Include="..\lib_com\window_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_limiter_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\window_ola_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_rotation_com.c">
-    <ClCompile Include="..\lib_com\ivas_osba_com_fx.c">
-      <Filter>common_ivas_c</Filter>
+    <ClCompile Include="..\lib_com\wtda_fx.c">
+      <Filter>common_all_c</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\lib_com\basop_proto_func.h">
+    <ClInclude Include="..\lib_com\ivas_error.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\basop_settings.h">
+    <ClInclude Include="..\lib_com\ivas_error_utils.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\basop_util.h">
+    <ClInclude Include="..\lib_com\ivas_cnst.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\basop32.h">
+    <ClInclude Include="..\lib_com\ivas_stat_com.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\control.h">
+    <ClInclude Include="..\lib_com\ivas_rom_com_fx.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\cnst.h">
+    <ClInclude Include="..\lib_com\ivas_prot_fx.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\enh40.h">
+    <ClInclude Include="..\lib_com\ivas_rom_com.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\enh1632.h">
+    <ClInclude Include="..\lib_com\basop32.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\ivas_cnst.h">
+    <ClInclude Include="..\lib_com\basop_settings.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\ivas_error.h">
+    <ClInclude Include="..\lib_com\basop_proto_func.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\ivas_error_utils.h">
+    <ClInclude Include="..\lib_com\cnst.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\ivas_rom_com.h">
+    <ClInclude Include="..\lib_com\complex_basop.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\move.h">
+    <ClInclude Include="..\lib_com\control.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\rom_com.h">
+    <ClInclude Include="..\lib_com\count.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\stat_com.h">
+    <ClInclude Include="..\lib_com\basop_util.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\stl.h">
+    <ClInclude Include="..\lib_com\enh40.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\typedef.h">
+    <ClInclude Include="..\lib_com\enh32.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\options.h" />
-    <ClInclude Include="..\lib_com\ivas_stat_com.h">
+    <ClInclude Include="..\lib_com\enh64.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\common_api_types.h" />
-    <ClInclude Include="..\lib_com\stat_com_fx_2.h">
+    <ClInclude Include="..\lib_com\enh1632.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\rom_basop_util.h">
+    <ClInclude Include="..\lib_com\enhUL32.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\rom_com_fx.h">
+    <ClInclude Include="..\lib_com\rom_basic_math.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\count.h">
+    <ClInclude Include="..\lib_com\rom_basop_util.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\enhUL32.h">
+    <ClInclude Include="..\lib_com\rom_com.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\options_warnings.h" />
-    <ClInclude Include="..\lib_com\ivas_prot_fx.h">
+    <ClInclude Include="..\lib_com\rom_com_fx.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\prot_fx.h">
+    <ClInclude Include="..\lib_com\stat_com.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\complex_basop.h">
+    <ClInclude Include="..\lib_com\stat_com_fx_2.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\enh32.h">
+    <ClInclude Include="..\lib_com\stl.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\enh64.h">
+    <ClInclude Include="..\lib_com\move.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\ivas_rom_com_fx.h">
+    <ClInclude Include="..\lib_com\math_op.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\log2.h">
+    <ClInclude Include="..\lib_com\mime.h">
       <Filter>common_h</Filter>
     </ClInclude>
     <ClInclude Include="..\lib_com\math_32.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\math_op.h">
+    <ClInclude Include="..\lib_com\oper_32b.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\mime.h">
+    <ClInclude Include="..\lib_com\typedef.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\oper_32b.h">
+    <ClInclude Include="..\lib_com\typedefs.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\rom_basic_math.h">
+    <ClInclude Include="..\lib_com\log2.h">
       <Filter>common_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_com\typedefs.h">
+    <ClInclude Include="..\lib_com\prot_fx.h">
       <Filter>common_h</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib_com\options.h" />
+    <ClInclude Include="..\lib_com\common_api_types.h" />
+    <ClInclude Include="..\lib_com\options_warnings.h" />
   </ItemGroup>
   <ItemGroup>
-    <Filter Include="common_evs_c">
-      <UniqueIdentifier>{890c2f45-9385-4fce-859b-6a65469e8dc0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="common_ivas_c">
-      <UniqueIdentifier>{201ea764-9626-4dca-9cc4-5b4106f8b8b2}</UniqueIdentifier>
-    </Filter>
     <Filter Include="common_all_c">
-      <UniqueIdentifier>{fbb860e2-79d0-45b1-ada1-c3a0a369ce2c}</UniqueIdentifier>
+      <UniqueIdentifier>{89daa9bf-9e90-4fec-af56-38675e291f6f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="common_evs_c">
+      <UniqueIdentifier>{15426721-e65c-4514-bf00-f87bc1208a28}</UniqueIdentifier>
     </Filter>
     <Filter Include="common_h">
-      <UniqueIdentifier>{b95b7bed-a666-4a00-9332-2b528638503e}</UniqueIdentifier>
+      <UniqueIdentifier>{0d9238b7-8879-4767-9288-b5e65692cfa8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="common_ivas_c">
+      <UniqueIdentifier>{5bdbb305-b9db-4187-b825-04449615f37b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/lib_enc/ivas_corecoder_enc_reconfig_fx.c b/lib_enc/ivas_corecoder_enc_reconfig_fx.c
index a121ed3c2..eb58276fc 100644
--- a/lib_enc/ivas_corecoder_enc_reconfig_fx.c
+++ b/lib_enc/ivas_corecoder_enc_reconfig_fx.c
@@ -696,7 +696,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
         ELSE IF( st_ivas->hMCT != NULL && GT_16( st_ivas->nCPE, 1 ) )
         {
 #ifdef NONBE_FIX_ISM_XOVER_BR
-            IF( ( error = mct_enc_reconfigure_fx( st_ivas, NE_16( nchan_transport_old_real, nchan_transport_real ) ) ) != IVAS_ERR_OK )
+            IF( ( error = mct_enc_reconfigure_fx( st_ivas, (UWord16) NE_16( nchan_transport_old_real, nchan_transport_real ) ) ) != IVAS_ERR_OK )
 #else
             IF( ( error = mct_enc_reconfigure_fx( st_ivas, st_ivas->nchan_transport != nchan_transport_old ) ) != IVAS_ERR_OK )
 #endif
diff --git a/lib_rend/ivas_reverb_utils_fx.c b/lib_rend/ivas_reverb_utils_fx.c
index cfbfd7315..b914df8f3 100644
--- a/lib_rend/ivas_reverb_utils_fx.c
+++ b/lib_rend/ivas_reverb_utils_fx.c
@@ -164,7 +164,7 @@ static void ivas_reverb_set_energies(
     {
         input_fc[freq_idx] = freq_idx * ( 0.5f * sampling_rate / (float) ( avg_pwr_len - 1 ) );
 #ifdef FIX_1741_REVERB_TIMES_Q_FORMAT
-        input_fc_fx[freq_idx] = input_fc[freq_idx] * ONE_IN_Q16;
+        input_fc_fx[freq_idx] = (Word16) ( input_fc[freq_idx] * ONE_IN_Q16 + 0.5f );
 #endif
     }
 
-- 
GitLab