Commit 4dca4b04 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into update_crend_v2

parents 503cc174 fc98a680

Workspace_msvc/lib_enc.vcxproj

+0 −66
Original line number Diff line number Diff line
@@ -239,60 +239,9 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs.c" />

    <ClCompile Include="..\lib_enc\arith_coder_enc.c" />

    <ClCompile Include="..\lib_enc\ari_enc.c" />

    <ClCompile Include="..\lib_enc\ari_hm_enc.c" />

    <ClCompile Include="..\lib_enc\avq_cod.c" />

    <ClCompile Include="..\lib_enc\bass_psfilter_enc.c" />

    <ClCompile Include="..\lib_enc\bw_detect.c" />

    <ClCompile Include="..\lib_enc\cng_enc.c" />

    <ClCompile Include="..\lib_enc\cod2t32.c" />

    <ClCompile Include="..\lib_enc\cod4t64.c" />

    <ClCompile Include="..\lib_enc\cod4t64_fast.c" />

    <ClCompile Include="..\lib_enc\cod_ace.c" />

    <ClCompile Include="..\lib_enc\cod_tcx.c" />

    <ClCompile Include="..\lib_enc\cod_uv.c" />

    <ClCompile Include="..\lib_enc\comvad_decision.c" />

    <ClCompile Include="..\lib_enc\core_enc_2div.c" />

    <ClCompile Include="..\lib_enc\core_enc_init.c" />

    <ClCompile Include="..\lib_enc\core_enc_ol.c" />

    <ClCompile Include="..\lib_enc\core_enc_reconf.c" />

    <ClCompile Include="..\lib_enc\core_enc_switch.c" />

    <ClCompile Include="..\lib_enc\core_enc_updt.c" />

    <ClCompile Include="..\lib_enc\core_switching_enc.c" />

    <ClCompile Include="..\lib_enc\corr_xh.c" />

    <ClCompile Include="..\lib_enc\cor_shif.c" />

    <ClCompile Include="..\lib_enc\decision_matrix_enc.c" />

    <ClCompile Include="..\lib_enc\detect_transient.c" />

    <ClCompile Include="..\lib_enc\diffcod.c" />

    <ClCompile Include="..\lib_enc\dtx.c" />

    <ClCompile Include="..\lib_enc\enc_acelp.c" />

    <ClCompile Include="..\lib_enc\enc_acelpx.c" />

    <ClCompile Include="..\lib_enc\enc_acelp_tcx_main.c" />

    <ClCompile Include="..\lib_enc\enc_amr_wb.c" />

    <ClCompile Include="..\lib_enc\enc_gain.c" />

    <ClCompile Include="..\lib_enc\enc_gen_voic.c" />

    <ClCompile Include="..\lib_enc\enc_prm.c" />

    <ClCompile Include="..\lib_enc\fd_cng_enc.c" />

    <ClCompile Include="..\lib_enc\find_tilt.c" />

    <ClCompile Include="..\lib_enc\find_uv.c" />

    <ClCompile Include="..\lib_enc\find_wsp.c" />

    <ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate.c" />

    <ClCompile Include="..\lib_enc\gain_enc.c" />

    <ClCompile Include="..\lib_enc\gs_enc.c" />

    <ClCompile Include="..\lib_enc\guided_plc_enc.c" />

    <ClCompile Include="..\lib_enc\hf_cod_amrwb.c" />

    <ClCompile Include="..\lib_enc\hq_classifier_enc.c" />

    <ClCompile Include="..\lib_enc\hq_core_enc.c" />

    <ClCompile Include="..\lib_enc\hq_env_enc.c" />

    <ClCompile Include="..\lib_enc\hq_hr_enc.c" />

    <ClCompile Include="..\lib_enc\hq_lr_enc.c" />

    <ClCompile Include="..\lib_enc\hvq_enc.c" />

    <ClCompile Include="..\lib_enc\igf_enc.c" />

    <ClCompile Include="..\lib_enc\igf_scf_enc.c" />

    <ClCompile Include="..\lib_enc\init_enc.c" />

    <ClCompile Include="..\lib_enc\inov_enc.c" />

    <ClCompile Include="..\lib_enc\isf_enc_amr_wb.c" />

    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_core_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_cpe_enc.c" />
@@ -324,18 +273,13 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c" />

    <ClCompile Include="..\lib_enc\lead_indexing.c" />

    <ClCompile Include="..\lib_enc\lead_indexing_fx.c" />

    <ClCompile Include="..\lib_enc\lib_enc.c" />

    <ClCompile Include="..\lib_enc\long_enr.c" />

    <ClCompile Include="..\lib_enc\long_enr_fx.c" />

    <ClCompile Include="..\lib_enc\lp_exc_e.c" />

    <ClCompile Include="..\lib_enc\lp_exc_e_fx.c" />

    <ClCompile Include="..\lib_enc\lsf_enc.c" />

    <ClCompile Include="..\lib_enc\lsf_enc_fx.c" />

    <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc.c" />

    <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc_fx.c" />

    <ClCompile Include="..\lib_enc\ltd_stable.c" />

    <ClCompile Include="..\lib_enc\ltd_stable_fx.c" />

    <ClCompile Include="..\lib_enc\mdct_classifier_fx.c" />

    <ClCompile Include="..\lib_enc\mdct_selector_fx.c" />
@@ -373,18 +317,8 @@ 
    <ClCompile Include="..\lib_enc\swb_bwe_enc_fx.c" />

    <ClCompile Include="..\lib_enc\swb_bwe_enc_hr_fx.c" />

    <ClCompile Include="..\lib_enc\swb_bwe_enc_lr_fx.c" />

    <ClCompile Include="..\lib_enc\mdct_classifier.c" />

    <ClCompile Include="..\lib_enc\mdct_selector.c" />

    <ClCompile Include="..\lib_enc\mslvq_enc.c" />

    <ClCompile Include="..\lib_enc\multi_harm.c" />

    <ClCompile Include="..\lib_enc\nelp_enc.c" />

    <ClCompile Include="..\lib_enc\nelp_enc_fx.c" />

    <ClCompile Include="..\lib_enc\pitch_ol.c" />

    <ClCompile Include="..\lib_enc\pitch_ol2.c" />

    <ClCompile Include="..\lib_enc\pit_enc.c" />

    <ClCompile Include="..\lib_enc\plc_enc_ext.c" />

    <ClCompile Include="..\lib_enc\rom_enc.c" />

    <ClCompile Include="..\lib_enc\setmodeindex.c" />

    <ClCompile Include="..\lib_enc\ivas_sns_enc.c" />

    <ClCompile Include="..\lib_enc\swb_pre_proc_fx.c" />

    <ClCompile Include="..\lib_enc\swb_tbe_enc_fx.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+0 −198
Original line number Diff line number Diff line
@@ -8,75 +8,39 @@ 
    <ClCompile Include="..\lib_enc\amr_wb_enc_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod_uv.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod_uv_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod_ace.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod_ace_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\comvad_decision.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\comvad_decision_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_2div.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_2div_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_init.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_init_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_ol.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_ol_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_reconf.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_reconf_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_switch.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_switch_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_updt.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_enc_updt_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\decision_matrix_enc.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\decision_matrix_enc_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_acelp_tcx_main.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_acelp_tcx_main_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_amr_wb.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_amr_wb_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>
@@ -92,54 +56,33 @@ 
    <ClCompile Include="..\lib_enc\enc_ppp_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\evs_enc_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hf_cod_amrwb.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hf_cod_amrwb_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_lr_enc.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_lr_enc_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\isf_enc_amr_wb.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\isf_enc_amr_wb_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ltd_stable.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ltd_stable_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\nelp_enc_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\nelp_enc.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ppp_enc_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\plc_enc_ext_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\plc_enc_ext.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pre_proc_fx.c">

      <Filter>encoder_evs_c</Filter>

    </ClCompile>
@@ -347,135 +290,72 @@ 
    <ClCompile Include="..\lib_enc\analy_sp_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ari_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ari_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ari_hm_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ari_hm_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\arith_coder_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\arith_coder_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\avq_cod.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\avq_cod_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\bass_psfilter_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\bass_psfilter_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\bw_detect.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\bw_detect_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cng_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cng_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod_tcx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod_tcx_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod2t32.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod2t32_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod4t64.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod4t64_fast.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cod4t64_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cor_shif.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\cor_shif_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_switching_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\core_switching_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\corr_xh.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\corr_xh_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\detect_transient.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\detect_transient_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\diffcod.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\diffcod_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\dtx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\dtx_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_acelp.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_acelp_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_acelpx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_acelpx_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_gain.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_gain_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_gen_voic.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_higher_acelp_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_pit_exc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_prm.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\enc_prm_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>
@@ -494,9 +374,6 @@ 
    <ClCompile Include="..\lib_enc\ext_sig_ana_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\fd_cng_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\fd_cng_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>
@@ -506,27 +383,15 @@ 
    <ClCompile Include="..\lib_enc\find_tar_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\find_tilt.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\find_tilt_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\find_uv.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\find_uv_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\find_wsp.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\find_wsp_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\gain_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\gain_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>
@@ -536,45 +401,24 @@ 
    <ClCompile Include="..\lib_enc\gp_clip_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\gs_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\gs_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\guided_plc_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\guided_plc_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_classifier_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_classifier_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_core_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_core_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_env_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_env_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_hr_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hq_hr_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hvq_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\hvq_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>
@@ -590,39 +434,21 @@ 
    <ClCompile Include="..\lib_enc\igf_scf_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\init_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\init_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\inov_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\inov_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\lead_indexing.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\lead_indexing_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\long_enr.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\long_enr_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\lp_exc_e.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\lp_exc_e_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\lsf_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\lsf_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>
@@ -632,27 +458,15 @@ 
    <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\mdct_classifier.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\mdct_classifier_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\mdct_selector.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\mdct_selector_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\mslvq_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\mslvq_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\multi_harm.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\multi_harm_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>
@@ -668,21 +482,12 @@ 
    <ClCompile Include="..\lib_enc\peak_vq_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pit_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pit_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pitch_ol.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pitch_ol_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pitch_ol2.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pitch_ol2_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>
@@ -719,9 +524,6 @@ 
    <ClCompile Include="..\lib_enc\set_impulse_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\setmodeindex.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\setmodeindex_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

lib_com/core_com_config.c

+2 −2
Original line number Diff line number Diff line
@@ -1235,8 +1235,8 @@ void init_tcx_window_cfg_fx( 
    }

    /*Mid-OLA*/

    /*compute minimum length for "half" window: lookahead - 5ms. It must be also multiple of 2*/

    hTcxCfg->tcx_mdct_window_half_length = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA_FX2( 12800, 5000000L ), sr2fscale( sr_core ) ), LD_FSCALE_DENOM ) );    /*Q0*/

    hTcxCfg->tcx_mdct_window_half_lengthFB = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA_FX2( 12800, 5000000L ), sr2fscale( input_Fs ) ), LD_FSCALE_DENOM ) ); /*Q0*/

    hTcxCfg->tcx_mdct_window_half_length = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA( 12800, 5000000L ), sr2fscale( sr_core ) ), LD_FSCALE_DENOM ) );    /*Q0*/

    hTcxCfg->tcx_mdct_window_half_lengthFB = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA( 12800, 5000000L ), sr2fscale( input_Fs ) ), LD_FSCALE_DENOM ) ); /*Q0*/

    move16();

    move16();

    assert( GT_16( hTcxCfg->tcx_mdct_window_half_length, 16 ) && "Half window can not be large enough!" );

lib_com/ivas_fb_mixer.c

+3 −3
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ static ivas_error ivas_filterbank_setup_fx( 


        ivas_get_active_bins_fx( &pAll_bins_per_band, &pAll_bins_per_band_abs, &pAll_bins_start_offset, &pAll_bins_start_offset_abs, sampling_rate );



        IF( EQ_16( pCfg->fb_latency, NS2SA( sampling_rate, DELAY_FB_1_NS ) ) )

        IF( EQ_16( pCfg->fb_latency, NS2SA_FX2( sampling_rate, DELAY_FB_1_NS ) ) )

        {

            pAll_fb_fr_fx[0] = ivas_fb_fr_12band_1ms_re_fx; // Q30

            move32();
@@ -1478,7 +1478,7 @@ static ivas_error ivas_fb_mixer_get_window_fx( 
    error = IVAS_ERR_OK;

    move32();



    IF( EQ_16( fade_len, NS2SA( sampling_rate, DELAY_FB_4_NS ) ) )

    IF( EQ_16( fade_len, NS2SA_FX2( sampling_rate, DELAY_FB_4_NS ) ) )

    {

        SWITCH( sampling_rate )

        {
@@ -1495,7 +1495,7 @@ static ivas_error ivas_fb_mixer_get_window_fx( 
                return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Unsupported Sampling frequency!" );

        }

    }

    ELSE IF( EQ_16( fade_len, NS2SA( sampling_rate, DELAY_FB_1_NS ) ) )

    ELSE IF( EQ_16( fade_len, NS2SA_FX2( sampling_rate, DELAY_FB_1_NS ) ) )

    {

        SWITCH( sampling_rate )

        {

lib_com/tcx_ltp_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,7 @@ void tcx_ltp_post( 


    filtIdx = 0; /* just to avoid comilation warnings */

    move16();

    tcx_buf_len = NS2SA( st->output_Fs, TCXLTP_DELAY_NS ); /* Q0 */

    tcx_buf_len = NS2SA_FX2( st->output_Fs, TCXLTP_DELAY_NS ); /* Q0 */

    SideInfoOnly = 0;

    move16();

    if ( GE_32( total_brate, HQ_96k ) )