From 8b76c75bac9ee160e0db65f920c7f86acb1a9827 Mon Sep 17 00:00:00 2001 From: Sandesh Venkatesh Date: Thu, 18 Jul 2024 12:31:54 +0530 Subject: [PATCH 1/2] prot_fx1.h and prot_fx2.h replaced with single prot_fx.h --- Workspace_msvc/lib_com.vcxproj | 3 +- Workspace_msvc/lib_com.vcxproj.filters | 3 +- Workspace_msvc/renderer.vcxproj | 2 +- apps/renderer.c | 2 +- lib_com/ACcontextMapping_fx.c | 3 +- lib_com/ari_fx.c | 3 +- lib_com/ari_hm_fx.c | 3 +- lib_com/arith_coder_fx.c | 3 +- lib_com/bitalloc_fx.c | 3 +- lib_com/bitallocsum_fx.c | 3 +- lib_com/bits_alloc_fx.c | 3 +- lib_com/bitstream_fx.c | 2 +- lib_com/cb_shape_fx.c | 3 +- lib_com/cldfb.c | 3 +- lib_com/cldfb_evs.c | 5 +- lib_com/cng_exc_fx.c | 3 +- lib_com/codec_tcx_common.c | 3 +- lib_com/core_com_config.c | 2 +- lib_com/deemph.c | 3 +- lib_com/delay_comp.c | 3 +- lib_com/dlpc_bfi_fx.c | 3 +- lib_com/edct_fx.c | 3 +- lib_com/enhancer_fx.c | 19 +- lib_com/enr_1_az.c | 2 +- lib_com/env_adj.c | 3 +- lib_com/env_stab.c | 3 +- lib_com/env_stab_trans.c | 3 +- lib_com/est_tilt_fx.c | 3 +- lib_com/fd_cng_com.c | 2 +- lib_com/fd_cng_com_fx.c | 3 +- lib_com/fft_cldfb_fx.c | 2 +- lib_com/fft_evs.c | 3 +- lib_com/fft_fx.c | 3 +- lib_com/fft_fx_evs.c | 3 +- lib_com/fft_rel.c | 3 +- lib_com/fft_rel_fx.c | 3 +- lib_com/fill_spectrum.c | 3 +- lib_com/findpulse.c | 3 +- lib_com/fine_gain_bits_fx.c | 3 +- lib_com/float_to_fix_ops.c | 2 +- lib_com/frame_ener.c | 3 +- lib_com/gain_inov_fx.c | 3 +- lib_com/get_gain.c | 3 +- lib_com/gs_bitallocation_fx.c | 3 +- lib_com/gs_bitallocation_ivas_fx.c | 3 +- lib_com/gs_gains_fx.c | 3 +- lib_com/gs_inact_switching_fx.c | 3 +- lib_com/gs_noisefill_fx.c | 3 +- lib_com/gs_preech.c | 3 +- lib_com/guided_plc_util_fx.c | 3 +- lib_com/hp50.c | 3 +- lib_com/hq2_bit_alloc_fx.c | 2 +- lib_com/hq2_core_com_fx.c | 2 +- lib_com/hq2_noise_inject_fx.c | 2 +- lib_com/hq_bit_allocation_fx.c | 3 +- lib_com/hq_conf.c | 3 +- lib_com/hq_conf_fx.c | 3 +- lib_com/hq_tools_fx.c | 2 +- lib_com/hvq_pvq_bitalloc_fx.c | 3 +- lib_com/ifft_rel.c | 3 +- lib_com/igf_base.c | 2 +- lib_com/igf_base_fx.c | 3 +- lib_com/index_pvq_opt_fx.c | 3 +- lib_com/int_lsp.c | 3 +- lib_com/interleave_spectrum.c | 3 +- lib_com/interpol.c | 3 +- lib_com/isf_dec_amr_wb_fx.c | 2 +- lib_com/ivas_cov_smooth.c | 2 +- lib_com/ivas_dirac_com.c | 3 +- lib_com/ivas_fb_mixer.c | 3 +- lib_com/ivas_ism_com.c | 3 +- lib_com/ivas_masa_com.c | 2 +- lib_com/ivas_mc_param_com.c | 2 +- lib_com/ivas_mct_com.c | 1 - lib_com/ivas_mdct_core_com.c | 3 +- lib_com/ivas_mdct_imdct_fx.c | 2 +- lib_com/ivas_mdft_imdft.c | 3 +- lib_com/ivas_omasa_com.c | 3 +- lib_com/ivas_pca_tools.c | 2 +- lib_com/ivas_qmetadata_com.c | 3 +- lib_com/ivas_sns_com_fx.c | 3 +- lib_com/ivas_spar_com.c | 3 +- lib_com/ivas_spar_com_quant_util.c | 4 +- lib_com/ivas_stereo_ica_com_fx.c | 3 +- lib_com/ivas_stereo_mdct_bands_com.c | 3 +- lib_com/ivas_stereo_mdct_stereo_com.c | 3 +- lib_com/ivas_stereo_td_bit_alloc.c | 3 +- lib_com/ivas_tools.c | 4 +- lib_com/ivas_transient_det.c | 2 +- lib_com/lag_wind.c | 3 +- lib_com/lerp.c | 3 +- lib_com/limit_t0_fx.c | 3 +- lib_com/logqnorm_fx.c | 2 +- lib_com/longarith.c | 2 +- lib_com/low_rate_band_att_fx.c | 3 +- lib_com/lpc_tools.c | 2 +- lib_com/lpc_tools_fx.c | 2 +- lib_com/lsf_dec_bfi_fx.c | 3 +- lib_com/lsf_msvq_ma_fx.c | 3 +- lib_com/lsf_tools.c | 3 +- lib_com/lsf_tools_fx.c | 2 +- lib_com/lsp_conv_poly_fx.c | 2 +- lib_com/modif_fs.c | 2 +- lib_com/modif_fs_fx.c | 3 +- lib_com/mslvq_com.c | 2 +- lib_com/mslvq_com_fx.c | 2 +- lib_com/nelp_fx.c | 2 +- lib_com/parameter_bitmaping.c | 2 +- lib_com/parameter_bitmaping_fx.c | 2 +- lib_com/phase_dispersion_fx.c | 3 +- lib_com/ppp_fx.c | 2 +- lib_com/pred_lt4_fx.c | 3 +- lib_com/preemph_fx.c | 3 +- lib_com/prot.h | 289 +------ lib_com/{prot_fx2.h => prot_fx.h} | 759 ++++++++++++++++++- lib_com/prot_fx1.h | 636 ---------------- lib_com/pvq_com_fx.c | 3 +- lib_com/range_com_fx.c | 3 +- lib_com/re8_ppv_fx.c | 3 +- lib_com/re8_util_fx.c | 3 +- lib_com/recovernorm_fx.c | 3 +- lib_com/reordvct_fx.c | 2 +- lib_com/residu_fx.c | 3 +- lib_com/rom_com.c | 2 +- lib_com/scale_mem_fx.c | 2 +- lib_com/stab_est_fx.c | 3 +- lib_com/stat_noise_uv_mod_fx.c | 5 +- lib_com/swb_bwe_com_fx.c | 3 +- lib_com/swb_bwe_com_hr_fx.c | 3 +- lib_com/swb_bwe_com_lr_fx.c | 2 +- lib_com/swb_tbe_com.c | 32 +- lib_com/swb_tbe_com_fx.c | 19 +- lib_com/syn_12k8_fx.c | 3 +- lib_com/syn_filt_fx.c | 7 +- lib_com/tcq_position_arith_fx.c | 21 +- lib_com/tcx_ltp_fx.c | 57 +- lib_com/tcx_mdct_fx.c | 37 +- lib_com/tcx_mdct_window.c | 17 +- lib_com/tcx_utils_fx.c | 7 +- lib_com/tec_com.c | 7 +- lib_com/tns_base.c | 3 +- lib_com/tools.c | 3 +- lib_com/tools_fx.c | 3 +- lib_com/trans_direct_fx.c | 3 +- lib_com/trans_inv_fx.c | 3 +- lib_com/vlpc_2st_com_fx.c | 3 +- lib_com/weight_a_fx.c | 3 +- lib_com/weight_fx.c | 3 +- lib_com/wi_fx.c | 3 +- lib_com/window_fx.c | 3 +- lib_com/window_ola_fx.c | 3 +- lib_com/wtda.c | 2 +- lib_com/wtda_fx.c | 3 +- lib_dec/ACcontextMapping_dec_fx.c | 3 +- lib_dec/FEC_HQ_core.c | 27 +- lib_dec/FEC_HQ_core_fx.c | 3 +- lib_dec/FEC_HQ_phase_ecu_fx.c | 179 +++-- lib_dec/FEC_adapt_codebook_fx.c | 3 +- lib_dec/FEC_clas_estim_fx.c | 3 +- lib_dec/FEC_fx.c | 3 +- lib_dec/FEC_lsf_estim_fx.c | 3 +- lib_dec/FEC_pitch_estim_fx.c | 7 +- lib_dec/FEC_scale_syn_fx.c | 7 +- lib_dec/LD_music_post_filter_fx.c | 3 +- lib_dec/TonalComponentDetection_fx.c | 6 +- lib_dec/acelp_core_dec.c | 3 +- lib_dec/acelp_core_dec_fx.c | 3 +- lib_dec/acelp_core_dec_ivas_fx.c | 3 +- lib_dec/acelp_core_switch_dec_fx.c | 3 +- lib_dec/amr_wb_dec.c | 2 +- lib_dec/amr_wb_dec_fx.c | 3 +- lib_dec/ari_dec.c | 1 + lib_dec/ari_dec_fx.c | 3 +- lib_dec/ari_hm_dec.c | 2 +- lib_dec/arith_coder_dec.c | 3 +- lib_dec/arith_coder_dec_fx.c | 3 +- lib_dec/avq_dec_fx.c | 3 +- lib_dec/bass_psfilter.c | 3 +- lib_dec/bass_psfilter_fx.c | 3 +- lib_dec/cng_dec.c | 1 - lib_dec/cng_dec_fx.c | 3 +- lib_dec/core_dec_init.c | 2 +- lib_dec/core_dec_init_fx.c | 3 +- lib_dec/core_dec_reconf.c | 2 +- lib_dec/core_dec_reconf_fx.c | 3 +- lib_dec/core_dec_switch_fx.c | 3 +- lib_dec/core_switching_dec.c | 3 +- lib_dec/core_switching_dec_fx.c | 3 +- lib_dec/d_gain2p_fx.c | 3 +- lib_dec/dec2t32_fx.c | 3 +- lib_dec/dec4t64_fx.c | 9 +- lib_dec/dec_LPD.c | 2 +- lib_dec/dec_LPD_fx.c | 3 +- lib_dec/dec_ace_fx.c | 3 +- lib_dec/dec_acelp_fx.c | 3 +- lib_dec/dec_acelp_tcx_main_fx.c | 3 +- lib_dec/dec_amr_wb_fx.c | 3 +- lib_dec/dec_gen_voic_fx.c | 3 +- lib_dec/dec_higher_acelp.c | 2 +- lib_dec/dec_higher_acelp_fx.c | 3 +- lib_dec/dec_nelp_fx.c | 3 +- lib_dec/dec_pit_exc_fx.c | 5 +- lib_dec/dec_post_fx.c | 3 +- lib_dec/dec_ppp_fx.c | 5 +- lib_dec/dec_prm.c | 4 +- lib_dec/dec_prm_fx.c | 25 +- lib_dec/dec_tcx.c | 4 +- lib_dec/dec_tcx_fx.c | 3 +- lib_dec/dec_tran_fx.c | 3 +- lib_dec/dec_uv_fx.c | 3 +- lib_dec/decision_matrix_dec_fx.c | 3 +- lib_dec/dlpc_avq_fx.c | 3 +- lib_dec/dlpc_stoch_fx.c | 3 +- lib_dec/er_dec_acelp_fx.c | 3 +- lib_dec/er_dec_tcx_fx.c | 3 +- lib_dec/er_scale_syn_fx.c | 3 +- lib_dec/er_sync_exc_fx.c | 3 +- lib_dec/er_util_fx.c | 3 +- lib_dec/evs_dec.c | 3 +- lib_dec/evs_dec_fx.c | 3 +- lib_dec/fd_cng_dec.c | 3 +- lib_dec/fd_cng_dec_fx.c | 3 +- lib_dec/gain_dec_fx.c | 3 +- lib_dec/gaus_dec_fx.c | 3 +- lib_dec/gs_dec_amr_wb_fx.c | 19 +- lib_dec/gs_dec_fx.c | 29 +- lib_dec/hdecnrm_fx.c | 3 +- lib_dec/hf_synth.c | 3 +- lib_dec/hf_synth_fx.c | 17 +- lib_dec/hq_classifier_dec_fx.c | 7 +- lib_dec/hq_conf_fec_fx.c | 3 +- lib_dec/hq_core_dec_fx.c | 3 +- lib_dec/hq_env_dec_fx.c | 3 +- lib_dec/hq_hr_dec_fx.c | 3 +- lib_dec/hq_lr_dec_fx.c | 3 +- lib_dec/igf_dec.c | 2 +- lib_dec/igf_dec_fx.c | 3 +- lib_dec/igf_scf_dec_fx.c | 3 +- lib_dec/init_dec.c | 5 +- lib_dec/init_dec_fx.c | 3 +- lib_dec/inov_dec.c | 2 +- lib_dec/inov_dec_fx.c | 3 +- lib_dec/ivas_agc_dec_fx.c | 2 +- lib_dec/ivas_binRenderer_internal.c | 3 +- lib_dec/ivas_core_dec.c | 3 +- lib_dec/ivas_corecoder_dec_reconfig.c | 3 +- lib_dec/ivas_cpe_dec.c | 2 +- lib_dec/ivas_cpe_dec_fx.c | 3 +- lib_dec/ivas_dirac_dec.c | 5 +- lib_dec/ivas_dirac_output_synthesis_cov.c | 3 +- lib_dec/ivas_init_dec.c | 3 +- lib_dec/ivas_ism_dec.c | 2 +- lib_dec/ivas_ism_dtx_dec.c | 2 +- lib_dec/ivas_ism_metadata_dec.c | 3 +- lib_dec/ivas_ism_param_dec.c | 3 +- lib_dec/ivas_ism_renderer.c | 3 +- lib_dec/ivas_jbm_dec.c | 3 +- lib_dec/ivas_lfe_dec_fx.c | 3 +- lib_dec/ivas_lfe_plc_fx.c | 3 +- lib_dec/ivas_ls_custom_dec.c | 2 +- lib_dec/ivas_masa_dec.c | 5 +- lib_dec/ivas_mc_param_dec.c | 3 +- lib_dec/ivas_mc_paramupmix_dec.c | 4 +- lib_dec/ivas_mct_core_dec.c | 3 +- lib_dec/ivas_mct_dec.c | 3 +- lib_dec/ivas_mct_dec_mct_fx.c | 3 +- lib_dec/ivas_mdct_core_dec.c | 4 +- lib_dec/ivas_mono_dmx_renderer.c | 3 +- lib_dec/ivas_objectRenderer_internal.c | 3 +- lib_dec/ivas_omasa_dec.c | 2 +- lib_dec/ivas_osba_dec.c | 3 +- lib_dec/ivas_out_setup_conversion.c | 3 +- lib_dec/ivas_pca_dec_fx.c | 2 +- lib_dec/ivas_post_proc.c | 3 +- lib_dec/ivas_qmetadata_dec.c | 3 +- lib_dec/ivas_sba_dec.c | 2 +- lib_dec/ivas_sba_dirac_stereo_dec_fx.c | 3 +- lib_dec/ivas_sba_rendering_internal.c | 2 +- lib_dec/ivas_sce_dec.c | 3 +- lib_dec/ivas_sce_dec_fx.c | 3 +- lib_dec/ivas_sns_dec_fx.c | 3 +- lib_dec/ivas_spar_decoder.c | 4 +- lib_dec/ivas_spar_md_dec.c | 4 +- lib_dec/ivas_stereo_cng_dec.c | 3 +- lib_dec/ivas_stereo_dft_dec.c | 2 +- lib_dec/ivas_stereo_dft_dec_dmx.c | 13 +- lib_dec/ivas_stereo_dft_dec_fx.c | 3 +- lib_dec/ivas_stereo_dft_plc_fx.c | 21 +- lib_dec/ivas_stereo_ica_dec.c | 6 +- lib_dec/ivas_stereo_icbwe_dec.c | 3 +- lib_dec/ivas_stereo_mdct_core_dec.c | 2 +- lib_dec/ivas_stereo_mdct_core_dec_fx.c | 11 +- lib_dec/ivas_stereo_mdct_stereo_dec.c | 3 +- lib_dec/ivas_stereo_switching_dec.c | 4 +- lib_dec/ivas_stereo_td_dec.c | 3 +- lib_dec/ivas_svd_dec.c | 3 +- lib_dec/ivas_tcx_core_dec.c | 5 +- lib_dec/ivas_td_low_rate_dec.c | 3 +- lib_dec/jbm_jb4sb.c | 2 +- lib_dec/jbm_pcmdsp_apa.c | 2 +- lib_dec/lead_deindexing_fx.c | 3 +- lib_dec/lib_dec.c | 3 +- lib_dec/lib_dec_fx.c | 3 +- lib_dec/lp_exc_d_fx.c | 3 +- lib_dec/lsf_dec.c | 2 +- lib_dec/lsf_dec_fx.c | 3 +- lib_dec/lsf_msvq_ma_dec_fx.c | 3 +- lib_dec/nelp_dec_fx.c | 3 +- lib_dec/peak_vq_dec_fx.c | 3 +- lib_dec/pit_dec_fx.c | 3 +- lib_dec/pitch_extr_fx.c | 3 +- lib_dec/post_dec_fx.c | 3 +- lib_dec/ppp_dec_fx.c | 3 +- lib_dec/pvq_core_dec_fx.c | 3 +- lib_dec/pvq_decode_fx.c | 3 +- lib_dec/range_dec_fx.c | 3 +- lib_dec/re8_dec_fx.c | 3 +- lib_dec/rst_dec_fx.c | 3 +- lib_dec/stat_noise_uv_dec_fx.c | 3 +- lib_dec/swb_bwe_dec.c | 3 +- lib_dec/swb_bwe_dec_fx.c | 3 +- lib_dec/swb_bwe_dec_hr.c | 2 +- lib_dec/swb_bwe_dec_hr_fx.c | 3 +- lib_dec/swb_bwe_dec_lr_fx.c | 3 +- lib_dec/swb_tbe_dec.c | 3 +- lib_dec/swb_tbe_dec_fx.c | 3 +- lib_dec/syn_outp_fx.c | 3 +- lib_dec/tcq_core_dec_fx.c | 3 +- lib_dec/tcx_utils_dec_fx.c | 3 +- lib_dec/tns_base_dec_fx.c | 3 +- lib_dec/tonalMDCTconcealment.c | 3 +- lib_dec/tonalMDCTconcealment_fx.c | 5 +- lib_dec/transition_dec_fx.c | 3 +- lib_dec/updt_dec_fx.c | 3 +- lib_dec/vlpc_1st_dec_fx.c | 3 +- lib_dec/vlpc_2st_dec_fx.c | 3 +- lib_dec/voiced_dec_fx.c | 3 +- lib_dec/waveadjust_fec_dec_fx.c | 3 +- lib_enc/ACcontextMapping_enc_fx.c | 3 +- lib_enc/FEC_enc_fx.c | 3 +- lib_enc/SNR_calc_fx.c | 3 +- lib_enc/acelp_core_enc.c | 2 +- lib_enc/acelp_core_enc_fx.c | 3 +- lib_enc/acelp_core_switch_enc_fx.c | 3 +- lib_enc/acelp_enc_util_fx.c | 3 +- lib_enc/amr_wb_enc_fx.c | 3 +- lib_enc/analy_lp_fx.c | 3 +- lib_enc/analy_sp_fx.c | 3 +- lib_enc/ari_enc.c | 2 +- lib_enc/ari_enc_fx.c | 3 +- lib_enc/ari_hm_enc_fx.c | 3 +- lib_enc/arith_coder_enc_fx.c | 3 +- lib_enc/avq_cod_fx.c | 3 +- lib_enc/bass_psfilter_enc_fx.c | 3 +- lib_enc/bw_detect_fx.c | 3 +- lib_enc/cng_enc_fx.c | 3 +- lib_enc/cod2t32_fx.c | 3 +- lib_enc/cod4t64_fx.c | 3 +- lib_enc/cod_ace_fx.c | 3 +- lib_enc/cod_tcx_fx.c | 3 +- lib_enc/cod_uv_fx.c | 3 +- lib_enc/comvad_decision_fx.c | 3 +- lib_enc/cor_shif_fx.c | 3 +- lib_enc/core_enc_2div_fx.c | 3 +- lib_enc/core_enc_init_fx.c | 3 +- lib_enc/core_enc_ol_fx.c | 3 +- lib_enc/core_enc_reconf_fx.c | 3 +- lib_enc/core_enc_switch_fx.c | 3 +- lib_enc/core_enc_updt_fx.c | 3 +- lib_enc/core_switching_enc_fx.c | 3 +- lib_enc/corr_xh_fx.c | 3 +- lib_enc/decision_matrix_enc_fx.c | 3 +- lib_enc/detect_transient_fx.c | 3 +- lib_enc/diffcod_fx.c | 3 +- lib_enc/dtx_fx.c | 9 +- lib_enc/enc_acelp_fx.c | 3 +- lib_enc/enc_acelp_tcx_main_fx.c | 3 +- lib_enc/enc_acelpx_fx.c | 3 +- lib_enc/enc_amr_wb_fx.c | 3 +- lib_enc/enc_gain_fx.c | 3 +- lib_enc/enc_gen_voic_fx.c | 3 +- lib_enc/enc_gen_voic_rf.c | 2 +- lib_enc/enc_gen_voic_rf_fx.c | 3 +- lib_enc/enc_higher_acelp_fx.c | 3 +- lib_enc/enc_nelp_fx.c | 3 +- lib_enc/enc_pit_exc_fx.c | 3 +- lib_enc/enc_ppp_fx.c | 3 +- lib_enc/enc_prm_fx.c | 3 +- lib_enc/enc_tran_fx.c | 3 +- lib_enc/enc_uv_fx.c | 3 +- lib_enc/energy_fx.c | 3 +- lib_enc/eval_pit_contr_fx.c | 3 +- lib_enc/evs_enc_fx.c | 3 +- lib_enc/ext_sig_ana_fx.c | 3 +- lib_enc/fd_cng_enc.c | 2 +- lib_enc/fd_cng_enc_fx.c | 3 +- lib_enc/find_tar_fx.c | 3 +- lib_enc/find_tilt_fx.c | 3 +- lib_enc/find_uv_fx.c | 3 +- lib_enc/find_wsp.c | 26 +- lib_enc/find_wsp_fx.c | 3 +- lib_enc/frame_spec_dif_cor_rate_fx.c | 3 +- lib_enc/gain_enc_fx.c | 3 +- lib_enc/gaus_enc_fx.c | 3 +- lib_enc/gp_clip_fx.c | 3 +- lib_enc/gs_enc_fx.c | 3 +- lib_enc/guided_plc_enc_fx.c | 3 +- lib_enc/hf_cod_amrwb_fx.c | 3 +- lib_enc/hq_classifier_enc_fx.c | 3 +- lib_enc/hq_core_enc_fx.c | 3 +- lib_enc/hq_env_enc_fx.c | 3 +- lib_enc/hq_hr_enc_fx.c | 3 +- lib_enc/hq_lr_enc_fx.c | 3 +- lib_enc/hvq_enc_fx.c | 3 +- lib_enc/igf_enc_fx.c | 3 +- lib_enc/igf_scf_enc_fx.c | 3 +- lib_enc/init_enc.c | 2 +- lib_enc/init_enc_fx.c | 3 +- lib_enc/inov_enc_fx.c | 3 +- lib_enc/isf_enc_amr_wb_fx.c | 3 +- lib_enc/ivas_agc_enc.c | 3 +- lib_enc/ivas_core_pre_proc_front.c | 13 +- lib_enc/ivas_cpe_enc.c | 3 +- lib_enc/ivas_dirac_enc.c | 3 +- lib_enc/ivas_enc.c | 3 +- lib_enc/ivas_enc_cov_handler.c | 2 +- lib_enc/ivas_front_vad.c | 3 +- lib_enc/ivas_init_enc.c | 2 +- lib_enc/ivas_ism_dtx_enc.c | 29 +- lib_enc/ivas_ism_enc.c | 15 +- lib_enc/ivas_ism_metadata_enc.c | 17 +- lib_enc/ivas_ism_param_enc.c | 13 +- lib_enc/ivas_lfe_enc.c | 3 +- lib_enc/ivas_masa_enc.c | 5 +- lib_enc/ivas_mc_paramupmix_enc.c | 2 +- lib_enc/ivas_mcmasa_enc.c | 19 +- lib_enc/ivas_mct_enc_mct.c | 2 +- lib_enc/ivas_omasa_enc.c | 3 +- lib_enc/ivas_osba_enc.c | 3 +- lib_enc/ivas_qmetadata_enc.c | 3 +- lib_enc/ivas_sba_enc.c | 3 +- lib_enc/ivas_sce_enc.c | 2 +- lib_enc/ivas_sns_enc.c | 2 +- lib_enc/ivas_spar_encoder.c | 4 +- lib_enc/ivas_stereo_classifier.c | 4 +- lib_enc/ivas_stereo_cng_enc.c | 2 +- lib_enc/ivas_stereo_dft_enc.c | 2 +- lib_enc/ivas_stereo_ica_enc.c | 3 +- lib_enc/ivas_stereo_icbwe_enc.c | 2 +- lib_enc/ivas_stereo_mdct_core_enc.c | 16 +- lib_enc/ivas_stereo_mdct_igf_enc.c | 2 +- lib_enc/ivas_stereo_mdct_stereo_enc.c | 3 +- lib_enc/lead_indexing_fx.c | 3 +- lib_enc/lib_enc.c | 12 +- lib_enc/long_enr_fx.c | 41 +- lib_enc/lp_exc_e_fx.c | 3 +- lib_enc/lsf_enc.c | 2 +- lib_enc/lsf_enc_fx.c | 3 +- lib_enc/lsf_msvq_ma_enc_fx.c | 3 +- lib_enc/ltd_stable_fx.c | 3 +- lib_enc/mdct_classifier_fx.c | 3 +- lib_enc/mdct_selector_fx.c | 3 +- lib_enc/mslvq_enc_fx.c | 3 +- lib_enc/multi_harm_fx.c | 3 +- lib_enc/nelp_enc_fx.c | 3 +- lib_enc/nois_est_fx.c | 3 +- lib_enc/noise_adjust_fx.c | 3 +- lib_enc/normalizecoefs_fx.c | 3 +- lib_enc/peak_vq_enc_fx.c | 3 +- lib_enc/pit_enc_fx.c | 3 +- lib_enc/pitch_ol2_fx.c | 3 +- lib_enc/pitch_ol_fx.c | 5 +- lib_enc/plc_enc_ext_fx.c | 3 +- lib_enc/ppp_enc_fx.c | 3 +- lib_enc/pre_proc_fx.c | 3 +- lib_enc/pvq_core_enc_fx.c | 3 +- lib_enc/pvq_encode_fx.c | 3 +- lib_enc/q_gain2p_fx.c | 3 +- lib_enc/qlpc_avq_fx.c | 3 +- lib_enc/qlpc_stoch_fx.c | 3 +- lib_enc/range_enc_fx.c | 3 +- lib_enc/re8_cod_fx.c | 3 +- lib_enc/reordernorm_fx.c | 3 +- lib_enc/rst_enc_fx.c | 3 +- lib_enc/scale_enc_fx.c | 3 +- lib_enc/set_impulse_fx.c | 3 +- lib_enc/setmodeindex_fx.c | 3 +- lib_enc/sig_clas_fx.c | 3 +- lib_enc/spec_center_fx.c | 3 +- lib_enc/spec_flatness_fx.c | 3 +- lib_enc/speech_music_classif.c | 6 +- lib_enc/speech_music_classif_fx.c | 5 +- lib_enc/stat_noise_uv_enc_fx.c | 3 +- lib_enc/subband_fft_fx.c | 3 +- lib_enc/swb_bwe_enc_fx.c | 3 +- lib_enc/swb_bwe_enc_hr_fx.c | 3 +- lib_enc/swb_bwe_enc_lr_fx.c | 3 +- lib_enc/swb_pre_proc_fx.c | 3 +- lib_enc/swb_tbe_enc_fx.c | 3 +- lib_enc/tcq_core_enc_fx.c | 3 +- lib_enc/tcx_ltp_enc_fx.c | 3 +- lib_enc/tcx_utils_enc.c | 2 +- lib_enc/tcx_utils_enc_fx.c | 3 +- lib_enc/tfa_enc_fx.c | 3 +- lib_enc/tns_base_enc_fx.c | 3 +- lib_enc/transient_detection_fx.c | 3 +- lib_enc/transition_enc.c | 2 +- lib_enc/transition_enc_fx.c | 3 +- lib_enc/update_decision_fx.c | 3 +- lib_enc/updt_enc_fx.c | 3 +- lib_enc/updt_tar_fx.c | 3 +- lib_enc/vad_basop_fx.c | 3 +- lib_enc/vad_fx.c | 3 +- lib_enc/vad_param_updt_fx.c | 3 +- lib_enc/vad_proc_fx.c | 3 +- lib_enc/vbr_average_rate_fx.c | 3 +- lib_enc/vlpc_1st_cod_fx.c | 3 +- lib_enc/vlpc_2st_cod_fx.c | 3 +- lib_enc/voiced_enc_fx.c | 3 +- lib_enc/waveadjust_fec_cod_fx.c | 3 +- lib_rend/ivas_crend.c | 5 +- lib_rend/ivas_dirac_ana.c | 3 +- lib_rend/ivas_dirac_dec_binaural_functions.c | 11 +- lib_rend/ivas_dirac_decorr_dec.c | 21 +- lib_rend/ivas_dirac_onsets_dec.c | 3 +- lib_rend/ivas_dirac_output_synthesis_dec.c | 3 +- lib_rend/ivas_dirac_rend.c | 3 +- lib_rend/ivas_efap.c | 2 +- lib_rend/ivas_masa_merge.c | 2 +- lib_rend/ivas_mcmasa_ana.c | 3 +- lib_rend/ivas_objectRenderer.c | 3 +- lib_rend/ivas_objectRenderer_hrFilt.c | 3 +- lib_rend/ivas_objectRenderer_mix.c | 2 +- lib_rend/ivas_objectRenderer_sfx.c | 2 +- lib_rend/ivas_objectRenderer_sources.c | 3 +- lib_rend/ivas_objectRenderer_vec.c | 3 +- lib_rend/ivas_omasa_ana.c | 2 +- lib_rend/ivas_orient_trk.c | 3 +- lib_rend/ivas_reflections.c | 3 +- lib_rend/ivas_render_config.c | 2 +- lib_rend/ivas_reverb.c | 9 +- lib_rend/ivas_reverb_delay_line.c | 3 +- lib_rend/ivas_reverb_fft_filter.c | 3 +- lib_rend/ivas_reverb_filter_design.c | 2 +- lib_rend/ivas_reverb_iir_filter.c | 3 +- lib_rend/ivas_reverb_utils.c | 2 +- lib_rend/ivas_rotation.c | 3 +- lib_rend/ivas_sba_rendering.c | 3 +- lib_rend/ivas_td_decorr.c | 3 +- lib_rend/ivas_vbap.c | 4 +- lib_rend/lib_rend.c | 3 +- lib_util/hrtf_file_reader.c | 2 +- lib_util/ism_file_reader.c | 2 +- lib_util/rotation_file_reader.c | 2 +- lib_util/vector3_pair_file_reader.c | 3 +- 555 files changed, 1700 insertions(+), 2325 deletions(-) rename lib_com/{prot_fx2.h => prot_fx.h} (92%) delete mode 100644 lib_com/prot_fx1.h diff --git a/Workspace_msvc/lib_com.vcxproj b/Workspace_msvc/lib_com.vcxproj index f55a30abb..28dae4b83 100644 --- a/Workspace_msvc/lib_com.vcxproj +++ b/Workspace_msvc/lib_com.vcxproj @@ -399,8 +399,7 @@ - - + diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters index d46cc4712..46d83453a 100644 --- a/Workspace_msvc/lib_com.vcxproj.filters +++ b/Workspace_msvc/lib_com.vcxproj.filters @@ -593,11 +593,10 @@ common_h - - common_h + diff --git a/Workspace_msvc/renderer.vcxproj b/Workspace_msvc/renderer.vcxproj index c62874ec0..1f95040e1 100644 --- a/Workspace_msvc/renderer.vcxproj +++ b/Workspace_msvc/renderer.vcxproj @@ -65,7 +65,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;.%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions) EnableFastChecks diff --git a/apps/renderer.c b/apps/renderer.c index 1cc4c1a32..fcc1a04b7 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -49,7 +49,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" +#include "prot_fx.h" #endif #define WMC_TOOL_SKIP diff --git a/lib_com/ACcontextMapping_fx.c b/lib_com/ACcontextMapping_fx.c index 6cf368a46..ef5508692 100644 --- a/lib_com/ACcontextMapping_fx.c +++ b/lib_com/ACcontextMapping_fx.c @@ -6,8 +6,7 @@ #include "options.h" #include "basop_util.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /* Returns: index of next coefficient */ diff --git a/lib_com/ari_fx.c b/lib_com/ari_fx.c index a16885a62..3b36d10b3 100644 --- a/lib_com/ari_fx.c +++ b/lib_com/ari_fx.c @@ -5,8 +5,7 @@ #include #include "assert.h" #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" /** diff --git a/lib_com/ari_hm_fx.c b/lib_com/ari_hm_fx.c index 425823d27..767aea860 100644 --- a/lib_com/ari_hm_fx.c +++ b/lib_com/ari_hm_fx.c @@ -9,8 +9,7 @@ #include "cnst.h" #include "basop_util.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) ) void UnmapIndex( diff --git a/lib_com/arith_coder_fx.c b/lib_com/arith_coder_fx.c index 54533aaca..64cc81d04 100644 --- a/lib_com/arith_coder_fx.c +++ b/lib_com/arith_coder_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "cnst.h" diff --git a/lib_com/bitalloc_fx.c b/lib_com/bitalloc_fx.c index 78f6ac276..491c9bb95 100644 --- a/lib_com/bitalloc_fx.c +++ b/lib_com/bitalloc_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ void bitalloc_fx( Word16 *y, /* i : reordered norm of sub-vectors Q0 */ diff --git a/lib_com/bitallocsum_fx.c b/lib_com/bitallocsum_fx.c index fd34a0c1d..2a077b1de 100644 --- a/lib_com/bitallocsum_fx.c +++ b/lib_com/bitallocsum_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------------- * bitallocsum_fx() diff --git a/lib_com/bits_alloc_fx.c b/lib_com/bits_alloc_fx.c index 0638b903c..da120dc82 100644 --- a/lib_com/bits_alloc_fx.c +++ b/lib_com/bits_alloc_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/bitstream_fx.c b/lib_com/bitstream_fx.c index 2bf4ecf91..d910b657a 100644 --- a/lib_com/bitstream_fx.c +++ b/lib_com/bitstream_fx.c @@ -39,7 +39,7 @@ #include #include "options.h" #include "ivas_cnst.h" /* Common constants */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/cb_shape_fx.c b/lib_com/cb_shape_fx.c index d8dec57d6..6a27fd395 100644 --- a/lib_com/cb_shape_fx.c +++ b/lib_com/cb_shape_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* */ /* diff --git a/lib_com/cldfb.c b/lib_com/cldfb.c index 9083ac14f..4b618f556 100644 --- a/lib_com/cldfb.c +++ b/lib_com/cldfb.c @@ -40,11 +40,10 @@ #include #include "stat_dec.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_com_fx.h" #include "wmc_auto.h" -#include "prot_fx2.h" #if __STDC_VERSION__ >= 199901L #if defined __ICL #define restrict __restrict diff --git a/lib_com/cldfb_evs.c b/lib_com/cldfb_evs.c index 1e7d5bd8f..317ff899f 100644 --- a/lib_com/cldfb_evs.c +++ b/lib_com/cldfb_evs.c @@ -20,8 +20,7 @@ #include "stat_com.h" #include "rom_com.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include #define STATE_BUFFER_SIZE ( 9 + 16 ) @@ -1286,7 +1285,7 @@ void GetEnergyCldfb( Word32 *energyLookahead, /*!< o: Q(*sf_energyLookahead) } } - IF( GE_16( numberBands, freqTable[1] ) && hTecEnc != NULL ) + IF( GE_16( numberBands, freqTable[1] ) && hTecEnc != NULL) { Word32 *tempEnergyValuesArry[CLDFB_NO_COL_MAX]; Word16 ScaleX2; diff --git a/lib_com/cng_exc_fx.c b/lib_com/cng_exc_fx.c index c43d08014..c25ed489a 100644 --- a/lib_com/cng_exc_fx.c +++ b/lib_com/cng_exc_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" #include "ivas_rom_com_fx.h" diff --git a/lib_com/codec_tcx_common.c b/lib_com/codec_tcx_common.c index 79f0fa4c5..f956cba9b 100644 --- a/lib_com/codec_tcx_common.c +++ b/lib_com/codec_tcx_common.c @@ -7,8 +7,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_basop_util.h" #include "rom_com.h" diff --git a/lib_com/core_com_config.c b/lib_com/core_com_config.c index e01bb339a..a10ecac19 100644 --- a/lib_com/core_com_config.c +++ b/lib_com/core_com_config.c @@ -41,7 +41,7 @@ #include "prot.h" #include "wmc_auto.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define FSCALE_DENOM_BY_12800_Q15 1311 /*-------------------------------------------------------------------* diff --git a/lib_com/deemph.c b/lib_com/deemph.c index 1c00dde1a..9583a79d4 100644 --- a/lib_com/deemph.c +++ b/lib_com/deemph.c @@ -38,8 +38,7 @@ #include "options.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * deemph() * diff --git a/lib_com/delay_comp.c b/lib_com/delay_comp.c index b0ccb9888..c1e1e869c 100644 --- a/lib_com/delay_comp.c +++ b/lib_com/delay_comp.c @@ -39,8 +39,7 @@ #include "prot.h" #include "ivas_cnst.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------------- * get_delay() diff --git a/lib_com/dlpc_bfi_fx.c b/lib_com/dlpc_bfi_fx.c index 43a8c360c..be4b27696 100644 --- a/lib_com/dlpc_bfi_fx.c +++ b/lib_com/dlpc_bfi_fx.c @@ -6,8 +6,7 @@ /* Header files */ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" void dlpc_bfi( const Word16 L_frame, diff --git a/lib_com/edct_fx.c b/lib_com/edct_fx.c index 721a5bf25..e3cf39fcd 100644 --- a/lib_com/edct_fx.c +++ b/lib_com/edct_fx.c @@ -7,8 +7,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_com/enhancer_fx.c b/lib_com/enhancer_fx.c index 2482bf58b..a3d569edc 100644 --- a/lib_com/enhancer_fx.c +++ b/lib_com/enhancer_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #include "basop_util.h" @@ -101,7 +100,7 @@ void enhancer_fx( i = 0; move16(); /* high dispersion */ } - ELSE if ( LE_32( core_brate, ACELP_8k85 ) ) + ELSE if( LE_32( core_brate, ACELP_8k85 ) ) { i = 1; move16(); /* low dispersion */ @@ -119,7 +118,7 @@ void enhancer_fx( i = 0; move16(); /* high dispersion */ } - ELSE if ( ( EQ_16( coder_type, GENERIC ) || EQ_16( coder_type, TRANSITION ) || EQ_16( coder_type, AUDIO ) || coder_type == INACTIVE ) && LE_32( core_brate, ACELP_9k60 ) ) + ELSE if( ( EQ_16( coder_type, GENERIC ) || EQ_16( coder_type, TRANSITION ) || EQ_16( coder_type, AUDIO ) || coder_type == INACTIVE ) && LE_32( core_brate, ACELP_9k60 ) ) { i = 1; move16(); /* low dispersion */ @@ -380,7 +379,7 @@ void enhancer_ivas_fx( i = 0; move16(); /* high dispersion */ } - ELSE if ( LE_32( core_brate, ACELP_8k85 ) ) + ELSE if( LE_32( core_brate, ACELP_8k85 ) ) { i = 1; move16(); /* low dispersion */ @@ -718,7 +717,7 @@ Word16 E_UTIL_enhancer( gain = add( sub( code_exp, exc2_exp ), 1 ); tmp = mac_r( 268435456l /*0.125f Q31*/, 4096 /*0.125f Q15*/, voice_fac ); /* 0.25=voiced, 0=unvoiced */ - IF( EQ_16( L_frame, L_FRAME16k ) ) + IF ( EQ_16( L_frame, L_FRAME16k ) ) { tmp = mac_r( 322122560l /*0.150f Q31*/, 4915 /*0.150f Q15*/, voice_fac ); /* 0.30=voiced, 0=unvoiced */ } @@ -726,7 +725,7 @@ Word16 E_UTIL_enhancer( /* exc2[0] = exc2[0] + code[0] - tmp*code[1]; */ L_tmp = L_mult( code[0], 16384 ); L_tmp = L_msu0( L_tmp, tmp, code[1] ); - IF( gain ) + IF ( gain ) { #ifdef BASOP_NOGLOB L_tmp = L_shl_sat( L_tmp, gain ); @@ -741,14 +740,14 @@ Word16 E_UTIL_enhancer( #endif move16(); - FOR( i = 1; i < sub( L_subfr, 1 ); i++ ) + FOR( i = 1; i < sub(L_subfr , 1); i++ ) { /* exc2[i] = exc2[i] + code[i] - tmp*(code[i+1]+code[i-1]); */ L_tmp = L_mult( code[i], 16384 ); #ifdef BASOP_NOGLOB L_tmp = L_msu0_sat( L_tmp, tmp, code[i - 1] ); L_tmp = L_msu0_sat( L_tmp, tmp, code[i + 1] ); - IF( gain ) + IF ( gain ) { L_tmp = L_shl_sat( L_tmp, gain ); } @@ -768,7 +767,7 @@ Word16 E_UTIL_enhancer( L_tmp = L_mult( code[i], 16384 ); #ifdef BASOP_NOGLOB L_tmp = L_msu0_sat( L_tmp, tmp, code[i - 1] ); - IF( gain ) + IF ( gain ) { L_tmp = L_shl_sat( L_tmp, gain ); } diff --git a/lib_com/enr_1_az.c b/lib_com/enr_1_az.c index 2f663deaf..3285c515a 100644 --- a/lib_com/enr_1_az.c +++ b/lib_com/enr_1_az.c @@ -39,7 +39,7 @@ #include "cnst.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * enr_1_Az() diff --git a/lib_com/env_adj.c b/lib_com/env_adj.c index 874bf4aa8..39e29e8fa 100644 --- a/lib_com/env_adj.c +++ b/lib_com/env_adj.c @@ -40,8 +40,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* * env_adj() diff --git a/lib_com/env_stab.c b/lib_com/env_stab.c index a05cb79ba..1ccdd1184 100644 --- a/lib_com/env_stab.c +++ b/lib_com/env_stab.c @@ -43,8 +43,7 @@ #include "rom_com.h" #include "wmc_auto.h" #include "stl.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* * Local constants *--------------------------------------------------------------------------*/ diff --git a/lib_com/env_stab_trans.c b/lib_com/env_stab_trans.c index 29473bd66..1d1ccff32 100644 --- a/lib_com/env_stab_trans.c +++ b/lib_com/env_stab_trans.c @@ -41,8 +41,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* * env_stab_transient_detect() * diff --git a/lib_com/est_tilt_fx.c b/lib_com/est_tilt_fx.c index c556536e4..0b9c39b38 100644 --- a/lib_com/est_tilt_fx.c +++ b/lib_com/est_tilt_fx.c @@ -4,8 +4,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" #include "basop_util.h" diff --git a/lib_com/fd_cng_com.c b/lib_com/fd_cng_com.c index 8a03d64ca..bf501e2f7 100644 --- a/lib_com/fd_cng_com.c +++ b/lib_com/fd_cng_com.c @@ -39,7 +39,7 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_com/fd_cng_com_fx.c b/lib_com/fd_cng_com_fx.c index c8387c40a..dd84969a9 100644 --- a/lib_com/fd_cng_com_fx.c +++ b/lib_com/fd_cng_com_fx.c @@ -9,8 +9,7 @@ #include "options.h" #include "rom_basop_util.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #define DELTA_SHIFT 2 diff --git a/lib_com/fft_cldfb_fx.c b/lib_com/fft_cldfb_fx.c index 6271eea26..d60a285f5 100644 --- a/lib_com/fft_cldfb_fx.c +++ b/lib_com/fft_cldfb_fx.c @@ -37,7 +37,7 @@ #include #include "options.h" #include -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "wmc_auto.h" #include "basop_util.h" diff --git a/lib_com/fft_evs.c b/lib_com/fft_evs.c index 3ff15a5c6..56b735804 100644 --- a/lib_com/fft_evs.c +++ b/lib_com/fft_evs.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_basop_util.h" #include "rom_com.h" diff --git a/lib_com/fft_fx.c b/lib_com/fft_fx.c index 4fe9aac60..d7a1aa12f 100644 --- a/lib_com/fft_fx.c +++ b/lib_com/fft_fx.c @@ -45,8 +45,7 @@ #include #include "cnst.h" // #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" //#include "cnst_fx.h" #include "rom_com.h" #include "rom_com_fx.h" diff --git a/lib_com/fft_fx_evs.c b/lib_com/fft_fx_evs.c index fa25f6847..ddcbae49a 100644 --- a/lib_com/fft_fx_evs.c +++ b/lib_com/fft_fx_evs.c @@ -4,8 +4,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #include "stl.h" #include diff --git a/lib_com/fft_rel.c b/lib_com/fft_rel.c index 1cf917f8f..4682fb65e 100644 --- a/lib_com/fft_rel.c +++ b/lib_com/fft_rel.c @@ -39,8 +39,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_com/fft_rel_fx.c b/lib_com/fft_rel_fx.c index 846099592..42cf4deff 100644 --- a/lib_com/fft_rel_fx.c +++ b/lib_com/fft_rel_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #include "stl.h" diff --git a/lib_com/fill_spectrum.c b/lib_com/fill_spectrum.c index 7571b03ba..b75a67017 100644 --- a/lib_com/fill_spectrum.c +++ b/lib_com/fill_spectrum.c @@ -40,8 +40,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/findpulse.c b/lib_com/findpulse.c index c04b13a4d..e7104810c 100644 --- a/lib_com/findpulse.c +++ b/lib_com/findpulse.c @@ -40,8 +40,7 @@ #include "prot.h" #include "cnst.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*----------------------------------------------------------------------------------* * findpulse() diff --git a/lib_com/fine_gain_bits_fx.c b/lib_com/fine_gain_bits_fx.c index e2f1dd8c7..339e11096 100644 --- a/lib_com/fine_gain_bits_fx.c +++ b/lib_com/fine_gain_bits_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/float_to_fix_ops.c b/lib_com/float_to_fix_ops.c index 5547bb30c..5ba9b55a6 100644 --- a/lib_com/float_to_fix_ops.c +++ b/lib_com/float_to_fix_ops.c @@ -4,7 +4,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" Word32 floatToFixed( float f, Word16 Q ) { diff --git a/lib_com/frame_ener.c b/lib_com/frame_ener.c index 4fa6e41ba..5af9eed54 100644 --- a/lib_com/frame_ener.c +++ b/lib_com/frame_ener.c @@ -40,8 +40,7 @@ #include "cnst.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*----------------------------------------------------------------------------------* * fer_energy() * diff --git a/lib_com/gain_inov_fx.c b/lib_com/gain_inov_fx.c index 7f767c028..e2f65421a 100644 --- a/lib_com/gain_inov_fx.c +++ b/lib_com/gain_inov_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/get_gain.c b/lib_com/get_gain.c index 43d39ae31..5f9c8f56a 100644 --- a/lib_com/get_gain.c +++ b/lib_com/get_gain.c @@ -38,8 +38,7 @@ #include "options.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*----------------------------------------------------------------------------------* * get_gain() diff --git a/lib_com/gs_bitallocation_fx.c b/lib_com/gs_bitallocation_fx.c index 112d94e51..004cdb3d3 100644 --- a/lib_com/gs_bitallocation_fx.c +++ b/lib_com/gs_bitallocation_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "assert.h" /* Debug prototypes */ #include "stl.h" diff --git a/lib_com/gs_bitallocation_ivas_fx.c b/lib_com/gs_bitallocation_ivas_fx.c index 0e7426120..510506147 100644 --- a/lib_com/gs_bitallocation_ivas_fx.c +++ b/lib_com/gs_bitallocation_ivas_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ #include "prot.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_prot.h" /* Function prototypes */ #include "assert.h" /* Debug prototypes */ #include "stl.h" diff --git a/lib_com/gs_gains_fx.c b/lib_com/gs_gains_fx.c index 048099e25..4de024088 100644 --- a/lib_com/gs_gains_fx.c +++ b/lib_com/gs_gains_fx.c @@ -37,8 +37,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stl.h" /*-------------------------------------------------------------------* diff --git a/lib_com/gs_inact_switching_fx.c b/lib_com/gs_inact_switching_fx.c index 446f9849b..27b1efb08 100644 --- a/lib_com/gs_inact_switching_fx.c +++ b/lib_com/gs_inact_switching_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" /*-------------------------------------------------------------------* diff --git a/lib_com/gs_noisefill_fx.c b/lib_com/gs_noisefill_fx.c index 3e5bfab96..2dea2adef 100644 --- a/lib_com/gs_noisefill_fx.c +++ b/lib_com/gs_noisefill_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * gs_noisf() diff --git a/lib_com/gs_preech.c b/lib_com/gs_preech.c index 8765dc7e0..1c3c3ccfe 100644 --- a/lib_com/gs_preech.c +++ b/lib_com/gs_preech.c @@ -41,8 +41,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/guided_plc_util_fx.c b/lib_com/guided_plc_util_fx.c index a95e9a5c4..2610a7693 100644 --- a/lib_com/guided_plc_util_fx.c +++ b/lib_com/guided_plc_util_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_com/hp50.c b/lib_com/hp50.c index d6aaebea2..dbabd5632 100644 --- a/lib_com/hp50.c +++ b/lib_com/hp50.c @@ -39,8 +39,7 @@ #include "options.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /* * hp20 diff --git a/lib_com/hq2_bit_alloc_fx.c b/lib_com/hq2_bit_alloc_fx.c index c43b11ae5..486de81de 100644 --- a/lib_com/hq2_bit_alloc_fx.c +++ b/lib_com/hq2_bit_alloc_fx.c @@ -32,7 +32,7 @@ #include #include "options.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #define MIN_BITS_FIX 0 /* QRk=18 */ diff --git a/lib_com/hq2_core_com_fx.c b/lib_com/hq2_core_com_fx.c index b00a25aaa..206a37bc8 100644 --- a/lib_com/hq2_core_com_fx.c +++ b/lib_com/hq2_core_com_fx.c @@ -35,7 +35,7 @@ #include "options.h" #include "cnst.h" /* Audio core constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* diff --git a/lib_com/hq2_noise_inject_fx.c b/lib_com/hq2_noise_inject_fx.c index c47bb5cfd..c7326bd8e 100644 --- a/lib_com/hq2_noise_inject_fx.c +++ b/lib_com/hq2_noise_inject_fx.c @@ -32,7 +32,7 @@ #include #include "options.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "oper_32b.h" #include "move.h" #include "count.h" diff --git a/lib_com/hq_bit_allocation_fx.c b/lib_com/hq_bit_allocation_fx.c index 8b476fb07..79d6bb1a4 100644 --- a/lib_com/hq_bit_allocation_fx.c +++ b/lib_com/hq_bit_allocation_fx.c @@ -4,8 +4,7 @@ #include "options.h" /* Compilation switches */ #include "stl.h" /* required for wmc_tool */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "cnst.h" /* Common constants */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_com/hq_conf.c b/lib_com/hq_conf.c index 4dfe55d80..d96448b02 100644 --- a/lib_com/hq_conf.c +++ b/lib_com/hq_conf.c @@ -40,8 +40,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* * hq_configure() diff --git a/lib_com/hq_conf_fx.c b/lib_com/hq_conf_fx.c index bed185ae1..21f70e1a0 100644 --- a/lib_com/hq_conf_fx.c +++ b/lib_com/hq_conf_fx.c @@ -6,8 +6,7 @@ #include "options.h" #include "cnst.h" /* Audio core constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/hq_tools_fx.c b/lib_com/hq_tools_fx.c index ae3468c9a..ddc12e4eb 100644 --- a/lib_com/hq_tools_fx.c +++ b/lib_com/hq_tools_fx.c @@ -38,7 +38,7 @@ #include "options.h" /* Compilation switches */ #include "rom_com.h" /* Static table prototypes FIP version */ #include "stl.h" /* required for wmc_tool */ -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/hvq_pvq_bitalloc_fx.c b/lib_com/hvq_pvq_bitalloc_fx.c index 487aaf2ea..2066ea993 100644 --- a/lib_com/hvq_pvq_bitalloc_fx.c +++ b/lib_com/hvq_pvq_bitalloc_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "cnst.h" /* Common constants */ /*--------------------------------------------------------------------------*/ diff --git a/lib_com/ifft_rel.c b/lib_com/ifft_rel.c index c1e868716..43aa3f122 100644 --- a/lib_com/ifft_rel.c +++ b/lib_com/ifft_rel.c @@ -39,8 +39,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------* * Local constants *-----------------------------------------------------------------*/ diff --git a/lib_com/igf_base.c b/lib_com/igf_base.c index 658707947..637dd0270 100644 --- a/lib_com/igf_base.c +++ b/lib_com/igf_base.c @@ -41,7 +41,7 @@ #include "rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*---------------------------------------------------------------------* diff --git a/lib_com/igf_base_fx.c b/lib_com/igf_base_fx.c index ac1a1bcde..022720707 100644 --- a/lib_com/igf_base_fx.c +++ b/lib_com/igf_base_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include "stl.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "basop_util.h" diff --git a/lib_com/index_pvq_opt_fx.c b/lib_com/index_pvq_opt_fx.c index 2f75d8ac8..3ca87f638 100644 --- a/lib_com/index_pvq_opt_fx.c +++ b/lib_com/index_pvq_opt_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #define N_OPT_FX 5 /* complexity setting, direct functional calculation limit & low dim recursion limit */ diff --git a/lib_com/int_lsp.c b/lib_com/int_lsp.c index a79a6bba5..b6528030e 100644 --- a/lib_com/int_lsp.c +++ b/lib_com/int_lsp.c @@ -40,8 +40,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* * int_lsp() diff --git a/lib_com/interleave_spectrum.c b/lib_com/interleave_spectrum.c index f5e6acf31..9fdba4c77 100644 --- a/lib_com/interleave_spectrum.c +++ b/lib_com/interleave_spectrum.c @@ -40,8 +40,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/interpol.c b/lib_com/interpol.c index 2dfab173b..f4e42de2c 100644 --- a/lib_com/interpol.c +++ b/lib_com/interpol.c @@ -39,8 +39,7 @@ #include "prot.h" #include "wmc_auto.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" /*-------------------------------------------------------------------* diff --git a/lib_com/isf_dec_amr_wb_fx.c b/lib_com/isf_dec_amr_wb_fx.c index 4327339b8..e0b891273 100644 --- a/lib_com/isf_dec_amr_wb_fx.c +++ b/lib_com/isf_dec_amr_wb_fx.c @@ -34,7 +34,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef _MSC_VER void E_LPC_isf_isp_conversion( const Word16 isf[], Word16 isp[], const Word16 m ); diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index 0be1c40ff..83269c34b 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -36,7 +36,7 @@ #include "ivas_prot.h" #include "wmc_auto.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------------------------* * Local constants diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c index 1762c9f68..cce2880bd 100644 --- a/lib_com/ivas_dirac_com.c +++ b/lib_com/ivas_dirac_com.c @@ -40,8 +40,7 @@ #include "prot.h" #include "cnst.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_com/ivas_fb_mixer.c b/lib_com/ivas_fb_mixer.c index 0b890d7a8..59b62491c 100644 --- a/lib_com/ivas_fb_mixer.c +++ b/lib_com/ivas_fb_mixer.c @@ -39,8 +39,7 @@ #include #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" #endif diff --git a/lib_com/ivas_ism_com.c b/lib_com/ivas_ism_com.c index 6955e83e3..6a287d2da 100644 --- a/lib_com/ivas_ism_com.c +++ b/lib_com/ivas_ism_com.c @@ -41,8 +41,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED diff --git a/lib_com/ivas_masa_com.c b/lib_com/ivas_masa_com.c index e1aa643d6..e0005e4b8 100644 --- a/lib_com/ivas_masa_com.c +++ b/lib_com/ivas_masa_com.c @@ -41,7 +41,7 @@ #include "ivas_stat_dec.h" #include "wmc_auto.h" #include "ivas_rom_com_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" diff --git a/lib_com/ivas_mc_param_com.c b/lib_com/ivas_mc_param_com.c index 5297d332a..1b19b9037 100644 --- a/lib_com/ivas_mc_param_com.c +++ b/lib_com/ivas_mc_param_com.c @@ -36,7 +36,7 @@ #include "options.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_stat_com.h" #include "ivas_rom_com.h" diff --git a/lib_com/ivas_mct_com.c b/lib_com/ivas_mct_com.c index f68f576f9..dd7910748 100644 --- a/lib_com/ivas_mct_com.c +++ b/lib_com/ivas_mct_com.c @@ -35,7 +35,6 @@ #include "ivas_cnst.h" #include "ivas_prot.h" #include "prot.h" -#include "prot_fx1.h" #include "wmc_auto.h" #include diff --git a/lib_com/ivas_mdct_core_com.c b/lib_com/ivas_mdct_core_com.c index a715790b8..7e7a00cfc 100644 --- a/lib_com/ivas_mdct_core_com.c +++ b/lib_com/ivas_mdct_core_com.c @@ -37,8 +37,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_com/ivas_mdct_imdct_fx.c b/lib_com/ivas_mdct_imdct_fx.c index e5bdfca19..c25f4fab4 100644 --- a/lib_com/ivas_mdct_imdct_fx.c +++ b/lib_com/ivas_mdct_imdct_fx.c @@ -32,7 +32,7 @@ #include #include "options.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "ivas_rom_com_fx.h" #ifdef DEBUGGING diff --git a/lib_com/ivas_mdft_imdft.c b/lib_com/ivas_mdft_imdft.c index 2a785bd34..564285b09 100644 --- a/lib_com/ivas_mdft_imdft.c +++ b/lib_com/ivas_mdft_imdft.c @@ -41,8 +41,7 @@ #ifdef IVAS_FLOAT_FIXED #include #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_com/ivas_omasa_com.c b/lib_com/ivas_omasa_com.c index d7f25bfbb..5dbe03866 100644 --- a/lib_com/ivas_omasa_com.c +++ b/lib_com/ivas_omasa_com.c @@ -36,11 +36,10 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx1.h" #include "ivas_rom_com.h" #include "rom_com.h" #include -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------- * Local constants diff --git a/lib_com/ivas_pca_tools.c b/lib_com/ivas_pca_tools.c index 2fa1f11f0..f2c6d8d0e 100644 --- a/lib_com/ivas_pca_tools.c +++ b/lib_com/ivas_pca_tools.c @@ -40,7 +40,7 @@ #include "wmc_auto.h" #include "prot.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" +#include "prot_fx.h" #endif /*---------------------------------------------------------------------* diff --git a/lib_com/ivas_qmetadata_com.c b/lib_com/ivas_qmetadata_com.c index dcd68f04b..3bcec831e 100644 --- a/lib_com/ivas_qmetadata_com.c +++ b/lib_com/ivas_qmetadata_com.c @@ -38,11 +38,10 @@ #include "ivas_rom_com.h" #include "ivas_prot.h" #include "prot.h" -#include "prot_fx1.h" #include "cnst.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #ifdef IVAS_FLOAT_FIXED diff --git a/lib_com/ivas_sns_com_fx.c b/lib_com/ivas_sns_com_fx.c index 9e83cd240..ee29a001d 100644 --- a/lib_com/ivas_sns_com_fx.c +++ b/lib_com/ivas_sns_com_fx.c @@ -34,8 +34,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "rom_com.h" #include "ivas_rom_com.h" diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c index 36938507a..485424125 100644 --- a/lib_com/ivas_spar_com.c +++ b/lib_com/ivas_spar_com.c @@ -36,8 +36,7 @@ #include "basop_util.h" #include "ivas_stat_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "rom_com.h" #include "ivas_rom_com.h" diff --git a/lib_com/ivas_spar_com_quant_util.c b/lib_com/ivas_spar_com_quant_util.c index 667d21b7f..78541fd9d 100644 --- a/lib_com/ivas_spar_com_quant_util.c +++ b/lib_com/ivas_spar_com_quant_util.c @@ -34,13 +34,11 @@ #include "options.h" #include "math.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include #include "wmc_auto.h" -#include "prot_fx1.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" #endif diff --git a/lib_com/ivas_stereo_ica_com_fx.c b/lib_com/ivas_stereo_ica_com_fx.c index 6ffce03e4..a4881b800 100644 --- a/lib_com/ivas_stereo_ica_com_fx.c +++ b/lib_com/ivas_stereo_ica_com_fx.c @@ -37,8 +37,7 @@ #include "cnst.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "wmc_auto.h" #include "rom_com.h" diff --git a/lib_com/ivas_stereo_mdct_bands_com.c b/lib_com/ivas_stereo_mdct_bands_com.c index 3c06612c4..7fa5c100d 100644 --- a/lib_com/ivas_stereo_mdct_bands_com.c +++ b/lib_com/ivas_stereo_mdct_bands_com.c @@ -40,8 +40,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_com/ivas_stereo_mdct_stereo_com.c b/lib_com/ivas_stereo_mdct_stereo_com.c index 28e22b28c..a17ba876f 100644 --- a/lib_com/ivas_stereo_mdct_stereo_com.c +++ b/lib_com/ivas_stereo_mdct_stereo_com.c @@ -37,8 +37,7 @@ #include "wmc_auto.h" #include #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc.c index 737830827..a03100b25 100644 --- a/lib_com/ivas_stereo_td_bit_alloc.c +++ b/lib_com/ivas_stereo_td_bit_alloc.c @@ -41,8 +41,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #ifdef IVAS_FLOAT_FIXED diff --git a/lib_com/ivas_tools.c b/lib_com/ivas_tools.c index f579e64fc..0fd41f02f 100644 --- a/lib_com/ivas_tools.c +++ b/lib_com/ivas_tools.c @@ -35,12 +35,10 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx1.h" #include "ivas_prot.h" #include "wmc_auto.h" #include "ivas_rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/ivas_transient_det.c b/lib_com/ivas_transient_det.c index a8841845a..de238aa5b 100644 --- a/lib_com/ivas_transient_det.c +++ b/lib_com/ivas_transient_det.c @@ -39,7 +39,7 @@ #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif #include "ivas_stat_com.h" diff --git a/lib_com/lag_wind.c b/lib_com/lag_wind.c index e7fe28882..5e289b34f 100644 --- a/lib_com/lag_wind.c +++ b/lib_com/lag_wind.c @@ -38,8 +38,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_com/lerp.c b/lib_com/lerp.c index eea745b81..80e789c4c 100644 --- a/lib_com/lerp.c +++ b/lib_com/lerp.c @@ -37,8 +37,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" diff --git a/lib_com/limit_t0_fx.c b/lib_com/limit_t0_fx.c index 97aa4fd8f..07557fe72 100644 --- a/lib_com/limit_t0_fx.c +++ b/lib_com/limit_t0_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" diff --git a/lib_com/logqnorm_fx.c b/lib_com/logqnorm_fx.c index 902a120b4..a4196a1b3 100644 --- a/lib_com/logqnorm_fx.c +++ b/lib_com/logqnorm_fx.c @@ -32,7 +32,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #include "cnst.h" /* Common constants */ diff --git a/lib_com/longarith.c b/lib_com/longarith.c index 2617034d9..65070f093 100644 --- a/lib_com/longarith.c +++ b/lib_com/longarith.c @@ -41,7 +41,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_com/low_rate_band_att_fx.c b/lib_com/low_rate_band_att_fx.c index a71311f38..f593089b1 100644 --- a/lib_com/low_rate_band_att_fx.c +++ b/lib_com/low_rate_band_att_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/lpc_tools.c b/lib_com/lpc_tools.c index 382ca06d8..ff6dfea48 100644 --- a/lib_com/lpc_tools.c +++ b/lib_com/lpc_tools.c @@ -42,7 +42,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------* * Local constants diff --git a/lib_com/lpc_tools_fx.c b/lib_com/lpc_tools_fx.c index 83b59079a..f723a2725 100644 --- a/lib_com/lpc_tools_fx.c +++ b/lib_com/lpc_tools_fx.c @@ -38,7 +38,7 @@ #include #include "options.h" /* Compilation switches */ #include "ivas_cnst.h" /* Common constants */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" #include "basop_util.h" diff --git a/lib_com/lsf_dec_bfi_fx.c b/lib_com/lsf_dec_bfi_fx.c index 4c10059d0..14b842115 100644 --- a/lib_com/lsf_dec_bfi_fx.c +++ b/lib_com/lsf_dec_bfi_fx.c @@ -8,8 +8,7 @@ #include "basop_util.h" #include "rom_com.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* diff --git a/lib_com/lsf_msvq_ma_fx.c b/lib_com/lsf_msvq_ma_fx.c index a423cb951..409566ddc 100644 --- a/lib_com/lsf_msvq_ma_fx.c +++ b/lib_com/lsf_msvq_ma_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" #include "options.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifndef swap diff --git a/lib_com/lsf_tools.c b/lib_com/lsf_tools.c index 0b9223922..ddce7c199 100644 --- a/lib_com/lsf_tools.c +++ b/lib_com/lsf_tools.c @@ -44,8 +44,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*-------------------------------------------------------------------* diff --git a/lib_com/lsf_tools_fx.c b/lib_com/lsf_tools_fx.c index c0f7bd613..c3a5fc40e 100644 --- a/lib_com/lsf_tools_fx.c +++ b/lib_com/lsf_tools_fx.c @@ -36,7 +36,7 @@ #include "basop_util.h" #include "rom_com.h" #include "ivas_cnst.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_error.h" diff --git a/lib_com/lsp_conv_poly_fx.c b/lib_com/lsp_conv_poly_fx.c index 0cda281ea..70b919002 100644 --- a/lib_com/lsp_conv_poly_fx.c +++ b/lib_com/lsp_conv_poly_fx.c @@ -10,7 +10,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/modif_fs.c b/lib_com/modif_fs.c index 4bccd568b..67593def4 100644 --- a/lib_com/modif_fs.c +++ b/lib_com/modif_fs.c @@ -41,7 +41,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * modify_Fs() diff --git a/lib_com/modif_fs_fx.c b/lib_com/modif_fs_fx.c index 1845bcde2..c0c42d319 100644 --- a/lib_com/modif_fs_fx.c +++ b/lib_com/modif_fs_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /* Static table prototypes */ #include #include "rom_enc.h" /* prototypes */ diff --git a/lib_com/mslvq_com.c b/lib_com/mslvq_com.c index 00b77cebf..d7d4c427b 100644 --- a/lib_com/mslvq_com.c +++ b/lib_com/mslvq_com.c @@ -41,7 +41,7 @@ #include "prot.h" #include "wmc_auto.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" /*-----------------------------------------------------------------* diff --git a/lib_com/mslvq_com_fx.c b/lib_com/mslvq_com_fx.c index b2e0e0b23..cce159738 100644 --- a/lib_com/mslvq_com_fx.c +++ b/lib_com/mslvq_com_fx.c @@ -32,7 +32,7 @@ #include "options.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "stl.h" #include "rom_com.h" diff --git a/lib_com/nelp_fx.c b/lib_com/nelp_fx.c index f0420e3db..690db5865 100644 --- a/lib_com/nelp_fx.c +++ b/lib_com/nelp_fx.c @@ -33,7 +33,7 @@ #include #include "options.h" #include "rom_com.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*===================================================================*/ diff --git a/lib_com/parameter_bitmaping.c b/lib_com/parameter_bitmaping.c index 5b6374ee0..2be70b058 100644 --- a/lib_com/parameter_bitmaping.c +++ b/lib_com/parameter_bitmaping.c @@ -39,7 +39,7 @@ #include "options.h" #include "stat_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" diff --git a/lib_com/parameter_bitmaping_fx.c b/lib_com/parameter_bitmaping_fx.c index ee5dd7d73..e66d7b603 100644 --- a/lib_com/parameter_bitmaping_fx.c +++ b/lib_com/parameter_bitmaping_fx.c @@ -2,7 +2,7 @@ #include #include "options.h" #include "stat_com.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" /** Get nBits long value from bitstream into *pStream. */ diff --git a/lib_com/phase_dispersion_fx.c b/lib_com/phase_dispersion_fx.c index 74ae7708c..b7ca7b739 100644 --- a/lib_com/phase_dispersion_fx.c +++ b/lib_com/phase_dispersion_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* EV-VBR compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/ppp_fx.c b/lib_com/ppp_fx.c index 673ffd469..390c0a47c 100644 --- a/lib_com/ppp_fx.c +++ b/lib_com/ppp_fx.c @@ -33,7 +33,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*===================================================================*/ /* FUNCTION : Interpol_delay_fx () */ diff --git a/lib_com/pred_lt4_fx.c b/lib_com/pred_lt4_fx.c index a6672c2b2..6cc06f28e 100644 --- a/lib_com/pred_lt4_fx.c +++ b/lib_com/pred_lt4_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_com/preemph_fx.c b/lib_com/preemph_fx.c index e610e9fd7..63de35dca 100644 --- a/lib_com/preemph_fx.c +++ b/lib_com/preemph_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------* * preemph_copy_fx() * diff --git a/lib_com/prot.h b/lib_com/prot.h index 96bdd1952..1dbf548a6 100644 --- a/lib_com/prot.h +++ b/lib_com/prot.h @@ -166,18 +166,6 @@ float sum2_f( const int16_t lvec /* i : length of input vector */ ); -#ifdef IVAS_FLOAT_FIXED -Word32 sum2_f_32_fx( - const Word32 *vec, /* i : input vector */ - const int16_t lvec, /* i : length of input vector */ - Word16 gb ); - -Word32 sum2_32_fx( - const Word32 *vec, /* i : input vector */ - const Word16 lvec, /* i : length of input vector */ - Word16 *e ); -#endif - void set_c( int8_t y[], /* i/o: Vector to set */ const int8_t a, /* i : Value to set the vector to */ @@ -276,14 +264,12 @@ int16_t minimum( float *min_val /* o : minimum value in the input vector */ ); -#ifndef IVAS_FLOAT_FIXED /*! r: index of the minimum value in the input vector */ int16_t minimum_s( const int16_t *vec, /* i : Input vector */ const int16_t lvec, /* i : Vector length */ int16_t *min_val /* o : minimum value in the input vector */ ); -#endif /*! r: return index with max energy value in vector */ int16_t emaximum( @@ -336,15 +322,6 @@ void v_sub( const int16_t N /* i : Vector length */ ); -#ifdef IVAS_FLOAT_FIXED -void v_mult_fixed( - const Word32 x1[], /* i : Input vector 1 */ - const Word32 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ - const Word16 N /* i : Vector length */ -); -#endif - void v_mult( const float x1[], /* i : Input vector 1 */ const float x2[], /* i : Input vector 2 */ @@ -365,20 +342,6 @@ void v_sub_s( int16_t y[], /* o : Output vector that contains vector 1 - vector 2 */ const int16_t N /* i : Vector length */ ); -#ifdef IVAS_FLOAT_FIXED -void v_sub_s16_fx( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ - const Word16 N /* i : Vector length */ -); -void v_sub32_fx( - const Word32 x1[], /* i : Input vector 1 */ - const Word32 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */ - const Word16 N /* i : Vector length */ -); -#endif // IVAS_FLOAT_FIXED /*! r: index of the winning codeword */ int16_t squant( @@ -505,22 +468,6 @@ void delay_signal_float( const int16_t delay /* i : delay in samples */ ); -#ifdef IVAS_FLOAT_FIXED -void delay_signal_fx( - Word32 x[], /* i/o: signal to be delayed */ - const int16_t len, /* i : length of the input signal */ - Word32 mem[], /* i/o: synchronization memory */ - const int16_t delay /* i : delay in samples */ -); -void delay_signal_q_adj_fx( - Word32 x[], /* i/o: signal to be delayed */ - const int16_t len, /* i : length of the input signal */ - Word32 mem[], /* i/o: synchronization memory */ - const int16_t delay, /* i : delay in samples */ - const Word16 q_x, - const Word16 q_mem ); -#endif - ivas_error push_indice( BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */ int16_t id, /* i : ID of the indice */ @@ -1754,7 +1701,6 @@ void diff_envelope_coding( int16_t *difidx /* o : differential code */ ); -#ifndef IVAS_FLOAT_FIXED /*! r: Number of bits */ int16_t decode_envelope_indices( Decoder_State *st, /* i/o: decoder state structure */ @@ -1765,9 +1711,7 @@ int16_t decode_envelope_indices( const int16_t flag_HQ2, /* i : indicator of HQ2 core */ const int16_t is_transient /* i : transient flag */ ); -#endif -#ifndef IVAS_FLOAT_FIXED /*! r: Number of bits */ void dequantize_norms( Decoder_State *st, /* i/o: decoder state structure */ @@ -1777,7 +1721,6 @@ void dequantize_norms( int16_t *ynrm, /* o : Decoded norm indices */ int16_t *normqlg2 /* o : Log2 of decoded norms */ ); -#endif void hq_configure( const int16_t length, /* i : Frame length */ @@ -1824,7 +1767,6 @@ int16_t hq_classifier_enc( int16_t *hqswb_clas /* o : HQ class */ ); -#ifndef IVAS_FLOAT_FIXED /*! r: Consumed bits */ int16_t hq_classifier_dec( Decoder_State *st, /* i/o: decoder state structure */ @@ -1833,7 +1775,6 @@ int16_t hq_classifier_dec( int16_t *is_transient, /* o : Transient flag */ int16_t *hqswb_clas /* o : HQ class */ ); -#endif void hq_bit_allocation( const int32_t core_brate, /* i : Core bitrate */ @@ -2361,7 +2302,7 @@ void pre_proc( float imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer */ int16_t *hq_core_type /* o : HQ core type */ ); -#endif + /*! r: HQ_CORE/TCX_20_CORE decision */ int16_t mdct_classifier( @@ -2676,19 +2617,7 @@ void swb_tbe_enc( float *White_exc16k, /* o : shaped white excitation for the FB TBE */ const float pitch_buf[] /* i : pitch for each subframe */ ); -#ifdef IVAS_FLOAT_FIXED -void ivas_swb_tbe_dec_fx( - Decoder_State *st, /* i/o: decoder state structure */ - STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */ - const Word32 *bwe_exc_extended_fx, /* i : bandwidth extended excitation */ - Word16 Q_exc, - const Word16 voice_factors_fx[], /* i : voicing factors */ - const Word32 old_syn_12k8_16k_fx[], /* i : low band synthesis */ - Word16 *White_exc16k_fx, /* o : shaped white excitation for the FB TBE */ - Word32 *synth_fx, /* o : SHB synthesis/final synthesis */ - Word16 *pitch_buf_fx, - Word16 *Q_white_exc ); -#endif + void swb_tbe_dec( Decoder_State *st, /* i/o: decoder state structure */ STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */ @@ -2937,18 +2866,6 @@ void swb_bwe_dec_flt( const int16_t output_frame /* i : frame length */ ); -#ifdef IVAS_FLOAT_FIXED -Word16 swb_bwe_dec_fx32( - Decoder_State *st, /* i/o: decoder state structure */ - Word32 output[], /* i : synthesis @internal Fs Q11 */ - Word32 *synth, /* i : ACELP core synthesis/final synthesis Q11 */ - Word32 *hb_synth, /* o : SHB synthesis/final synthesis */ - Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ - Word16 output_frame /* i : frame length */ -); -#endif // IVAS_FLOAT_FIXED - - void hr_bwe_dec_init_flt( HR_BWE_DEC_HANDLE hBWE_FD_HR /* i/o: HR BWE data handle */ ); @@ -4201,21 +4118,12 @@ void AVQ_encmux( int16_t trgtSvPos /* i : target SV for AVQ bit savings */ ); -#ifndef IVAS_FLOAT_FIXED void ordr_esti( const int16_t k, /* i : sub-vector index */ int16_t *Mpos, /* i/o: dominant sub-vector position from ACV */ int16_t svOrder[], /* i/o: AVQ sub-vector order */ const int16_t Nsv /* i : total sub-vectors in a sub-frames */ ); -#else -void ordr_esti( - const Word16 k, /* i : sub-vector index */ - Word16 *Mpos, /* i/o: dominant sub-vector position from ACV */ - Word16 svOrder[], /* i/o: AVQ sub-vector order */ - const Word16 Nsv /* i : total sub-vectors in a sub-frames */ -); -#endif void re8_cod( int16_t x[], /* i : point in RE8 (8-dimensional integer vector) */ @@ -4648,7 +4556,6 @@ void signaling_enc_rf( Encoder_State *st /* i/o: encoder state structure */ ); -#ifndef IVAS_FLOAT_FIXED ivas_error acelp_core_dec( Decoder_State *st, /* i/o: Decoder state structure */ float output[], /* o : synthesis @internal Fs */ @@ -4672,33 +4579,6 @@ ivas_error acelp_core_dec( STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ const int16_t read_sid_info /* i : read SID info flag */ ); -#endif - -#ifdef IVAS_FLOAT_FIXED -ivas_error acelp_core_dec_ivas_fx( - Decoder_State *st, /* i/o: decoder state structure */ - Word16 output[], /* o : synthesis @internal Fs */ - Word16 synth[], /* o : synthesis */ - Word16 save_hb_synth[], /* o : HB synthesis */ - Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation */ - Word16 *voice_factors, /* o : voicing factors */ - Word16 old_syn_12k8_16k[], /* o : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE */ - const int16_t sharpFlag, /* i : formant sharpening flag */ - Word16 pitch_buf[NB_SUBFR16k], /* o : floating pitch for each subframe */ - int16_t *unbits, /* o : number of unused bits */ - int16_t *sid_bw, /* o : 0-NB/WB, 1-SWB SID */ - STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */ - const Word16 tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */ - const Word16 tdm_lsfQ_PCh[M], /* i : Q LSFs for primary channel */ - const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ - const int16_t last_element_mode, /* i : last element mode */ - const int32_t last_element_brate, /* i : last element bitrate */ - const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ - const int16_t nchan_out, /* i : number of output channels */ - STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ - const int16_t read_sid_info /* i : read SID info flag */ -); -#endif void bass_psfilter_init( BPF_DEC_HANDLE hBPF /* o : BPF data handle */ @@ -5314,12 +5194,6 @@ ivas_error init_decoder( const MC_MODE mc_mode /* i : MC mode */ ); -#ifdef IVAS_FLOAT_FIXED -void destroy_cldfb_decoder_ivas_fx( - Decoder_State *st /* o : Decoder static variables structure */ -); -#endif // IVAS_FLOAT_FIXED - void destroy_cldfb_decoder_flt( Decoder_State *st /* o : Decoder static variables structure */ ); @@ -5397,17 +5271,6 @@ void wtda( const int16_t L /* i : length */ ); -#ifdef IVAS_FLOAT_FIXED -void wtda_fx32( - const Word32 *new_audio, /* i : input audio Q11 */ - Word32 *wtda_audio, /* o : windowed audio Q11 */ - Word32 *old_wtda, /* i/o: windowed audio from previous frame Q11 */ - const Word16 left_mode, /* i : window overlap of previous frame (0: full, 2: none, or 3: half) */ - const Word16 right_mode, /* i : window overlap of current frame (0: full, 2: none, or 3: half) */ - const Word16 L /* i : length */ -); -#endif - void wtda_ext( const float *new_audio, /* i : input audio */ float *wtda_audio, /* o : windowed audio */ @@ -5465,7 +5328,6 @@ void logqnorm( const int16_t N, /* i : sub-vector size */ const float *thren ); -#ifndef IVAS_FLOAT_FIXED void huff_dec( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : Number of codewords to decode */ @@ -5476,7 +5338,6 @@ void huff_dec( const int16_t *huff_tab, /* i : Huffman table order by codeword lengths */ int16_t *index /* o : Decoded index */ ); -#endif void calc_norm( const float *x, /* i : Input vector. */ @@ -5617,38 +5478,30 @@ void hq_hr_dec( ); -#ifndef IVAS_FLOAT_FIXED void hdecnrm_context( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : number of norms */ int16_t *index, /* o : indices of quantized norms */ int16_t *n_length /* o : decoded stream length */ ); -#endif -#ifndef IVAS_FLOAT_FIXED void hdecnrm_tran( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : number of norms */ int16_t *index /* o : indices of quantized norms */ ); -#endif -#ifndef IVAS_FLOAT_FIXED void hdecnrm_resize( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : number of SFMs */ int16_t *index /* o : norm quantization index vector */ ); -#endif -#ifndef IVAS_FLOAT_FIXED void hdecnrm( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : number of norms */ int16_t *index /* o : indices of quantized norms */ ); -#endif /*! r: index of last band */ int16_t find_last_band( @@ -6088,18 +5941,6 @@ ivas_error core_switching_post_dec( const int16_t nchan_out, /* i : number of output channels */ const int16_t last_element_mode /* i : element mode of previous frame */ ); -#ifdef IVAS_FLOAT_FIXED -ivas_error core_switching_pre_dec_ivas_fx( - Decoder_State *st, /* i/o: decoder state structure */ - const Word16 output_frame, /* i : frame length */ - const Word32 last_core_brate_st0, /* i : channel 0 last core bitrate */ - const Word16 nchan_out, /* i : number of output channels */ - const Word16 last_element_mode, /* i : last_element_mode */ - const Word32 last_element_brate, /* i : last element bitrate */ - Word16 Q_old_synthFB, - Word16 *Q_olapBufferSynth, - Word16 *Q_olapBufferSynth2 ); -#endif // IVAS_FLOAT_FIXED ivas_error core_switching_pre_dec( Decoder_State *st, /* i/o: decoder state structure */ @@ -6937,14 +6778,6 @@ void hp20_flt( Float32 mem[], const Word32 Fs ); -#ifdef IVAS_FLOAT_FIXED -void hp20_fix32( - Word32 signal_fx[], - const Word16 lg, - Word32 mem_fx[], - const Word32 Fs ); -#endif // IVAS_FLOAT_FIXED - void ham_cos_window_flt( float *fh, const int16_t n1, @@ -6984,21 +6817,6 @@ void enc_acelp_tcx_main( const int16_t vad_hover_flag /* i : VAD hangover flag */ ); -#ifdef IVAS_FLOAT_FIXED -void getTCXMode_ivas_fx( - Decoder_State *st, /* i/o: decoder memory state */ - Decoder_State *st0, /* i : bitstream */ - const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0)*/ -); - -void getTCXWindowing_ivas_fx( - const Word16 core, /* i : current frame mode */ - const Word16 last_core, /* i : last frame mode */ - const Word16 element_mode, /* i : element mode */ - TCX_CONFIG_HANDLE hTcxCfg, /* i/o: TCX configuration handle */ - Decoder_State *st0 /* i : bitstream */ -); -#else void getTCXMode_ivas( Decoder_State *st, /* i/o: decoder memory state */ Decoder_State *st0, /* i : bitstream */ @@ -7012,7 +6830,7 @@ void getTCXWindowing_ivas( TCX_CONFIG_HANDLE hTcxCfg, /* i/o: TCX configuration handle */ Decoder_State *st0 /* i : bitstream */ ); -#endif +//#endif void getLPCparam_ivas( Decoder_State *st, /* i/o: decoder memory state */ @@ -7490,7 +7308,6 @@ void ACcontextMapping_encode2_no_mem_s17_LC( int16_t resQMaxBits, CONTEXT_HM_CONFIG *hm_cfg ); -#ifndef IVAS_FLOAT_FIXED int16_t ACcontextMapping_decode2_no_mem_s17_LC_ivas( Decoder_State *st, /* i/o: decoder state */ int16_t *x, /* o : decoded spectrum */ @@ -7499,7 +7316,6 @@ int16_t ACcontextMapping_decode2_no_mem_s17_LC_ivas( int16_t resQMaxBits, /* i : residual coding maximum bits */ CONTEXT_HM_CONFIG *hm_cfg /* i : context-based harmonic model configuration */ ); -#endif int16_t ACcontextMapping_encode2_estimate_no_mem_s17_LC( const int16_t *x, @@ -7519,7 +7335,6 @@ void RCcontextMapping_encode2_no_mem_s17_LCS( const int16_t resQMaxBits, CONTEXT_HM_CONFIG *hm_cfg ); -#ifndef IVAS_FLOAT_FIXED int16_t RCcontextMapping_decode2_no_mem_s17_LCS( Decoder_State *st, /* i/o: decoder state */ int16_t *x, /* o : decoded spectrum */ @@ -7528,7 +7343,6 @@ int16_t RCcontextMapping_decode2_no_mem_s17_LCS( const int16_t resQMaxBits, /* i : residual coding maximum bits */ CONTEXT_HM_CONFIG *hm_cfg /* i : context-based harmonic model configuration */ ); -#endif int16_t RCcontextMapping_encode2_estimate_no_mem_s17_LCS( int16_t *x, /* Spectral coefficients */ @@ -7879,13 +7693,6 @@ int16_t ari_start_decoding_14bits_prm_ivas( int16_t bp, Tastat *s ); -#ifdef IVAS_FLOAT_FIXED -Word16 ari_start_decoding_14bits_prm_ivas_fx( - const Word16 *ptr, - Word16 bp, - Tastat *s ); -#endif - void ari_decode_14bits_s17_ext_ivas( Decoder_State *st, uint16_t *res, @@ -8925,21 +8732,6 @@ void generate_masking_noise( const int16_t nchan_out /* i : number of output channels */ ); -#ifdef IVAS_FLOAT_FIXED -void generate_masking_noise_ivas_fx( - Word32 *timeDomainBuffer, /* i/o: time-domain signal */ - Word16 *exp_out, /* o : time-domain signal exp */ - HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ - const Word16 length, /* i : frame size */ - const Word16 core, /* i : core */ - const Word16 return_noise, /* i : noise is returned instead of added */ - const Word16 secondary, /* i : flag to indicate secondary noise generation */ - const Word16 element_mode, /* i : element mode */ - STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ - const Word16 nchan_out /* i : number of output channels */ -); -#endif - void generate_masking_noise_update_seed( HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ ); @@ -8957,16 +8749,7 @@ void SynthesisSTFT_dirac_flt( const int16_t samples_out, HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ ); -#ifdef IVAS_FLOAT_FIXED -void SynthesisSTFT_dirac_fx( - Word32 *fftBuffer, /* i : FFT bins */ - Word32 *timeDomainOutput, - Word32 *olapBuffer, - const Word16 *olapWin, - const Word16 samples_out, - HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ -); -#endif + void generate_masking_noise_dirac( HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i : filterbank state */ @@ -8988,19 +8771,6 @@ void generate_stereo_masking_noise( const int16_t nchan_out /* i : number of output channels */ ); -#ifdef IVAS_FLOAT_FIXED -void generate_stereo_masking_noise_fx( - Word16 *syn, /* i/o: time-domain signal */ - Word16 Q_syn, - Decoder_State *st, /* i/o: decoder state structure */ - STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i : TD stereo structure */ - const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ - const int16_t fadeOut, /* i : only fade out of previous state */ - STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ - const int16_t nchan_out /* i : number of output channels */ -); -#endif - void apply_scale_flt( float *scale, /* i : scale factor */ const int16_t bwidth, /* i : audio bandwidth */ @@ -9055,19 +8825,6 @@ void SynthesisSTFT_flt( const int16_t nchan_out /* i : number of output channels */ ); -#ifdef IVAS_FLOAT_FIXED -void SynthesisSTFT_fx( - Word32 *fftBuffer, /* i : FFT bins */ - Word32 *timeDomainOutput, - Word32 *olapBuffer, - const Word16 *olapWin, - const int16_t tcx_transition, - HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ - const int16_t element_mode, /* i : element mode */ - const int16_t nchan_out /* i : number of output channels */ -); -#endif - float rand_gauss_flt( float *x, int16_t *seed ); @@ -9126,12 +8883,6 @@ void FdCng_decodeSID( Decoder_State *st /* i/o: decoder state structure */ ); -#ifdef IVAS_FLOAT_FIXED -void FdCng_decodeSID_ivas_fx( - Decoder_State *st /* i/o: decoder state structure */ -); -#endif - void FdCng_exc_flt( HANDLE_FD_CNG_COM hFdCngCom, int16_t *CNG_mode, @@ -9415,20 +9166,10 @@ void resampleCldfb_ivas( HANDLE_CLDFB_FILTER_BANK hs, /* i/o: filter bank handle */ const int32_t newSamplerate /* i : new samplerate to operate */ ); -#ifdef IVAS_FLOAT_FIXED -ivas_error cldfb_save_memory_ivas_fx( - HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ -); -#endif // IVAS_FLOAT_FIXED ivas_error cldfb_save_memory_ivas( HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ ); -#ifdef IVAS_FLOAT_FIXED -void cldfb_restore_memory_ivas_fx( - HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ -); -#endif // IVAS_FLOAT_FIXED void cldfb_restore_memory_ivas( HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ @@ -9491,7 +9232,6 @@ ivas_error config_acelp1_IVAS( /*! r: ACELP16k flag */ -#ifndef IVAS_FLOAT_FIXED int16_t set_ACELP_flag_IVAS( const int16_t element_mode, /* i : element mode */ const int32_t element_brate, /* i : element bitrate */ @@ -9501,7 +9241,6 @@ int16_t set_ACELP_flag_IVAS( const int16_t bwidth, /* i : audio bandwidth */ const int16_t cng_type /* i : CNG type */ ); -#endif void FEC_clas_estim( const float *syn, @@ -9959,14 +9698,12 @@ int16_t GetPLCModeDecision( Decoder_State *st /* i/o: decoder memory state pointer */ ); -#ifndef IVAS_FLOAT_FIXED void addBassPostFilter( const float *harm_timeIn, const int16_t samplesToProcess, float **rAnalysis, float **iAnalysis, HANDLE_CLDFB_FILTER_BANK cldfb ); -#endif ivas_error TonalMDCTConceal_Init_ivas( TonalMDCTConcealPtr hTonalMDCTConc, @@ -10156,15 +9893,11 @@ int16_t getRestrictedMode( int16_t getMdctWindowLength( const int16_t fscale ); -#ifdef IVAS_FLOAT_FIXED -Word16 sr2fscale( - const Word32 sr_core /* i : internal sampling rate */ -); -#else + int16_t sr2fscale( const int32_t sr_core /* i : internal sampling rate */ ); -#endif + int32_t getCoreSamplerateMode2_flt( const int16_t element_mode, /* i : IVAS element mode */ const int32_t total_brate, /* i : total bitrate */ @@ -10315,7 +10048,6 @@ void IGFDecReadData_flt( const int16_t isIndepFrame /* i : if 1: arith dec force reset, if 0: no reset */ ); -#ifndef IVAS_FLOAT_FIXED /*! r: return igfAllZero flag indicating if no envelope is transmitted */ int16_t IGFDecReadLevel_flt( const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* i/o: instance handle of IGF Deccoder */ @@ -10323,7 +10055,6 @@ int16_t IGFDecReadLevel_flt( const int16_t igfGridIdx, /* i : in case of CELP->TCX switching, use 1.25 framelength */ const int16_t isIndepFrame /* i : if 1: arith dec force reset, if 0: no reset */ ); -#endif void IGFDecRestoreTCX10SubFrameData_flt( const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* o : instance handle of IGF Decoder */ @@ -10427,7 +10158,6 @@ void IGFSCFEncoderRestoreContextState( const int16_t igfGridIdx /* i : igf grid index see declaration of IGF_GRID_IDX for details */ ); -#ifndef IVAS_FLOAT_FIXED void IGFSCFDecoderOpen_ivas( IGFSCFDEC_INSTANCE_HANDLE hPublicData, /* i : handle to public data */ H_IGF_INFO hIgfInfo, /* i : IGF info handle */ @@ -10435,15 +10165,11 @@ void IGFSCFDecoderOpen_ivas( const int16_t bwidth, const int16_t element_mode, const int16_t rf_mode ); -#endif -#ifndef IVAS_FLOAT_FIXED void IGFSCFDecoderReset_ivas( IGFSCFDEC_INSTANCE_HANDLE hPublicData /* i : handle to public data or NULL in case there was no instance created */ ); -#endif -#ifndef IVAS_FLOAT_FIXED void IGFSCFDecoderDecode_ivas( IGFSCFDEC_INSTANCE_HANDLE hPublicData, /* i : handle to public data or NULL in case there was no instance created */ Decoder_State *st, /* i/o: pointer to decoder state */ @@ -10452,7 +10178,6 @@ void IGFSCFDecoderDecode_ivas( const int16_t indepFlag /* i : if 1 on input the decoder will be forced to reset, if 0 on input the decoder will be forced to encode without a reset */ ); -#endif /*! r: offset value */ int16_t tbe_celp_exc_offset_flt( @@ -10499,3 +10224,5 @@ void init_tcx_cfg( const int16_t ini_frame, const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */ ); + +#endif diff --git a/lib_com/prot_fx2.h b/lib_com/prot_fx.h similarity index 92% rename from lib_com/prot_fx2.h rename to lib_com/prot_fx.h index 5ea27f5d8..19da14d72 100644 --- a/lib_com/prot_fx2.h +++ b/lib_com/prot_fx.h @@ -50,6 +50,16 @@ #define dynamic_calloc( n1, n2 ) calloc( n1, n2 ) #define dynamic_free( n1 ) free( n1 ) +#define mvr2r_Word32( x, y, n ) Copy32( x, y, n ) +#define mvr2r_Word16( x, y, n ) Copy( x, y, n ) + +#include +#include +#include +#include "options.h" +#include "typedef.h" +#include "cnst.h" +#include "stl.h" #include "ivas_cnst.h" #include "stat_enc.h" #include "stat_dec.h" @@ -60,7 +70,9 @@ #define TCX_IMDCT_SCALE 15 #define TCX_IMDCT_HEADROOM 1 +/*================================================================================*/ /* conversion functions: */ +/*================================================================================*/ // Float to Word32 Word32 float_to_fix( float number, Word32 Q ); @@ -123,6 +135,12 @@ Word16 L_get_q_buf( float *ptr_flt, Word16 length ); Word16 L_get_q_buf1( float *ptr_flt, Word16 length ); #endif +/*================================================================================*/ +/* conversion functions: */ +/*================================================================================*/ + +Word16 norm_ul( UWord32 UL_var1 ); + Word32 Mult_32_16( Word32 a, Word16 b ); @@ -8947,6 +8965,14 @@ void delay_signal_fx( const Word16 delay /* i : delay in samples */ ); +void delay_signal_q_adj_fx( + Word32 x[], /* i/o: signal to be delayed */ + const Word16 len, /* i : length of the input signal */ + Word32 mem[], /* i/o: synchronization memory */ + const Word16 delay, /* i : delay in samples */ + const Word16 q_x, + const Word16 q_mem ); + Word32 anint_fixed( Word32 x, /* i: Round to the nearest integer */ Word16 exp /* i: Exponent for round step */ @@ -9229,7 +9255,6 @@ Word16 deindex_lvq_ivas_fx( Word16 no_bits /* i : number of bits for lattice */ ); -#endif void deleteCldfb_ivas_fx( HANDLE_CLDFB_FILTER_BANK *h_cldfb /* i/o: filter bank handle */ @@ -9312,3 +9337,735 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS( Word16 mode, CONTEXT_HM_CONFIG *hm_cfg /* context-based harmonic model configuration */ ); + +Word16 usdequant_fx( /* Qx*/ + const Word16 idx, /* i: quantizer index Q0*/ + const Word16 qlow, /* i: lowest codebook entry (index 0) Qx*/ + const Word16 delta /* i: quantization step Qy*/ +); + +Word16 usquant_fx( /* o: index of the winning codeword */ + const Word16 x, /* i: scalar value to quantize Qx*/ + Word16 *xq, /* o: quantized value Qx*/ + const Word16 qlow, /* i: lowest codebook entry (index 0) Qx*/ + const Word16 delta, /* i: quantization step Qx-1*/ + const Word16 cbsize /* i: codebook size */ +); + +Word32 Dot_product( /* o : Sum */ + const Word16 x[], /* i : 12bits: x vector */ + const Word16 y[], /* i : 12bits: y vector */ + const Word16 lg /* i : vector length */ +); + +Word32 dotp_fx( /* o : dot product of x[] and y[] */ + const Word16 x[], /* i : vector x[] */ + const Word16 y[], /* i : vector y[] */ + const Word16 n, /* i : vector length */ + Word16 *exp /* (o) : exponent of result (0..+30) */ +); + +Word32 sum2_fx_mod( /* o : sum of all squared vector elements Q(2x+1)*/ + const Word16 *vec, /* i : i vector Qx*/ + const Word16 lvec /* i : length of i vector */ +); + +void Copy_Scale_sig( + const Word16 x[], /* i : signal to scale i Qx */ + Word16 y[], /* o : scaled signal output Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Scale_sig32( + Word32 x[], /* i/o: signal to scale Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Copy_Scale_sig_16_32( + const Word16 x[], /* i : signal to scale i Qx */ + Word32 y[], /* o : scaled signal output Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Copy_Scale_sig_16_32_no_sat( + const Word16 x[], /* i : signal to scale input Qx */ + Word32 y[], /* o : scaled signal output Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Copy_Scale_sig_32_16( + const Word32 x[], /* i : signal to scale i Qx */ + Word16 y[], /* o : scaled signal output Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Random_Fill( + Word16 *seed, /* i/o: random seed */ + Word16 n, /* i : number of values */ + Word16 *y, /* o : output values */ + Word16 scaling /* i : scaling of values */ +); + +Word16 mean_fx( /* o : mean of vector */ + const Word16 *vec_fx, /* i : i vector */ + const Word16 lvec_fx /* i : length of i vector */ +); + +void sort_fx( + Word16 *r, /* i/o: Vector to be sorted in place */ + Word16 lo, /* i : Low limit of sorting range */ + Word16 up /* I : High limit of sorting range */ +); + +void sort_32_fx( + Word32 *r, /* i/o: Vector to be sorted in place */ + const Word16 lo, /* i : Low limit of sorting range */ + const Word16 up /* I : High limit of sorting range */ +); + +Word16 minimum_fx( /* o : index of the minimum value in the input vector */ + const Word16 *vec_fx, /* i : input vector */ + const Word16 lvec_fx, /* i : length of input vector */ + Word16 *min_fx /* o : minimum value in the input vector */ +); + +Word16 maximum_fx( /* o : index of the maximum value in the input vector */ + const Word16 *vec_fx, /* i : input vector */ + const Word16 lvec_fx, /* i : length of input vector */ + Word16 *max_fx /* o : maximum value in the input vector */ +); + +Word16 minimum_abs32_fx( /* o : index of the minimum value in the input vector */ + const Word32 *vec_fx, /* i : input vector */ + const Word16 lvec_fx, /* i : length of input vector */ + Word32 *min_fx /* o : minimum value in the input vector */ +); + +Word16 minimum_32_fx( /* o : index of the minimum value in the input vector */ + const Word32 *vec_fx, /* i : input vector */ + const Word16 lvec_fx, /* i : length of input vector */ + Word32 *min_fx /* o : minimum value in the input vector */ +); + +Word16 maximum_32_fx( /* o : index of the maximum value in the input vector */ + const Word32 *vec, /* i : input vector */ + const Word16 lvec, /* i : length of input vector */ + Word32 *max_val /* o : maximum value in the input vector */ +); + +Word16 maximum_abs_32_fx( /* o : index of the maximum value in the input vector */ + const Word32 *vec, /* i : input vector */ + const Word16 lvec, /* i : length of input vector */ + Word32 *max_val /* o : maximum value in the input vector */ +); + +/*! r: index of the maximum value in the input vector */ +Word16 maximum_s( + const Word16 *vec, /* i : input vector */ + const Word16 lvec, /* i : length of input vector */ + Word16 *max /* o : maximum value in the input vector */ +); + +/*! r: index of the minimum value in the input vector */ +Word16 minimum_s( + const Word16 *vec, /* i : Input vector */ + const Word16 lvec, /* i : Vector length */ + Word16 *min_val /* o : minimum value in the input vector */ +); + +Word16 Exp16Array( + const Word16 n, /* (i): Array size */ + const Word16 *sx /* (i): Data array */ +); + +Word16 Exp32Array( + const Word16 n, /* (i): Array size */ + const Word32 *sx /* (i): Data array */ +); + +Word32 sum16_32_fx( /* o : sum of all vector elements Qx*/ + const Word16 *vec, /* i : input vector Qx*/ + const Word16 lvec /* i : length of input vector */ +); + +Word32 sum32_sat( /* o : sum of all vector elements Qx*/ + const Word32 *vec, /* i : input vector Qx*/ + const Word16 lvec /* i : length of input vector */ +); + +Word32 var_fx_32( /* o: variance of vector Qx+16*/ + const Word16 *x, /* i: input vector Qx*/ + const Word16 Qx, + const Word16 len /* i: length of inputvector */ +); + +Word16 var_fx( /* o: variance of vector Qx*/ + const Word16 *x, /* i: input vector Qx*/ + const Word16 Qx, + const Word16 len /* i: length of inputvector */ +); + +Word16 std_fx( /* o: standard deviation */ + const Word16 x[], /* i: input vector */ + const Word16 len /* i: length of the input vector */ +); + +Word32 dot_product_mat_fx( /* o : the dot product x'*A*x */ + const Word16 *x, /* i : vector x Q15 */ + const Word32 *A, /* i : matrix A Q0*/ + const Word16 m /* i : vector & matrix size */ + +); + +void Vr_subt( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ + Word16 N /* i : Vector lenght */ +); + +Word16 vquant_fx( /* o: index of the winning codevector */ + Word16 x[], /* i: vector to quantize Q13 */ + const Word16 x_mean[], /* i: vector mean to subtract (0 if none)Q13*/ + Word16 xq[], /* o: quantized vector Q13 */ + const Word16 cb[], /* i: codebook Q13 */ + const Word16 dim, /* i: dimension of codebook vectors */ + const Word16 cbsize /* i: codebook size */ +); + +Word16 w_vquant_fx( + Word16 x[], /* i: vector to quantize in Q10 */ + Word16 Qx, + const Word16 weights[], /* i: error weights in Q0 */ + Word16 xq[], /* o: quantized vector in Q15 */ + const Word16 cb[], /* i: codebook in Q15 */ + const Word16 cbsize, /* i: codebook size */ + const Word16 rev_vect /* i: reverse codebook vectors */ +); + +Word16 emaximum_fx( /* o : return index with max energy value in vector Q0 */ + const Word16 Qvec, /* i : Q of input vector Q0 */ + const Word16 *vec, /* i : input vector Qx */ + const Word16 lvec, /* i : length of input vector Q0 */ + Word32 *ener_max /* o : maximum energy value Q0 */ +); + +Word16 emaximum_32fx( /* o : return index with max energy value in vector Q0 */ + const Word16 Qvec, /* i : Q of input vector Q0 */ + const Word32 *vec, /* i : input vector Qx */ + const Word16 lvec, /* i : length of input vector Q0 */ + Word32 *ener_max /* o : maximum energy value Q0 */ +); + +Word32 Mean32( /* o : mean of the elements of the vector */ + const Word32 in[], /* i : input vector */ + const Word16 L /* i : length of input vector */ +); + +Word32 sum32_fx( /* o : sum of all vector elements Qx*/ + const Word32 *vec, /* i : input vector Qx*/ + const Word16 lvec /* i : length of input vector */ +); + +Word16 sum16_fx( /* o : sum of all vector elements Qx*/ + const Word16 *vec, /* i : input vector Qx*/ + const Word16 lvec /* i : length of input vector */ +); + +Word16 own_random2_fx( Word16 seed ); + +void iDiv_and_mod_32( + const Word32 Numer, /* i : 32 bits numerator */ + const Word16 Denom, /* i : 16 bits denominator */ + Word32 *Int_quotient, /* o : integer result of the division (int)(num/den) */ + Word32 *Int_mod, /* o : modulo result of the division num-((int)(num/den)*den)*/ + const Word16 rshift /* i : 0 if no right shift / 1 if the denom is right shifted by 1 */ +); + +void pz_filter_sp_fx( + const Word16 b[], + const Word16 a[], + Word16 x[], + Word16 y[], + Word16 buf[], + Word16 PNR, + Word16 PDR, + Word16 N, + Word16 Qa ); + +Word32 root_a_fx( + Word32 a, + Word16 Q_a, + Word16 *exp_out ); + +Word32 root_a_over_b_fx( + Word32 a, + Word16 Q_a, + Word32 b, + Word16 Q_b, + Word16 *exp_out ); + +void fir_fx( const Word16 x[], /* i : input vector Qx*/ + const Word16 h[], /* i : impulse response of the FIR filter Q12*/ + Word16 y[], /* o : output vector (result of filtering) Qx*/ + Word16 mem[], /* i/o: memory of the input signal (L samples) Qx*/ + const Word16 L, /* i : input vector size */ + const Word16 K, /* i : order of the FIR filter (K+1 coefs.) */ + const Word16 upd /* i : 1 = update the memory, 0 = not */ + , + Word16 shift /* i : difference between Q15 and scaling of h[] */ +); +void v_add_32( + const Word32 x1[], /* i : Input vector 1 */ + const Word32 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_shr_32( + Word32 x1[], /* i : Input vector 1 */ + Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */ + const Word16 N, /* i : Vector length */ + Word16 shift /*shift value*/ +); + +void v_sub_32( + const Word32 x1[], /* i : Input vector 1 */ + const Word32 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */ + const Word16 N /* i : Vector length */ +); + + +void v_add_16( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word16 y[], /* o : Output vector that contains vector 1 + vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_sub_16( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ + const Word16 N /* i : Vector length */ +); + + +Word16 squant_fx( /* o: index of the winning codeword */ + const Word16 x, /* i: scalar value to quantize */ + Word16 *xq, /* o: quantized value */ + const Word16 cb[], /* i: codebook */ + const Word16 cbsize /* i: codebook size */ +); + +void pz_filter_dp_fx( + const Word16 b[], + const Word16 a[], + Word16 x[], + Word16 y[], + Word32 buf[], + Word16 PNR, + Word16 PDR, + Word16 N, + Word16 Qa ); + +void Copy_Scale_sig32_16( + const Word32 *src, /* i : signal to scale Qx */ + Word16 *dst, /* o : scaled signal Qx */ + Word16 len, /* i : size of x[] Q0 */ + Word16 exp0 ); /* i : exponent: x = round(x << exp) Qx ?exp */ + +void v_multc_att( + const Word16 x[], /* i : Input vector Qx */ + const Word16 att, /* i : Constant Q15, <= MAX_16 */ + Word16 y[], /* o : Output vector that contains att*x */ + const Word16 N /* i : Vector length */ +); + +void v_multc_att32( + const Word32 x[], /* i : Input vector Qx */ + const Word16 att, /* i : Constant Q15, <= MAX_16 */ + Word32 y[], /* o : Output vector that contains att*x */ + const Word16 N /* i : Vector length */ +); + +void v_multc_att3232( + const Word32 x[], /* i : Input vector Qx */ + const Word32 att, /* i : Constant Q32, <= MAX_32 */ + Word32 y[], /* o : Output vector that contains att*x */ + const Word16 N /* i : Vector length */ +); + +void v_L_mult_1616( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_L_mult_3216( + const Word32 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ + const Word16 N /* i : Vector length */ +); + +void add_vec_fx( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 Qx1, /* i : SCaling of input 1 */ + const Word16 x2[], /* i : Input vector 2 */ + const Word16 Qx2, /* i : SCaling of input 1 */ + Word16 y[], /* o : Output vector that contains vector 1 + vector 2 */ + const Word16 Qy, /* i : SCaling of output 1 */ + const Word16 N /* i : Vector lenght */ +); + +Word32 Add_flt32_flt32( /* o: Result (Normalized) */ + Word32 a, /* i: 1st Value */ + Word16 exp_a, /* i: Exponent of 1st Value (Q of Value) */ + Word32 b, /* i: 2nd Value */ + Word16 exp_b, /* i: Exponent of 2nd Value (Q of Value) */ + Word16 *exp_out /* o: Exponent of Result */ +); + +Word32 Mul_flt32_Q15( /* o: Result (Normalized) */ + Word32 value, /* i: Pseudo_float Value */ + Word16 *exp_v, /*i/o: Exponent of Value (Q of Value) */ + Word16 frac /* i: Q15 value */ +); + +Word32 Div_flt32_flt32( /* o: Result (Normalized) */ + Word32 a, /* i: 1st Value */ + Word16 exp_a, /* i: Exponent of 1st Value (Q of Value) */ + Word32 b, /* i: 2nd Value */ + Word16 exp_b, /* i: Exponent of 2nd Value (Q of Value) */ + Word16 *exp_out /* o: Exponent of Result */ +); + +Word32 Calc_Energy_Autoscaled( /* o: Result (Energy) */ + const Word16 *signal, /* i: Signal */ + Word16 signal_exp, /* i: Exponent of Signal (Q of Signal) */ + Word16 len, /* i: Frame Length */ + Word16 *energy_exp /* o: Exponent of Energy (Q of Energy) */ +); + +Word16 Find_Max_Norm16( const Word16 *src, Word16 len ); + +Word16 Find_Max_Norm32( const Word32 *src, Word16 len ); + +Word32 Sqrt_Ratio32( /* o: Result in Q31 */ + Word32 L_val1, /* i: Mantisa of Val1 */ + Word16 exp1, /* i: Exp of Val1 (>0: Val was Left Shifted, <0:Right Shifted) */ + Word32 L_val2, /* i: Mantisa of Val2 */ + Word16 exp2, /* i: Exp of Val2 (same as exp1) */ + Word16 *exp /* o: Exp of Result (# of 'L_shl' Req to get to Final Value) */ +); + +Word16 Invert16( /* result in Q'15 + 'exp' */ + Word16 val, + Word16 *exp ); + +Word16 find_rem( Word16 n, Word16 m, Word16 *r ); + +Word32 find_remd( Word32 n, Word32 m, Word32 *r ); + +Word16 rint_new_fx( + Word32 x /*Q16 */ +); + +Word16 erb_diff_search_fx( Word16 *prev_erb, const Word16 *curr_erb, Word16 *dif_erb, Word16 *pow_spec, const Word16 *cb_fx, Word16 cb_size, Word16 cb_dim, Word16 offset ); + +void Acelp_dec_total_exc( + Word16 *exc_fx, /* i/o: adapt. excitation exc */ + Word16 *exc2_fx, /* i/o: adapt. excitation/total exc */ + const Word16 gain_code16, /* i : Gain code Q0 */ + const Word16 gain_pit_fx, /* i ; Pitch gain in Q14 */ + const Word16 i_subfr, /* i ; subfr */ + const Word16 *code_fx, /* i : code in Q9 */ + const Word16 L_subfr /* i : Subframne lenght */ +); + +UWord32 UL_inverse( const UWord32 UL_val, Word16 *exp ); + +UWord32 UL_div( const UWord32 UL_num, const UWord32 UL_den ); + +Word16 ratio( const Word32 numer, const Word32 denom, Word16 *expo ); + +void hp400_12k8_fx( + Word16 signal[], /* i/o: input signal / output is divided by 16 */ + const Word16 lg, /* i : lenght of signal */ + Word16 mem[] /* i/o: filter memory [6] */ +); + +Word16 dot_prod_satcontr( const Word16 *x, const Word16 *y, Word16 qx, Word16 qy, Word16 *qo, Word16 len ); + +void E_UTIL_f_convolve( const Word16 x[], const Word16 h[], Word16 y[], const Word16 size ); + +void floating_point_add( + Word32 *mx, /* io: mantissa of the addend Q31 */ + Word16 *ex, /* io: exponent of the addend Q0 */ + const Word32 my, /* i: mantissa of the adder Q31 */ + const Word16 ey /* i: exponent of the adder Q0 */ +); +/*delay_signal_fx is also present*/ +void delay_signal( + Word16 x[], /* i/o: signal to be delayed */ + const Word16 len, /* i : length of the input signal */ + Word16 mem[], /* i/o: synchronization memory */ + const Word16 delay /* i : delay in samples */ +); + +void delay_signal32( + Word32 x[], /* i/o: signal to be delayed */ + const Word16 len, /* i : length of the input signal */ + Word32 mem[], /* i/o: synchronization memory */ + const Word16 delay /* i : delay in samples */ +); + +Word16 lin_interp_fx( + const Word16 x, /* i : the value to be mapped */ + const Word16 x1, /* i : source range interval: low end */ + const Word16 y1, /* i : source range interval: high end */ + const Word16 x2, /* i : target range interval: low */ + const Word16 y2, /* i : target range interval: high */ + const Word16 flag_sat /* i : flag to indicate whether to apply saturation */ +); + +Word16 ceil_log_2( UWord64 val ); + +Word32 imax_pos_fx( + const Word32 *y /* i : Input vector for peak interpolation */ +); + +void msvq_dec_fx( + const Word16 *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ + const Word16 dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ + const Word16 offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ + const Word16 stages, /* i : Number of stages */ + const Word16 N, /* i : Vector dimension */ + const Word16 maxN, /* i : Codebook dimension */ + const Word16 Idx[], /* i : Indices */ + const Word16 applyIDCT_flag, /* i : applyIDCT flag */ + const Word32 *invTrfMatrix, /* i : synthesis matrix */ + Word32 *uq, /* o : quantized vector */ + Word16 *uq_ind, /* o : quantized vector (fixed point) */ + Word16 exp ); + +void dec_FDCNG_MSVQ_stage1_fx( + Word16 j_full, /* i : index full range */ + Word16 n, /* i : dimension to generate */ + const Word32 *invTrfMatrix, /* i : IDCT matrix for synthesis */ + const DCTTYPE idcttype, /* i : specify which IDCT */ + Word32 *uq, /* o : synthesized stage1 vector */ + Word16 *uq_ind /* o : synthesized stage1 vector in BASOP */ +); + +void dctT2_N_apply_matrix_fx( + const Word32 *input, /* i : input in fdcng or DCT(fdcng) domain */ + Word32 *output, /* o : output in DCT(fdcng) or fdcng ordomain */ + const Word16 dct_dim, /* i : dct processing dim possibly truncated */ + const Word16 fdcngvq_dim, /* i : fdcng domain length */ + const Word32 *matrix, /* i : IDCT matrix */ + const Word16 matrix_row_dim, /* i : */ + const DCTTYPE dcttype /* i : matrix operation type */ +); + +Word32 sum2_f_32_fx( + const Word32 *vec, /* i : input vector */ + const int16_t lvec, /* i : length of input vector */ + Word16 gb ); + +Word32 sum2_32_fx( + const Word32 *vec, /* i : input vector */ + const Word16 lvec, /* i : length of input vector */ + Word16 *e ); + +void v_mult_fixed( + const Word32 x1[], /* i : Input vector 1 */ + const Word32 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_sub_s16_fx( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_sub32_fx( + const Word32 x1[], /* i : Input vector 1 */ + const Word32 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */ + const Word16 N /* i : Vector length */ +); + +void ivas_swb_tbe_dec_fx( + Decoder_State *st, /* i/o: decoder state structure */ + STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */ + const Word32 *bwe_exc_extended_fx, /* i : bandwidth extended excitation */ + Word16 Q_exc, + const Word16 voice_factors_fx[], /* i : voicing factors */ + const Word32 old_syn_12k8_16k_fx[], /* i : low band synthesis */ + Word16 *White_exc16k_fx, /* o : shaped white excitation for the FB TBE */ + Word32 *synth_fx, /* o : SHB synthesis/final synthesis */ + Word16 *pitch_buf_fx, + Word16 *Q_white_exc ); + +Word16 swb_bwe_dec_fx32( + Decoder_State *st, /* i/o: decoder state structure */ + Word32 output[], /* i : synthesis @internal Fs Q11 */ + Word32 *synth, /* i : ACELP core synthesis/final synthesis Q11 */ + Word32 *hb_synth, /* o : SHB synthesis/final synthesis */ + Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ + Word16 output_frame /* i : frame length */ +); + +ivas_error acelp_core_dec_ivas_fx( + Decoder_State *st, /* i/o: decoder state structure */ + Word16 output[], /* o : synthesis @internal Fs */ + Word16 synth[], /* o : synthesis */ + Word16 save_hb_synth[], /* o : HB synthesis */ + Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation */ + Word16 *voice_factors, /* o : voicing factors */ + Word16 old_syn_12k8_16k[], /* o : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE */ + const int16_t sharpFlag, /* i : formant sharpening flag */ + Word16 pitch_buf[NB_SUBFR16k], /* o : floating pitch for each subframe */ + int16_t *unbits, /* o : number of unused bits */ + int16_t *sid_bw, /* o : 0-NB/WB, 1-SWB SID */ + STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */ + const Word16 tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */ + const Word16 tdm_lsfQ_PCh[M], /* i : Q LSFs for primary channel */ + const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ + const int16_t last_element_mode, /* i : last element mode */ + const int32_t last_element_brate, /* i : last element bitrate */ + const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ + const int16_t nchan_out, /* i : number of output channels */ + STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ + const int16_t read_sid_info /* i : read SID info flag */ +); + +void destroy_cldfb_decoder_ivas_fx( + Decoder_State *st /* o : Decoder static variables structure */ +); + +void wtda_fx32( + const Word32 *new_audio, /* i : input audio Q11 */ + Word32 *wtda_audio, /* o : windowed audio Q11 */ + Word32 *old_wtda, /* i/o: windowed audio from previous frame Q11 */ + const Word16 left_mode, /* i : window overlap of previous frame (0: full, 2: none, or 3: half) */ + const Word16 right_mode, /* i : window overlap of current frame (0: full, 2: none, or 3: half) */ + const Word16 L /* i : length */ +); + +ivas_error core_switching_pre_dec_ivas_fx( + Decoder_State *st, /* i/o: decoder state structure */ + const Word16 output_frame, /* i : frame length */ + const Word32 last_core_brate_st0, /* i : channel 0 last core bitrate */ + const Word16 nchan_out, /* i : number of output channels */ + const Word16 last_element_mode, /* i : last_element_mode */ + const Word32 last_element_brate, /* i : last element bitrate */ + Word16 Q_old_synthFB, + Word16 *Q_olapBufferSynth, + Word16 *Q_olapBufferSynth2 ); + +void hp20_fix32( + Word32 signal_fx[], + const Word16 lg, + Word32 mem_fx[], + const Word32 Fs ); + +void getTCXMode_ivas_fx( + Decoder_State *st, /* i/o: decoder memory state */ + Decoder_State *st0, /* i : bitstream */ + const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0)*/ +); + +void getTCXWindowing_ivas_fx( + const Word16 core, /* i : current frame mode */ + const Word16 last_core, /* i : last frame mode */ + const Word16 element_mode, /* i : element mode */ + TCX_CONFIG_HANDLE hTcxCfg, /* i/o: TCX configuration handle */ + Decoder_State *st0 /* i : bitstream */ +); + +Word16 ari_start_decoding_14bits_prm_ivas_fx( + const Word16 *ptr, + Word16 bp, + Tastat *s ); + +void generate_masking_noise_ivas_fx( + Word32 *timeDomainBuffer, /* i/o: time-domain signal */ + Word16 *exp_out, /* o : time-domain signal exp */ + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + const Word16 length, /* i : frame size */ + const Word16 core, /* i : core */ + const Word16 return_noise, /* i : noise is returned instead of added */ + const Word16 secondary, /* i : flag to indicate secondary noise generation */ + const Word16 element_mode, /* i : element mode */ + STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ + const Word16 nchan_out /* i : number of output channels */ +); + +void SynthesisSTFT_dirac_fx( + Word32 *fftBuffer, /* i : FFT bins */ + Word32 *timeDomainOutput, + Word32 *olapBuffer, + const Word16 *olapWin, + const Word16 samples_out, + HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ +); + +void generate_stereo_masking_noise_fx( + Word16 *syn, /* i/o: time-domain signal */ + Word16 Q_syn, + Decoder_State *st, /* i/o: decoder state structure */ + STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i : TD stereo structure */ + const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ + const int16_t fadeOut, /* i : only fade out of previous state */ + STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ + const int16_t nchan_out /* i : number of output channels */ +); + +void SynthesisSTFT_fx( + Word32 *fftBuffer, /* i : FFT bins */ + Word32 *timeDomainOutput, + Word32 *olapBuffer, + const Word16 *olapWin, + const int16_t tcx_transition, + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + const int16_t element_mode, /* i : element mode */ + const int16_t nchan_out /* i : number of output channels */ +); + +void FdCng_decodeSID_ivas_fx( + Decoder_State *st /* i/o: decoder state structure */ +); + +void cldfb_restore_memory_ivas_fx( + HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ +); + +ivas_error cldfb_save_memory_ivas_fx( + HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ +); + +void ordr_esti( + const Word16 k, /* i : sub-vector index */ + Word16 *Mpos, /* i/o: dominant sub-vector position from ACV */ + Word16 svOrder[], /* i/o: AVQ sub-vector order */ + const Word16 Nsv /* i : total sub-vectors in a sub-frames */ +); + +Word16 sr2fscale( + const Word32 sr_core /* i : internal sampling rate */ +); + +#endif \ No newline at end of file diff --git a/lib_com/prot_fx1.h b/lib_com/prot_fx1.h deleted file mode 100644 index b7867429b..000000000 --- a/lib_com/prot_fx1.h +++ /dev/null @@ -1,636 +0,0 @@ -/****************************************************************************************************** - - (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 - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of 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 - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#ifndef PROT_FX1_H -#define PROT_FX1_H - -#include -#include -#include -#include "options.h" -#include "typedef.h" -#include "cnst.h" -#include "stl.h" -#define mvr2r_Word32( x, y, n ) Copy32( x, y, n ) -#define mvr2r_Word16( x, y, n ) Copy( x, y, n ) - -int16_t norm_ul( uint32_t UL_var1 ); -Word16 usdequant_fx( /* Qx*/ - const Word16 idx, /* i: quantizer index Q0*/ - const Word16 qlow, /* i: lowest codebook entry (index 0) Qx*/ - const Word16 delta /* i: quantization step Qy*/ -); - -Word16 usquant_fx( /* o: index of the winning codeword */ - const Word16 x, /* i: scalar value to quantize Qx*/ - Word16 *xq, /* o: quantized value Qx*/ - const Word16 qlow, /* i: lowest codebook entry (index 0) Qx*/ - const Word16 delta, /* i: quantization step Qx-1*/ - const Word16 cbsize /* i: codebook size */ -); - -Word32 Dot_product( /* o : Sum */ - const Word16 x[], /* i : 12bits: x vector */ - const Word16 y[], /* i : 12bits: y vector */ - const Word16 lg /* i : vector length */ -); - -Word32 dotp_fx( /* o : dot product of x[] and y[] */ - const Word16 x[], /* i : vector x[] */ - const Word16 y[], /* i : vector y[] */ - const Word16 n, /* i : vector length */ - Word16 *exp /* (o) : exponent of result (0..+30) */ -); - -Word32 sum2_fx( /* o : sum of all squared vector elements Q(2x+1)*/ - const Word16 *vec, /* i : i vector Qx*/ - const Word16 lvec /* i : length of i vector */ -); - -Word32 sum2_fx_mod( /* o : sum of all squared vector elements Q(2x+1)*/ - const Word16 *vec, /* i : i vector Qx*/ - const Word16 lvec /* i : length of i vector */ -); - -void Copy( - const Word16 x[], /* i : i vector */ - Word16 y[], /* o : output vector */ - const Word16 L /* i : vector length */ -); - -void Copy32( - const Word32 x[], /* i : i vector */ - Word32 y[], /* o : output vector */ - const Word16 L /* i : vector length */ -); - -void set8_fx( - Word8 y[], /* i/o: Vector to set */ - const Word8 a, /* i : Value to set the vector to */ - const Word16 N /* i : Lenght of the vector */ -); - -void set16_fx( - Word16 y[], /* i/o: Vector to set */ - const Word16 a, /* i : Value to set the vector to */ - const Word16 N /* i : Lenght of the vector */ -); - -void set32_fx( - Word32 y[], /* i/o: Vector to set */ - const Word32 a, /* i : Value to set the vector to */ - const Word16 N /* i : Lenght of the vector */ -); - -void Copy_Scale_sig( - const Word16 x[], /* i : signal to scale i Qx */ - Word16 y[], /* o : scaled signal output Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Copy_Scale_sig_16_32( - const Word16 x[], /* i : signal to scale i Qx */ - Word32 y[], /* o : scaled signal output Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Copy_Scale_sig_16_32_no_sat( - const Word16 x[], /* i : signal to scale input Qx */ - Word32 y[], /* o : scaled signal output Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Copy_Scale_sig_32_16( - const Word32 x[], /* i : signal to scale i Qx */ - Word16 y[], /* o : scaled signal output Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Scale_sig32( - Word32 x[], /* i/o: signal to scale Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Random_Fill( - Word16 *seed, /* i/o: random seed */ - Word16 n, /* i : number of values */ - Word16 *y, /* o : output values */ - Word16 scaling /* i : scaling of values */ -); - -void Scale_sig( - Word16 x[], /* i/o: signal to scale Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -Word16 mean_fx( /* o : mean of vector */ - const Word16 *vec_fx, /* i : i vector */ - const Word16 lvec_fx /* i : length of i vector */ -); - -void Vr_add( - const Word16 *in1, /* i : Input vector 1 */ - const Word16 *in2, /* i : Input vector 2 */ - Word16 *out, /* o : Output vector that contains vector 1 + vector 2 */ - Word16 Len /* i : Vector lenght */ -); -void sort_fx( - Word16 *r, /* i/o: Vector to be sorted in place */ - Word16 lo, /* i : Low limit of sorting range */ - Word16 up /* I : High limit of sorting range */ -); -void sort_32_fx( - Word32 *r, /* i/o: Vector to be sorted in place */ - const Word16 lo, /* i : Low limit of sorting range */ - const Word16 up /* I : High limit of sorting range */ -); -Word16 minimum_fx( /* o : index of the minimum value in the input vector */ - const Word16 *vec_fx, /* i : input vector */ - const Word16 lvec_fx, /* i : length of input vector */ - Word16 *min_fx /* o : minimum value in the input vector */ -); -Word16 maximum_fx( /* o : index of the maximum value in the input vector */ - const Word16 *vec_fx, /* i : input vector */ - const Word16 lvec_fx, /* i : length of input vector */ - Word16 *max_fx /* o : maximum value in the input vector */ -); -Word16 minimum_abs32_fx( /* o : index of the minimum value in the input vector */ - const Word32 *vec_fx, /* i : input vector */ - const Word16 lvec_fx, /* i : length of input vector */ - Word32 *min_fx /* o : minimum value in the input vector */ -); -Word16 minimum_32_fx( /* o : index of the minimum value in the input vector */ - const Word32 *vec_fx, /* i : input vector */ - const Word16 lvec_fx, /* i : length of input vector */ - Word32 *min_fx /* o : minimum value in the input vector */ -); -Word16 maximum_32_fx( /* o : index of the maximum value in the input vector */ - const Word32 *vec, /* i : input vector */ - const Word16 lvec, /* i : length of input vector */ - Word32 *max_val /* o : maximum value in the input vector */ -); -Word16 maximum_abs_32_fx( /* o : index of the maximum value in the input vector */ - const Word32 *vec, /* i : input vector */ - const Word16 lvec, /* i : length of input vector */ - Word32 *max_val /* o : maximum value in the input vector */ -); -#ifdef IVAS_FLOAT_FIXED -/*! r: index of the maximum value in the input vector */ -Word16 maximum_s( - const Word16 *vec, /* i : input vector */ - const Word16 lvec, /* i : length of input vector */ - Word16 *max /* o : maximum value in the input vector */ -); - -/*! r: index of the minimum value in the input vector */ -Word16 minimum_s( - const Word16 *vec, /* i : Input vector */ - const Word16 lvec, /* i : Vector length */ - Word16 *min_val /* o : minimum value in the input vector */ -); -#endif -Word16 Exp16Array( - const Word16 n, /* (i): Array size */ - const Word16 *sx /* (i): Data array */ -); -Word16 Exp32Array( - const Word16 n, /* (i): Array size */ - const Word32 *sx /* (i): Data array */ -); -Word32 sum16_32_fx( /* o : sum of all vector elements Qx*/ - const Word16 *vec, /* i : input vector Qx*/ - const Word16 lvec /* i : length of input vector */ -); -Word32 sum32_sat( /* o : sum of all vector elements Qx*/ - const Word32 *vec, /* i : input vector Qx*/ - const Word16 lvec /* i : length of input vector */ -); -Word32 var_fx_32( /* o: variance of vector Qx+16*/ - const Word16 *x, /* i: input vector Qx*/ - const Word16 Qx, - const Word16 len /* i: length of inputvector */ -); -Word16 var_fx( /* o: variance of vector Qx*/ - const Word16 *x, /* i: input vector Qx*/ - const Word16 Qx, - const Word16 len /* i: length of inputvector */ -); -Word16 std_fx( /* o: standard deviation */ - const Word16 x[], /* i: input vector */ - const Word16 len /* i: length of the input vector */ -); -Word32 dot_product_mat_fx( /* o : the dot product x'*A*x */ - const Word16 *x, /* i : vector x Q15 */ - const Word32 *A, /* i : matrix A Q0*/ - const Word16 m /* i : vector & matrix size */ - -); -void Vr_subt( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ - Word16 N /* i : Vector lenght */ -); -Word16 vquant_fx( /* o: index of the winning codevector */ - Word16 x[], /* i: vector to quantize Q13 */ - const Word16 x_mean[], /* i: vector mean to subtract (0 if none)Q13*/ - Word16 xq[], /* o: quantized vector Q13 */ - const Word16 cb[], /* i: codebook Q13 */ - const Word16 dim, /* i: dimension of codebook vectors */ - const Word16 cbsize /* i: codebook size */ -); -Word16 w_vquant_fx( - Word16 x[], /* i: vector to quantize in Q10 */ - Word16 Qx, - const Word16 weights[], /* i: error weights in Q0 */ - Word16 xq[], /* o: quantized vector in Q15 */ - const Word16 cb[], /* i: codebook in Q15 */ - const Word16 cbsize, /* i: codebook size */ - const Word16 rev_vect /* i: reverse codebook vectors */ -); -Word16 emaximum_fx( /* o : return index with max energy value in vector Q0 */ - const Word16 Qvec, /* i : Q of input vector Q0 */ - const Word16 *vec, /* i : input vector Qx */ - const Word16 lvec, /* i : length of input vector Q0 */ - Word32 *ener_max /* o : maximum energy value Q0 */ -); -Word16 emaximum_32fx( /* o : return index with max energy value in vector Q0 */ - const Word16 Qvec, /* i : Q of input vector Q0 */ - const Word32 *vec, /* i : input vector Qx */ - const Word16 lvec, /* i : length of input vector Q0 */ - Word32 *ener_max /* o : maximum energy value Q0 */ -); -Word32 Mean32( /* o : mean of the elements of the vector */ - const Word32 in[], /* i : input vector */ - const Word16 L /* i : length of input vector */ -); -Word32 sum32_fx( /* o : sum of all vector elements Qx*/ - const Word32 *vec, /* i : input vector Qx*/ - const Word16 lvec /* i : length of input vector */ -); -Word16 sum16_fx( /* o : sum of all vector elements Qx*/ - const Word16 *vec, /* i : input vector Qx*/ - const Word16 lvec /* i : length of input vector */ -); -Word16 Random( /* o : output random value */ - Word16 *seed /* i/o: random seed */ -); -Word16 own_random2_fx( Word16 seed ); -void iDiv_and_mod_32( - const Word32 Numer, /* i : 32 bits numerator */ - const Word16 Denom, /* i : 16 bits denominator */ - Word32 *Int_quotient, /* o : integer result of the division (int)(num/den) */ - Word32 *Int_mod, /* o : modulo result of the division num-((int)(num/den)*den)*/ - const Word16 rshift /* i : 0 if no right shift / 1 if the denom is right shifted by 1 */ -); -void pz_filter_sp_fx( - const Word16 b[], - const Word16 a[], - Word16 x[], - Word16 y[], - Word16 buf[], - Word16 PNR, - Word16 PDR, - Word16 N, - Word16 Qa ); -Word32 root_a_fx( - Word32 a, - Word16 Q_a, - Word16 *exp_out ); -Word32 root_a_over_b_fx( - Word32 a, - Word16 Q_a, - Word32 b, - Word16 Q_b, - Word16 *exp_out ); -void fir_fx( const Word16 x[], /* i : input vector Qx*/ - const Word16 h[], /* i : impulse response of the FIR filter Q12*/ - Word16 y[], /* o : output vector (result of filtering) Qx*/ - Word16 mem[], /* i/o: memory of the input signal (L samples) Qx*/ - const Word16 L, /* i : input vector size */ - const Word16 K, /* i : order of the FIR filter (K+1 coefs.) */ - const Word16 upd /* i : 1 = update the memory, 0 = not */ - , - Word16 shift /* i : difference between Q15 and scaling of h[] */ -); - -void fir_fx( const Word16 x[], /* i : input vector Qx*/ - const Word16 h[], /* i : impulse response of the FIR filter Q12*/ - Word16 y[], /* o : output vector (result of filtering) Qx*/ - Word16 mem[], /* i/o: memory of the input signal (L samples) Qx*/ - const Word16 L, /* i : input vector size */ - const Word16 K, /* i : order of the FIR filter (K+1 coefs.) */ - const Word16 upd /* i : 1 = update the memory, 0 = not */ - , - Word16 shift /* i : difference between Q15 and scaling of h[] */ -); - -void v_add_32( - const Word32 x1[], /* i : Input vector 1 */ - const Word32 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */ - const Word16 N /* i : Vector length */ -); - -void v_shr_32( - Word32 x1[], /* i : Input vector 1 */ - Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */ - const Word16 N, /* i : Vector length */ - Word16 shift /*shift value*/ -); - -void v_sub_32( - const Word32 x1[], /* i : Input vector 1 */ - const Word32 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */ - const Word16 N /* i : Vector length */ -); - - -void v_add_16( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word16 y[], /* o : Output vector that contains vector 1 + vector 2 */ - const Word16 N /* i : Vector length */ -); - -void v_sub_16( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ - const Word16 N /* i : Vector length */ -); - - -Word16 squant_fx( /* o: index of the winning codeword */ - const Word16 x, /* i: scalar value to quantize */ - Word16 *xq, /* o: quantized value */ - const Word16 cb[], /* i: codebook */ - const Word16 cbsize /* i: codebook size */ -); -void pz_filter_dp_fx( - const Word16 b[], - const Word16 a[], - Word16 x[], - Word16 y[], - Word32 buf[], - Word16 PNR, - Word16 PDR, - Word16 N, - Word16 Qa ); -void Copy_Scale_sig32_16( - const Word32 *src, /* i : signal to scale Qx */ - Word16 *dst, /* o : scaled signal Qx */ - Word16 len, /* i : size of x[] Q0 */ - Word16 exp0 ); /* i : exponent: x = round(x << exp) Qx ?exp */ - -void v_multc_att( - const Word16 x[], /* i : Input vector Qx */ - const Word16 att, /* i : Constant Q15, <= MAX_16 */ - Word16 y[], /* o : Output vector that contains att*x */ - const Word16 N /* i : Vector length */ -); -void v_multc_att32( - const Word32 x[], /* i : Input vector Qx */ - const Word16 att, /* i : Constant Q15, <= MAX_16 */ - Word32 y[], /* o : Output vector that contains att*x */ - const Word16 N /* i : Vector length */ -); -void v_multc_att3232( - const Word32 x[], /* i : Input vector Qx */ - const Word32 att, /* i : Constant Q32, <= MAX_32 */ - Word32 y[], /* o : Output vector that contains att*x */ - const Word16 N /* i : Vector length */ -); -void v_L_mult_1616( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ - const Word16 N /* i : Vector length */ -); -void v_L_mult_3216( - const Word32 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ - const Word16 N /* i : Vector length */ -); -void add_vec_fx( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 Qx1, /* i : SCaling of input 1 */ - const Word16 x2[], /* i : Input vector 2 */ - const Word16 Qx2, /* i : SCaling of input 1 */ - Word16 y[], /* o : Output vector that contains vector 1 + vector 2 */ - const Word16 Qy, /* i : SCaling of output 1 */ - const Word16 N /* i : Vector lenght */ -); -Word32 Add_flt32_flt32( /* o: Result (Normalized) */ - Word32 a, /* i: 1st Value */ - Word16 exp_a, /* i: Exponent of 1st Value (Q of Value) */ - Word32 b, /* i: 2nd Value */ - Word16 exp_b, /* i: Exponent of 2nd Value (Q of Value) */ - Word16 *exp_out /* o: Exponent of Result */ -); -Word32 Mul_flt32_Q15( /* o: Result (Normalized) */ - Word32 value, /* i: Pseudo_float Value */ - Word16 *exp_v, /*i/o: Exponent of Value (Q of Value) */ - Word16 frac /* i: Q15 value */ -); -Word32 Div_flt32_flt32( /* o: Result (Normalized) */ - Word32 a, /* i: 1st Value */ - Word16 exp_a, /* i: Exponent of 1st Value (Q of Value) */ - Word32 b, /* i: 2nd Value */ - Word16 exp_b, /* i: Exponent of 2nd Value (Q of Value) */ - Word16 *exp_out /* o: Exponent of Result */ -); -Word32 Calc_Energy_Autoscaled( /* o: Result (Energy) */ - const Word16 *signal, /* i: Signal */ - Word16 signal_exp, /* i: Exponent of Signal (Q of Signal) */ - Word16 len, /* i: Frame Length */ - Word16 *energy_exp /* o: Exponent of Energy (Q of Energy) */ -); -Word16 Find_Max_Norm16( const Word16 *src, Word16 len ); - -Word16 Find_Max_Norm32( const Word32 *src, Word16 len ); - -Word32 Sqrt_Ratio32( /* o: Result in Q31 */ - Word32 L_val1, /* i: Mantisa of Val1 */ - Word16 exp1, /* i: Exp of Val1 (>0: Val was Left Shifted, <0:Right Shifted) */ - Word32 L_val2, /* i: Mantisa of Val2 */ - Word16 exp2, /* i: Exp of Val2 (same as exp1) */ - Word16 *exp /* o: Exp of Result (# of 'L_shl' Req to get to Final Value) */ -); - -Word16 Invert16( /* result in Q'15 + 'exp' */ - Word16 val, - Word16 *exp ); - -Word16 find_rem( Word16 n, Word16 m, Word16 *r ); -Word32 find_remd( Word32 n, Word32 m, Word32 *r ); - -Word16 rint_new_fx( - Word32 x /*Q16 */ -); - -Word16 erb_diff_search_fx( Word16 *prev_erb, const Word16 *curr_erb, Word16 *dif_erb, Word16 *pow_spec, const Word16 *cb_fx, Word16 cb_size, Word16 cb_dim, Word16 offset ); - -void Acelp_dec_total_exc( - Word16 *exc_fx, /* i/o: adapt. excitation exc */ - Word16 *exc2_fx, /* i/o: adapt. excitation/total exc */ - const Word16 gain_code16, /* i : Gain code Q0 */ - const Word16 gain_pit_fx, /* i ; Pitch gain in Q14 */ - const Word16 i_subfr, /* i ; subfr */ - const Word16 *code_fx, /* i : code in Q9 */ - const Word16 L_subfr /* i : Subframne lenght */ -); - -UWord32 UL_inverse( const UWord32 UL_val, Word16 *exp ); - -UWord32 UL_div( const UWord32 UL_num, const UWord32 UL_den ); - -Word16 ratio( const Word32 numer, const Word32 denom, Word16 *expo ); - -void hp400_12k8_fx( - Word16 signal[], /* i/o: input signal / output is divided by 16 */ - const Word16 lg, /* i : lenght of signal */ - Word16 mem[] /* i/o: filter memory [6] */ -); - -#if 0 -void hp400_12k8_ivas_fx( - Word16 signal[], /* i/o: input signal / output is divided by 16 */ - const Word16 lg, /* i : lenght of signal */ - Word16 mem[] /* i/o: filter memory [6] */ -); -#endif -Word16 dot_prod_satcontr( const Word16 *x, const Word16 *y, Word16 qx, Word16 qy, Word16 *qo, Word16 len ); - -void E_UTIL_f_convolve( const Word16 x[], const Word16 h[], Word16 y[], const Word16 size ); - -void floating_point_add( - Word32 *mx, /* io: mantissa of the addend Q31 */ - Word16 *ex, /* io: exponent of the addend Q0 */ - const Word32 my, /* i: mantissa of the adder Q31 */ - const Word16 ey /* i: exponent of the adder Q0 */ -); - - -#ifdef IVAS_FLOAT_FIXED -void fft_fx( - Word32 *re, /* i/o: real part */ - Word32 *im, /* i/o: imag part */ - const Word16 length, /* i : length of fft */ - const Word16 s /* i : sign */ -); - -#endif -void delay_signal( - Word16 x[], /* i/o: signal to be delayed */ - const Word16 len, /* i : length of the input signal */ - Word16 mem[], /* i/o: synchronization memory */ - const Word16 delay /* i : delay in samples */ -); - -void delay_signal32( - Word32 x[], /* i/o: signal to be delayed */ - const Word16 len, /* i : length of the input signal */ - Word32 mem[], /* i/o: synchronization memory */ - const Word16 delay /* i : delay in samples */ -); - -Word16 lin_interp_fx( - const Word16 x, /* i : the value to be mapped */ - const Word16 x1, /* i : source range interval: low end */ - const Word16 y1, /* i : source range interval: high end */ - const Word16 x2, /* i : target range interval: low */ - const Word16 y2, /* i : target range interval: high */ - const Word16 flag_sat /* i : flag to indicate whether to apply saturation */ -); - -Word16 ceil_log_2( UWord64 val ); - -Word32 imax_pos_fx( - const Word32 *y /* i : Input vector for peak interpolation */ -); - -#ifdef IVAS_FLOAT_FIXED -void re8_k2y_fx( - const Word16 *k, /* i : Voronoi index k[0..7] */ - const Word16 m, /* i : Voronoi modulo (m = 2^r = 1<=2) */ - Word16 *y /* o : 8-dimensional point y[0..7] in RE8 */ -); - -void re8_PPV_fx( - const Word32 x[], /* i : point in R^8Q15 */ - Word16 y[] /* o : point in RE8 (8-dimensional integer vector) */ -); - -void msvq_dec_fx( - const Word16 *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ - const Word16 dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ - const Word16 offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ - const Word16 stages, /* i : Number of stages */ - const Word16 N, /* i : Vector dimension */ - const Word16 maxN, /* i : Codebook dimension */ - const Word16 Idx[], /* i : Indices */ - const Word16 applyIDCT_flag, /* i : applyIDCT flag */ - const Word32 *invTrfMatrix, /* i : synthesis matrix */ - Word32 *uq, /* o : quantized vector */ - Word16 *uq_ind, /* o : quantized vector (fixed point) */ - Word16 exp ); - -void dec_FDCNG_MSVQ_stage1_fx( - Word16 j_full, /* i : index full range */ - Word16 n, /* i : dimension to generate */ - const Word32 *invTrfMatrix, /* i : IDCT matrix for synthesis */ - const DCTTYPE idcttype, /* i : specify which IDCT */ - Word32 *uq, /* o : synthesized stage1 vector */ - Word16 *uq_ind /* o : synthesized stage1 vector in BASOP */ -); - -void dctT2_N_apply_matrix_fx( - const Word32 *input, /* i : input in fdcng or DCT(fdcng) domain */ - Word32 *output, /* o : output in DCT(fdcng) or fdcng ordomain */ - const Word16 dct_dim, /* i : dct processing dim possibly truncated */ - const Word16 fdcngvq_dim, /* i : fdcng domain length */ - const Word32 *matrix, /* i : IDCT matrix */ - const Word16 matrix_row_dim, /* i : */ - const DCTTYPE dcttype /* i : matrix operation type */ -); - -#endif -#endif diff --git a/lib_com/pvq_com_fx.c b/lib_com/pvq_com_fx.c index 2a7e9a8ec..97690114f 100644 --- a/lib_com/pvq_com_fx.c +++ b/lib_com/pvq_com_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ diff --git a/lib_com/range_com_fx.c b/lib_com/range_com_fx.c index 0b46d7335..22a7fb8ea 100644 --- a/lib_com/range_com_fx.c +++ b/lib_com/range_com_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_com/re8_ppv_fx.c b/lib_com/re8_ppv_fx.c index a786f9936..32c69f6e5 100644 --- a/lib_com/re8_ppv_fx.c +++ b/lib_com/re8_ppv_fx.c @@ -4,8 +4,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" /*-------------------------------------------------------------------* diff --git a/lib_com/re8_util_fx.c b/lib_com/re8_util_fx.c index db58c3fae..aa6075245 100644 --- a/lib_com/re8_util_fx.c +++ b/lib_com/re8_util_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_com/recovernorm_fx.c b/lib_com/recovernorm_fx.c index e5b72fc51..d6659b77a 100644 --- a/lib_com/recovernorm_fx.c +++ b/lib_com/recovernorm_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ diff --git a/lib_com/reordvct_fx.c b/lib_com/reordvct_fx.c index a26480626..45c2ffbba 100644 --- a/lib_com/reordvct_fx.c +++ b/lib_com/reordvct_fx.c @@ -32,7 +32,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_com/residu_fx.c b/lib_com/residu_fx.c index 5849fb815..e06ef40ea 100644 --- a/lib_com/residu_fx.c +++ b/lib_com/residu_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------* * Residu3_lc_fx: diff --git a/lib_com/rom_com.c b/lib_com/rom_com.c index 58be1cf3f..3bf612bca 100644 --- a/lib_com/rom_com.c +++ b/lib_com/rom_com.c @@ -41,7 +41,7 @@ #include "prot.h" #include "basop_util.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /* clang-format off */ diff --git a/lib_com/scale_mem_fx.c b/lib_com/scale_mem_fx.c index e6ca64931..b3eda3954 100644 --- a/lib_com/scale_mem_fx.c +++ b/lib_com/scale_mem_fx.c @@ -35,7 +35,7 @@ ====================================================================================*/ #include "options.h" /* Common prototypes */ -#include "prot_fx2.h" /* Common prototypes */ +#include "prot_fx.h" /* Common prototypes */ #include "ivas_cnst.h" #include "stl.h" diff --git a/lib_com/stab_est_fx.c b/lib_com/stab_est_fx.c index 52998bbae..2d6a6b141 100644 --- a/lib_com/stab_est_fx.c +++ b/lib_com/stab_est_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/stat_noise_uv_mod_fx.c b/lib_com/stat_noise_uv_mod_fx.c index 4d3badffc..957bae8a3 100644 --- a/lib_com/stat_noise_uv_mod_fx.c +++ b/lib_com/stat_noise_uv_mod_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "cnst.h" /* Function prototypes */ /*---------------------------------------------------------------------* @@ -304,7 +303,7 @@ void stat_noise_uv_mod_fx( Exc2_local[i] = extract_h( L_tmp ); /*Q_local */ move16(); } - *Q_stat_noise = Q_local; /* update for next call, routine can only be called once every frame */ + *Q_stat_noise = Q_local; /* update for next call, routine can only be called once every frame */ move16(); Qdiff = sub( Q_exc, Q_local ); /* local excitation and incoming excitation */ Scale_sig( Exc2_local, L_FRAME, Qdiff ); diff --git a/lib_com/swb_bwe_com_fx.c b/lib_com/swb_bwe_com_fx.c index ff4f55f9f..0ecd34e83 100644 --- a/lib_com/swb_bwe_com_fx.c +++ b/lib_com/swb_bwe_com_fx.c @@ -32,8 +32,7 @@ #include #include "options.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/swb_bwe_com_hr_fx.c b/lib_com/swb_bwe_com_hr_fx.c index da8997a26..cac0ed123 100644 --- a/lib_com/swb_bwe_com_hr_fx.c +++ b/lib_com/swb_bwe_com_hr_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * swb_hr_nonzero_subband_noise_fill() diff --git a/lib_com/swb_bwe_com_lr_fx.c b/lib_com/swb_bwe_com_lr_fx.c index 386db3433..adc98d36a 100644 --- a/lib_com/swb_bwe_com_lr_fx.c +++ b/lib_com/swb_bwe_com_lr_fx.c @@ -33,7 +33,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include diff --git a/lib_com/swb_tbe_com.c b/lib_com/swb_tbe_com.c index 5229543ab..7f9ce0c18 100644 --- a/lib_com/swb_tbe_com.c +++ b/lib_com/swb_tbe_com.c @@ -39,8 +39,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "wmc_auto.h" #include "ivas_prot.h" @@ -1218,7 +1217,7 @@ void GenSHBSynth_fx_32( Word32 *shb_syn_speech_32k, /* o : output highband component Qx*/ Word32 Hilbert_Mem[], /* i/o: memory Qx*/ Word32 state_lsyn_filt_shb_local[], /* i/o: memory Qx*/ - const Word16 L_frame, /* i : ACELP frame length */ + const Word16 L_frame, /* i : ACELP frame length */ Word16 *syn_dm_phase ) { Word32 speech_buf_32k[L_FRAME32k]; @@ -1237,7 +1236,7 @@ void GenSHBSynth_fx_32( // shb_syn_speech_32k[i] = ( ( i % 2 ) == 0 ) ? ( -speech_buf_32k[i] ) : ( speech_buf_32k[i] ); IF( i % 2 == 0 ) { - shb_syn_speech_32k[i] = L_negate( speech_buf_32k[i] ); + shb_syn_speech_32k[i] = L_negate(speech_buf_32k[i]); } ELSE { @@ -1365,7 +1364,7 @@ void ScaleShapedSHB( } #ifdef IVAS_FLOAT_FIXED void ScaleShapedSHB_32( - const Word16 length, /* i : SHB overlap length */ + const Word16 length, /* i : SHB overlap length */ Word32 *synSHB_fx, /* i/o: synthesized shb signal Q_inp/Q_new */ Word32 *overlap_fx, /* i/o: buffer for overlap-add Q_inp/Q_new */ const Word16 *subgain_fx, /* i : subframe gain Q15 */ @@ -1407,7 +1406,7 @@ void ScaleShapedSHB_32( FOR( k = 0; k < shr( length, 1 ); k++ ) { sum_gain_fx = mult_r( subwin_fx[2 * k + 2], subgain_fx[0] ); - mod_syn_fx[add( skip[0], k )] = Mpy_32_16_1( synSHB_fx[add( skip[0], k )], sum_gain_fx ); + mod_syn_fx[add(skip[0] , k)] = Mpy_32_16_1( synSHB_fx[add(skip[0] , k)], sum_gain_fx ); move32(); // Qx mod_syn_fx[add( add( skip[0], k ), shr( length, 1 ) )] = Mpy_32_16_1( synSHB_fx[add( add( skip[0], k ), shr( length, 1 ) )], subgain_fx[0] ); // Qx move32(); @@ -1418,14 +1417,14 @@ void ScaleShapedSHB_32( { L_tmp = L_mult0( subwin_fx[k + 1], subgain_fx[i] ); sum_gain_fx = round_fx( L_mac0( L_tmp, subwin_fx[length - k - 1], subgain_fx[i - 1] ) ); - mod_syn_fx[add( skip[i], k )] = L_shl( Mpy_32_16_1( synSHB_fx[add( skip[i], k )], sum_gain_fx ), 1 ); // Qx + mod_syn_fx[add(skip[i] , k)] = L_shl( Mpy_32_16_1( synSHB_fx[add(skip[i] , k)], sum_gain_fx ), 1 ); // Qx move32(); } } FOR( k = 0; k < shr( length, 1 ); k++ ) { sum_gain_fx = mult_r( subwin_fx[sub( sub( length, shl( k, 1 ) ), 2 )], subgain_fx[i - 1] ); - mod_syn_fx[add( skip[i], k )] = Mpy_32_16_1( synSHB_fx[add( skip[i], k )], sum_gain_fx ); // Qx + mod_syn_fx[add(skip[i] , k)] = Mpy_32_16_1( synSHB_fx[add(skip[i] , k)], sum_gain_fx ); // Qx move32(); } } @@ -1440,21 +1439,21 @@ void ScaleShapedSHB_32( { mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[k + 1], subgain_fx[0] ) ); // Qx move32(); - j = add( j, 1 ); + j = add(j,1); } FOR( i = 0; i < NUM_SHB_SUBGAINS - 1; i++ ) { FOR( k = 0; k < join_length - length; k++ ) { - mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], subgain_fx[i_mult( i, num_join )] ); // Qx + mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], subgain_fx[i_mult(i , num_join)] ); // Qx move32(); j = add( j, 1 ); } FOR( k = 0; k < length; k++ ) { - L_tmp = L_mult0( subwin_fx[length - k - 1], subgain_fx[i_mult( i, num_join )] ); - mod_syn_fx[j] = L_shl( Mpy_32_16_1( synSHB_fx[j], round_fx( L_mac0( L_tmp, subwin_fx[k + 1], subgain_fx[i_mult( ( i + 1 ), num_join )] ) ) ), 1 ); // Qx + L_tmp = L_mult0( subwin_fx[length - k - 1], subgain_fx[i_mult(i , num_join)] ); + mod_syn_fx[j] = L_shl( Mpy_32_16_1( synSHB_fx[j], round_fx( L_mac0( L_tmp, subwin_fx[k + 1], subgain_fx[i_mult(( i + 1 ) , num_join)] ) ) ), 1 ); // Qx move32(); j = add( j, 1 ); } @@ -1467,14 +1466,14 @@ void ScaleShapedSHB_32( } FOR( k = 0; k < length; k++ ) { - mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[sub( sub( length, k ), 1 )], subgain_fx[( NUM_SHB_SUBGAINS - 1 ) * num_join] ) ); // Qx + mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[sub(sub(length , k) , 1)], subgain_fx[( NUM_SHB_SUBGAINS - 1 ) * num_join] ) ); // Qx move32(); j = add( j, 1 ); } } Word16 norm_shift = norm_l( frame_gain_fx ); - if ( frame_gain_fx == 0 ) + if( frame_gain_fx == 0 ) { norm_shift = 31; move16(); @@ -1487,7 +1486,7 @@ void ScaleShapedSHB_32( move16(); FOR( i = 0; i < L_SHB_LAHEAD; i++ ) { - overlap_fx[i] = L_shl( overlap_fx[i], sub( *Q_new, *Q_inp ) ); + overlap_fx[i] = L_shl( overlap_fx[i],sub( *Q_new , *Q_inp) ); move32(); } @@ -1499,6 +1498,7 @@ void ScaleShapedSHB_32( move32(); move32(); move32(); + } FOR( ; i < l_frame; i++ ) @@ -1509,7 +1509,7 @@ void ScaleShapedSHB_32( FOR( ; i < l_frame + l_shb_lahead; i++ ) { - synSHB_fx[i] = L_shl( synSHB_fx[i], sub( *Q_new, *Q_inp ) ); + synSHB_fx[i] = L_shl( synSHB_fx[i],sub( *Q_new , *Q_inp) ); overlap_fx[i - l_frame] = Mpy_32_32( mod_syn_fx[i], Mpy_32_16_1( L_shl( frame_gain_fx, norm_shift ), win_fx[l_frame + l_shb_lahead - 1 - i] ) ); // Q_new move32(); move32(); diff --git a/lib_com/swb_tbe_com_fx.c b/lib_com/swb_tbe_com_fx.c index 42cab91fb..93ffd08a0 100644 --- a/lib_com/swb_tbe_com_fx.c +++ b/lib_com/swb_tbe_com_fx.c @@ -8,8 +8,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" @@ -2998,7 +2997,7 @@ void GenShapedSHBExcitation_ivas_fx( varEnvShape = 32604; move16(); csfilt_num2[0] = 32768 - varEnvShape; - // csfilt_num2[0] = sub( 32767, varEnvShape ); + //csfilt_num2[0] = sub( 32767, varEnvShape ); move16(); neg_csfilt_den2[1] = varEnvShape; move16(); @@ -6373,8 +6372,8 @@ void prep_tbe_exc_ivas_fx( Ltemp2 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /*Q2 * Q10 -> Q12 */ #ifdef BASOP_NOGLOB - Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */ - Ltemp2 = L_shl_o( Ltemp2, add( Q_exc, 4 ) /*Q_exc+16-13*/, &Overflow ); /*Q_exc+16 */ + Ltemp1 = L_shl_o( Ltemp1,add( Q_exc , 6 )/*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */ + Ltemp2 = L_shl_o( Ltemp2,add( Q_exc , 4 )/*Q_exc+16-13*/, &Overflow ); /*Q_exc+16 */ tmp_code_preInt_fx[i] = round_fx_o( L_add_o( Ltemp1, Ltemp2, &Overflow ), &Overflow ); /* Q_exc */ #else /* BASOP_NOGLOB */ @@ -6393,8 +6392,8 @@ void prep_tbe_exc_ivas_fx( /*code in the encoder is Q9 and there is no <<1 with Mult_32_16 Q16 * Q9 -> Q9 */ Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] ); /* Q16 + Q9 + 1 - 16 = Q10 */ #ifdef BASOP_NOGLOB - Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */ - tmp_code_preInt_fx[i] = round_fx_o( Ltemp1, &Overflow ); /* Q_exc */ + Ltemp1 = L_shl_o( Ltemp1, add(Q_exc , 6) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */ + tmp_code_preInt_fx[i] = round_fx_o( Ltemp1, &Overflow ); /* Q_exc */ #else Ltemp1 = L_shl( Ltemp1, Q_exc + 6 /*Q_exc+16-19*/ ); /*Q_exc+16 */ tmp_code_preInt_fx[i] = round_fx( Ltemp1 ); /* Q_exc */ @@ -6404,12 +6403,12 @@ void prep_tbe_exc_ivas_fx( } interp_code_4over2_fx( tmp_code_preInt_fx, tmp_code_fx, L_subfr ); /* o: tmp_code in Q_exc */ - FOR( i = 0; i < shl( L_subfr, 1 ); i++ ) + FOR( i = 0; i < shl(L_subfr , 1); i++ ) { - L_tmp = L_mult( gain_pit_fx, bwe_exc_fx[i + shl( i_subfr_fx, 1 )] ); /*Q14+Q_exc+1 */ + L_tmp = L_mult( gain_pit_fx, bwe_exc_fx[i + shl(i_subfr_fx , 1)] ); /*Q14+Q_exc+1 */ #ifdef BASOP_NOGLOB tmp = round_fx_o( L_shl_o( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/, &Overflow ), &Overflow ); /* tmp in Q_exc */ - bwe_exc_fx[i + shl( i_subfr_fx, 1 )] = add_o( tmp, tmp_code_fx[i], &Overflow ); /*Q_exc */ + bwe_exc_fx[i + shl(i_subfr_fx , 1)] = add_o( tmp, tmp_code_fx[i], &Overflow ); /*Q_exc */ move16(); #else /* BASOP_NOGLOB */ tmp = round_fx( L_shl( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/ ) ); /* tmp in Q_exc */ diff --git a/lib_com/syn_12k8_fx.c b/lib_com/syn_12k8_fx.c index f990b0bc9..4907e8676 100644 --- a/lib_com/syn_12k8_fx.c +++ b/lib_com/syn_12k8_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*===========================================================================*/ diff --git a/lib_com/syn_filt_fx.c b/lib_com/syn_filt_fx.c index 5ce65c316..c30ad59ee 100644 --- a/lib_com/syn_filt_fx.c +++ b/lib_com/syn_filt_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stl.h" static Word32 syn_kern_2( Word32 L_tmp, const Word16 a[], const Word16 y[] ) @@ -460,12 +459,12 @@ void ivas_synth_mem_updt2_fx( } ELSE { - en1_e = sub( 30, shl( Q, 1 ) ); + en1_e = sub(30 ,shl(Q,1)); en2_e = sub( 30, shl( Q, 1 ) ); tmp1 = Sqrt32( en1, &en1_e ); tmp2 = Sqrt32( en2, &en2_e ); tmp = BASOP_Util_Divide3232_Scale( tmp1, tmp2, &tmp_e ); - loc_rat_e = add( sub( en1_e, en2_e ), tmp_e ); + loc_rat_e = add(sub(en1_e , en2_e) , tmp_e); loc_rat = shl_sat( tmp, loc_rat_e ); // Q15 } diff --git a/lib_com/tcq_position_arith_fx.c b/lib_com/tcq_position_arith_fx.c index 2ae9e8505..2c13d89d4 100644 --- a/lib_com/tcq_position_arith_fx.c +++ b/lib_com/tcq_position_arith_fx.c @@ -7,8 +7,7 @@ #include "stl.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" Word32 ar_div( Word32 num, @@ -107,8 +106,8 @@ static UWord32 bitstream_load_bit( } curPos = &pBS->curPos; - bit = UL_and( UL_lshr( pBS->buf[pBS->numByte], ( *curPos ) ), 0x00000001 ); - *curPos = sub( *curPos, 1 ); + bit = UL_and( UL_lshr( pBS->buf[pBS->numByte] , ( *curPos ) ) , 0x00000001 ); + *curPos = sub(*curPos, 1); IF( *curPos < 0 ) { @@ -406,7 +405,7 @@ static Word16 ar_decode_fx( arInst->value = value; move32(); - return ( sub( symbol, 1 ) ); + return ( sub(symbol , 1) ); } void ar_decoder_done_fx( @@ -668,7 +667,7 @@ static void TCQnew_fx( move16(); if ( v_fx[i - 1] <= 0 ) { - vout_fx[i - 1] = negate( quant_fx[position][i] ); + vout_fx[i - 1] = negate(quant_fx[position][i]); move16(); } position = path_fx[position][i]; @@ -1739,7 +1738,7 @@ Word32 encode_position_ari_fx( btcq_fx = GetBitsFromPulses_fx( pulses, size ); /* Estimate TCQ bits */ bits_fx = L_sub( table_logcum_fx[size + 1], L_add( table_logcum_fx[nz + 1], table_logcum_fx[add( sub( size, nz ), 1 )] ) ); - bits_fx = L_add( bits_fx, L_sub( btcq_fx, L_sub( table_logcum_fx[size + 1], L_add( table_logcum_fx[nz + 1], table_logcum_fx[add( sub( size, nz ), 1 )] ) ) ) ); + bits_fx = L_add( bits_fx, L_sub( btcq_fx, L_sub( table_logcum_fx[size + 1], L_add( table_logcum_fx[nz + 1], table_logcum_fx[add(sub( size, nz ) , 1)] ) ) ) ); bits_fx = L_sub( bits_fx, L_sub( table_logcum_fx[pulses], L_add( table_logcum_fx[nz], table_logcum_fx[add( pulses, sub( nz, 1 ) )] ) ) ); bits_fx = L_sub( bits_fx, nz ); *est_bits_frame_fx = L_add( *est_bits_frame_fx, bits_fx ); @@ -2217,7 +2216,7 @@ void decode_position_ari_fx( test(); test(); - IF( ( mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] == 0 && scp > 0 ) || EQ_16( mode_num_nz[sub( sub( i, storepos ), stpos )], mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] ) ) + IF( ( mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] == 0 && scp > 0 ) || EQ_16( mode_num_nz[sub( sub( i, storepos ), stpos )] , mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] ) ) { mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] = 0; move16(); @@ -2405,7 +2404,7 @@ void decode_magnitude_usq_fx( } magnp = sub( magnp, out[magncout] ); magnzp = sub( magnzp, 1 ); - magncout = add( magncout, 1 ); + magncout = add(magncout, 1 ); IF( magnzp == 0 ) /* last magnitude generation */ { @@ -2528,7 +2527,7 @@ void decode_mangitude_tcq_fx( exp1 = sub( norm_s( num ), 1 ); exp2 = norm_s( denum ); prob1_fx = div_s( shl( num, exp1 ), shl( denum, exp2 ) ); /*15 + exp1 - exp2 */ - exp = add( 15, sub( exp1, exp2 ) ); + exp = add(15 , sub(exp1 , exp2)); prob1_fx = shl( prob1_fx, sub( 15, exp ) ); prob0_fx = sub( MAX_16, prob1_fx ); } @@ -2658,7 +2657,7 @@ Word16 GetScale_fx( Word16 pulses = MAX_PULSES, p_est, exp, exp1, exp2, magicnum; move16(); Word32 t, a, b, ab, estbits_fx = 0; - move32(); + move32(); magicnum = 24773; move16(); /*Q17: 0.188992013101951f; */ diff --git a/lib_com/tcx_ltp_fx.c b/lib_com/tcx_ltp_fx.c index 134e861af..59ab1d55e 100644 --- a/lib_com/tcx_ltp_fx.c +++ b/lib_com/tcx_ltp_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "basop_util.h" #include "rom_com.h" @@ -665,7 +664,7 @@ static void tcx_ltp_synth_filter32( L_tmp2 = Mpy_32_16_r( L_tmp2, alpha ); #ifdef BASOP_NOGLOB L_tmp2 = L_add_sat( synth[j], L_tmp2 ); - if ( zir != NULL ) + if( zir != NULL ) { L_tmp2 = L_sub_sat( L_tmp2, zir[j] ); } @@ -728,7 +727,7 @@ static void tcx_ltp_synth_filter_10( assert( GE_16( filtIdx, 0 ) ); w0 = &tcxLtpFilters[filtIdx].filt[pitch_fr]; - w1 = &tcxLtpFilters[filtIdx].filt[sub( pitch_res, pitch_fr )]; + w1 = &tcxLtpFilters[filtIdx].filt[sub(pitch_res , pitch_fr)]; v0 = &tcxLtpFilters[filtIdx].filt[0]; v1 = &tcxLtpFilters[filtIdx].filt[pitch_res]; L = tcxLtpFilters[filtIdx].length; @@ -797,7 +796,7 @@ static void tcx_ltp_synth_filter_10_fx( curr_gain = gain; move16(); - gain_step = idiv1616( negate( gain ), length ); // TODO + gain_step = idiv1616(negate( gain ) , length); // TODO for ( j = 0; j < length; j++ ) { @@ -861,8 +860,8 @@ static void tcx_ltp_synth_filter_01( curr_gain = 0; move16(); - // gain_step = gain / length; // TODO - gain_step = idiv1616( gain, length ); // TODO + //gain_step = gain / length; // TODO + gain_step = idiv1616(gain , length); // TODO for ( j = 0; j < length; j++ ) { @@ -927,8 +926,8 @@ static void tcx_ltp_synth_filter_01_fx( curr_gain = 0; move16(); - // gain_step = gain / length; // TODO - gain_step = idiv1616( gain, length ); // TODO + //gain_step = gain / length; // TODO + gain_step = idiv1616(gain , length); // TODO for ( j = 0; j < length; j++ ) { @@ -1027,8 +1026,8 @@ static void tcx_ltp_synth_filter_11_unequal_pitch( /* 1. decreasing gain filter. The first filter unit with the parameters associated to the previous interval and scaling towards 0 */ gain = prev_gain; move16(); - // gain_step = negate( prev_gain ) / length; // TODO - gain_step = idiv1616( negate( prev_gain ), length ); // TODO + //gain_step = negate( prev_gain ) / length; // TODO + gain_step = idiv1616(negate( prev_gain ) , length); // TODO for ( j = 0; j < length; j++ ) { @@ -1156,7 +1155,7 @@ static void tcx_ltp_synth_filter_11_unequal_pitch_fx( /* 1. decreasing gain filter. The first filter unit with the parameters associated to the previous interval and scaling towards 0 */ gain = prev_gain; move16(); - gain_step = idiv1616( negate( prev_gain ), length ); // TODOD + gain_step = idiv1616(negate( prev_gain ) , length); // TODOD for ( j = 0; j < length; j++ ) { @@ -1359,7 +1358,7 @@ void tcx_ltp_post( move16(); } - IF( core == ACELP_CORE ) + IF( core == ACELP_CORE ) { bfi = 0; move16(); @@ -1421,7 +1420,7 @@ void tcx_ltp_post( ELSE IF( bfi == 0 ) { /* LTP and good frame */ - test(); + test(); IF( EQ_16( st->element_mode, EVS_MONO ) ) /* hard tunings for EVS_MONO, HQ_48k is TCX only */ { IF( NE_16( output_frame, L_frame_core ) ) @@ -1580,20 +1579,20 @@ void tcx_ltp_post( test(); // #ifdef IVAS_CODE_TCX_LTP if ( st->element_mode != EVS_MONO ) - { - test(); - test(); - test(); - test(); - test(); - test(); - test(); - IF( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev == 0 ) + { + test(); + test(); + test(); + test(); + test(); + test(); + test(); + IF ( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev == 0 ) { /* The filtering is deactivated, just copy input to the output */ Copy( sig_in + delay, sig_out + delay, L_transition ); } - ELSE IF( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev != 0 ) + ELSE IF ( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev != 0 ) { /* Filtering with the first filter unit */ tcx_ltp_synth_filter_10( sig_out + delay, sig_in + delay, L_transition, hTcxLtpDec->tcxltp_pitch_int_post_prev, hTcxLtpDec->tcxltp_pitch_fr_post_prev, hTcxLtpDec->tcxltp_gain_post_prev, st->pit_res_max_past, hTcxLtpDec->tcxltp_filt_idx_prev ); @@ -1603,7 +1602,7 @@ void tcx_ltp_post( /* Filtering with the second filter unit */ tcx_ltp_synth_filter_01( sig_out + delay, sig_in + delay, L_transition, pitch_int, pitch_fr, gain, st->pit_res_max, filtIdx ); } - ELSE IF( EQ_16( gain, hTcxLtpDec->tcxltp_gain_post_prev ) && EQ_16( pitch_int, hTcxLtpDec->tcxltp_pitch_int_post_prev ) && EQ_16( pitch_fr, hTcxLtpDec->tcxltp_pitch_fr_post_prev ) && EQ_16( st->pit_res_max, st->pit_res_max_past ) && EQ_16( filtIdx, hTcxLtpDec->tcxltp_filt_idx_prev ) ) + ELSE IF( EQ_16(gain ,hTcxLtpDec->tcxltp_gain_post_prev )&& EQ_16(pitch_int , hTcxLtpDec->tcxltp_pitch_int_post_prev) && EQ_16(pitch_fr, hTcxLtpDec->tcxltp_pitch_fr_post_prev )&& EQ_16(st->pit_res_max , st->pit_res_max_past )&& EQ_16(filtIdx , hTcxLtpDec->tcxltp_filt_idx_prev )) { tcx_ltp_synth_filter( sig_out + delay, sig_in + delay, L_transition, pitch_int, pitch_fr, gain, st->pit_res_max, NULL, 0, filtIdx ); } @@ -1617,10 +1616,10 @@ void tcx_ltp_post( ELSE // #endif { - test(); - test(); - test(); - test(); + test(); + test(); + test(); + test(); IF( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev == 0 ) { Copy( sig_in + delay, sig_out + delay, L_transition ); diff --git a/lib_com/tcx_mdct_fx.c b/lib_com/tcx_mdct_fx.c index f66ea0d76..f2f93d9ec 100644 --- a/lib_com/tcx_mdct_fx.c +++ b/lib_com/tcx_mdct_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" static Word16 TCX_MDCT_GetScaleFactor( @@ -126,7 +125,7 @@ void TCX_MDCT( FOR( i = 0; i < l / 2; i++ ) { #ifdef BASOP_NOGLOB - y[add( add( add( shr( m, 1 ), shr( r, 1 ) ), shr( m, 1 ) ), i )] = L_msu_o( L_mult( x[i], factor ), x[sub( sub( l, 1 ), i )], factor, &Overflow ); + y[add( add( add( shr( m, 1 ), shr( r, 1 ) ), shr( m, 1 ) ), i )] = L_msu_o( L_mult( x[i], factor ), x[sub(sub(l , 1) , i)], factor, &Overflow ); #else /* BASOP_NOGLOB */ y[m / 2 + r / 2 + m / 2 + i] = L_msu( L_mult( x[i], factor ), x[l - 1 - i], factor ); #endif /* BASOP_NOGLOB */ @@ -134,13 +133,13 @@ void TCX_MDCT( } FOR( i = 0; i < m / 2; i++ ) { - y[sub( sub( add( shr( m, 1 ), shr( r, 1 ) ), 1 ), i )] = L_mult( x[add( add( l, shr( m, 1 ) ), i )], neg_factor ); + y[sub( sub( add( shr( m, 1 ), shr( r, 1 ) ), 1 ), i )] = L_mult( x[add(add(l , shr(m ,1)) , i)], neg_factor ); move32(); } FOR( i = 0; i < r / 2; i++ ) { #ifdef BASOP_NOGLOB - y[sub( sub( sub( add( shr( m, 1 ), shr( r, 1 ) ), 1 ), shr( m, 1 ) ), i )] = L_mac_o( L_mult( x[add( add( l, m ), i )], neg_factor ), x[sub( sub( add( add( l, m ), r ), 1 ), i )], neg_factor, &Overflow ); + y[sub( sub( sub( add( shr( m, 1 ), shr( r, 1 ) ), 1 ), shr( m, 1 ) ), i )] = L_mac_o( L_mult( x[add( add( l, m ), i )], neg_factor ), x[sub(sub(add(add(l , m) , r) , 1) , i)], neg_factor, &Overflow ); #else /* BASOP_NOGLOB */ y[m / 2 + r / 2 - 1 - m / 2 - i] = L_mac( L_mult( x[l + m + i], neg_factor ), x[l + m + r - 1 - i], neg_factor ); #endif /* BASOP_NOGLOB */ @@ -189,7 +188,7 @@ void TCX_MDST( FOR( i = 0; i < l / 2; i++ ) { #ifdef BASOP_NOGLOB - y[add( add( add( shr( m, 1 ), shr( r, 1 ) ), shr( m, 1 ) ), i )] = L_msu_o( L_mult( x[i], neg_factor ), x[sub( sub( l, 1 ), i )], factor, &Overflow ); + y[add( add( add( shr(m ,1), shr(r ,1) ), shr(m ,1) ), i )] = L_msu_o( L_mult( x[i], neg_factor ), x[sub(sub(l , 1) , i)], factor, &Overflow ); #else /* BASOP_NOGLOB */ y[m / 2 + r / 2 + m / 2 + i] = L_msu( L_mult( x[i], neg_factor ), x[l - 1 - i], factor ); #endif @@ -251,7 +250,7 @@ void TCX_MDCT_Inverse( FOR( i = 0; i < R2; i++ ) { #ifdef BASOP_NOGLOB - y[add( add( add( l, m ), R2 ), i )] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[add( L2, i )], negfac ), s ) ); /* fold out right end of DCT */ + y[add(add(add(l , m) , R2) , i)] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[add(L2 , i)], negfac ), s ) ); /* fold out right end of DCT */ #else y[l + m + R2 + i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[L2 + i], negfac ), s ) ); /* fold out right end of DCT */ #endif @@ -262,7 +261,7 @@ void TCX_MDCT_Inverse( FOR( i = 0; i < L2; i++ ) { #ifdef BASOP_NOGLOB - y[i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[add( add( add( L2, m ), R2 ), i )], fac ), s ) ); /* negate, fold out left end of DCT */ + y[i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[add(add(add(L2 , m) , R2) , i)], fac ), s ) ); /* negate, fold out left end of DCT */ #else y[i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[L2 + m + R2 + i], fac ), s ) ); /* negate, fold out left end of DCT */ #endif @@ -320,7 +319,7 @@ void TCX_MDST_Inverse_fx( FOR( i = 0; i < R2; i++ ) { - y[add( add( add( l, m ), R2 ), i )] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( L2, i )], fac ), s ) ); /* fold out right end of DCT */ + y[add(add(add(l , m) , R2) , i)] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add(L2 , i)], fac ), s ) ); /* fold out right end of DCT */ move16(); } @@ -335,7 +334,7 @@ void TCX_MDST_Inverse_fx( Word16 f; f = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( L2, i )], fac ), s ) ); - y[add( L2, i )] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[sub( sub( add( add( l, m ), R2 ), 1 ), i )], negfac ), s ) ); /* time-reverse mid of DCT */ + y[add(L2 , i)] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[sub( sub( add( add( l, m ), R2 ), 1 ), i )], negfac ), s ) ); /* time-reverse mid of DCT */ move16(); y[sub( sub( add( add( l, m ), R2 ), 1 ), i )] = negate( f ); @@ -367,7 +366,7 @@ void TCX_MDXT_Inverse_fx( set32_fx( tmp_buf, 0, N_MAX + L_MDCT_OVLP_MAX / 2 ); - edxt_fx( x, tmp_buf + L2, add( add( L2, m ), R2 ), kernel_type, TRUE ); + edxt_fx( x, tmp_buf + L2, add(add(L2 , m) , R2), kernel_type, TRUE ); fac = TCX_MDCT_Inverse_GetScaleFactor( add( add( shr( l, 1 ), m ), shr( r, 1 ) ), &fac_e ); x_e = add( x_e, fac_e ); @@ -381,8 +380,8 @@ void TCX_MDXT_Inverse_fx( { signLeft = fac; } - // signRight = ( kernel_type & 1 ? fac : negfac ); - IF( L_and( kernel_type, 1 ) ) + //signRight = ( kernel_type & 1 ? fac : negfac ); + IF ( L_and( kernel_type, 1 ) ) { signRight = fac; } @@ -396,24 +395,24 @@ void TCX_MDXT_Inverse_fx( FOR( i = 0; i < L2; i++ ) { - y[i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( add( add( L2, m ), R2 ), i )], signLeft ), s ) ); /* fold out the left end */ + y[i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add(add(add(L2 , m) , R2) , i)], signLeft ), s ) ); /* fold out the left end */ } FOR( i = 0; i < R2; i++ ) { - y[add( add( add( l, m ), R2 ), i )] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( L2, i )], signRight ), s ) ); /* ...and right end */ + y[add(add(add(l , m) , R2) , i)] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add(L2 , i)], signRight ), s ) ); /* ...and right end */ move16(); } - FOR( i = 0; i < ( ( add( add( L2, m ), R2 ) ) >> 1 ); i++ ) + FOR( i = 0; i < ( ( add(add(L2 , m) , R2) ) >> 1 ); i++ ) { - f = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( L2, i )], negfac ), s ) ); + f = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add(L2 , i)], negfac ), s ) ); - y[add( L2, i )] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[sub( sub( add( add( l, m ), R2 ), 1 ), i )], negfac ), s ) ); /* time-reverse mid of DCT */ + y[add(L2 , i)] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[sub(sub(add(add(l , m) , R2) , 1) , i)], negfac ), s ) ); /* time-reverse mid of DCT */ move16(); - y[sub( sub( add( add( l, m ), R2 ), 1 ), i )] = f; + y[sub(sub(add(add(l , m) , R2) , 1) , i)] = f; move16(); } diff --git a/lib_com/tcx_mdct_window.c b/lib_com/tcx_mdct_window.c index 8276f07d4..de929cff7 100644 --- a/lib_com/tcx_mdct_window.c +++ b/lib_com/tcx_mdct_window.c @@ -40,8 +40,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "wmc_auto.h" @@ -116,11 +115,11 @@ void mdct_window_sine_IVAS_updated( const Word16 window_type, const Word16 element_mode ) { - IF( EQ_16( element_mode, EVS_MONO ) ) + IF (EQ_16( element_mode , EVS_MONO )) { const PWord16 *table; table = getSineWindowTable( n ); - FOR( Word32 i = 0; i < shr( n, 1 ); i++ ) + FOR ( Word32 i = 0; i < shr( n, 1 ); i++ ) { window[i].v.re = table[i].v.re; move16(); @@ -135,8 +134,8 @@ void mdct_window_sine_IVAS_updated( Word16 buf_in_size = 0; move16(); Word16 temp[420]; - set16_fx( temp, 0, 420 ); - SWITCH( window_type ) + set16_fx(temp, 0, 420); + SWITCH ( window_type ) { case FULL_OVERLAP: window_table = tcx_mdct_window_48_fx; @@ -159,7 +158,7 @@ void mdct_window_sine_IVAS_updated( BREAK; } - IF( EQ_32( Fs, 48000 ) ) + IF( EQ_32( Fs , 48000 )) { Copy( window_table, temp, n ); } @@ -168,7 +167,7 @@ void mdct_window_sine_IVAS_updated( lerp( window_table, temp, n, buf_in_size ); } - FOR( Word32 i = 0; i < shr( n, 1 ); i++ ) + FOR ( Word32 i = 0; i < shr(n, 1); i++ ) { window[i].v.re = temp[n - 1 - i]; move16(); @@ -187,7 +186,7 @@ void mdct_window_sine( PWord16 *window, Word16 n ) { const PWord16 *table; table = getSineWindowTable( n ); - FOR( Word32 i = 0; i < shr( n, 1 ); i++ ) + FOR ( Word32 i = 0; i < shr(n, 1); i++ ) { window[i].v.re = table[i].v.re; move16(); diff --git a/lib_com/tcx_utils_fx.c b/lib_com/tcx_utils_fx.c index e5d9f1478..ed8ea7013 100644 --- a/lib_com/tcx_utils_fx.c +++ b/lib_com/tcx_utils_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_basop_util.h" #include "basop_util.h" @@ -889,7 +888,7 @@ void lpc2mdct_2( BASOP_cfft_ivas( RealData_fx, ImagData_fx, 1, &scale ); /*Get amplitude*/ - j = sub( FDNS_NPTS, 1 ); + j = sub(FDNS_NPTS , 1); move16(); k = 0; move16(); @@ -1973,7 +1972,7 @@ void tcx_noise_filling_with_shift( } Q[i] = L_shl( Q[i], nrm ); move32(); - new_Q_e[i] = sub( 31, nrm ); + new_Q_e[i] = sub(31 , nrm); tmp1 = shr( seed, 4 ); nrg = L_mac0( nrg, tmp1, tmp1 ); /* sum up energy of current noise segment */ diff --git a/lib_com/tec_com.c b/lib_com/tec_com.c index d702c4330..380fc0c09 100644 --- a/lib_com/tec_com.c +++ b/lib_com/tec_com.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "rom_com.h" @@ -655,7 +654,7 @@ void calcGainTemp_TBE_Fx( startPos, stopPos, bandOffset, - sub( 15, cldfb_exp ) ); + sub(15 , cldfb_exp) ); IF( code > 0 ) { @@ -1031,7 +1030,7 @@ static Word16 procTec_Fx( s = norm_s( hb_synth_Fx[k] ); hb_synth_Fx[k] = mult_r( gain_m[i], shl( hb_synth_Fx[k], s ) ); move16(); - shift[k] = sub( s, gain_e[i] ); + shift[k] = sub(s , gain_e[i]); if ( GT_16( min_shift, shift[k] ) ) { diff --git a/lib_com/tns_base.c b/lib_com/tns_base.c index b0b8bb8e3..9aafaddba 100644 --- a/lib_com/tns_base.c +++ b/lib_com/tns_base.c @@ -10,8 +10,7 @@ #include "stat_com.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" /*---------------------------------------------------------------------------- diff --git a/lib_com/tools.c b/lib_com/tools.c index 4b1d12be2..a2912019d 100644 --- a/lib_com/tools.c +++ b/lib_com/tools.c @@ -38,9 +38,8 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" -#include "prot_fx1.h" /*------------------------------------------------------------------* * own_random() diff --git a/lib_com/tools_fx.c b/lib_com/tools_fx.c index c0f402d61..919da71e3 100644 --- a/lib_com/tools_fx.c +++ b/lib_com/tools_fx.c @@ -45,8 +45,7 @@ #include "stl.h" #include #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "basop32.h" #include "wmc_auto.h" diff --git a/lib_com/trans_direct_fx.c b/lib_com/trans_direct_fx.c index 32d94aa49..5752de723 100644 --- a/lib_com/trans_direct_fx.c +++ b/lib_com/trans_direct_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common FX constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Function prototypes */ /*------------------------------------------------------------------- diff --git a/lib_com/trans_inv_fx.c b/lib_com/trans_inv_fx.c index 70746dba9..5f712b1b5 100644 --- a/lib_com/trans_inv_fx.c +++ b/lib_com/trans_inv_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Function prototypes */ #include "rom_dec.h" diff --git a/lib_com/vlpc_2st_com_fx.c b/lib_com/vlpc_2st_com_fx.c index f25e8bbf0..c54e5632f 100644 --- a/lib_com/vlpc_2st_com_fx.c +++ b/lib_com/vlpc_2st_com_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "control.h" #include "basop_util.h" diff --git a/lib_com/weight_a_fx.c b/lib_com/weight_a_fx.c index 61f453a20..99b621fa5 100644 --- a/lib_com/weight_a_fx.c +++ b/lib_com/weight_a_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include /*------------------------------------------------------------------ diff --git a/lib_com/weight_fx.c b/lib_com/weight_fx.c index 5b5005faf..2d9999736 100644 --- a/lib_com/weight_fx.c +++ b/lib_com/weight_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*--------------------------------------------------------------------------* * sfm2mqb_fx() diff --git a/lib_com/wi_fx.c b/lib_com/wi_fx.c index 391f6d9e5..233a2f6ba 100644 --- a/lib_com/wi_fx.c +++ b/lib_com/wi_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "log2.h" diff --git a/lib_com/window_fx.c b/lib_com/window_fx.c index 6ef8081fd..97443e3b5 100644 --- a/lib_com/window_fx.c +++ b/lib_com/window_fx.c @@ -7,7 +7,6 @@ #include "options.h" #include #include "basop_util.h" -#include "prot_fx1.h" #define PI_HALF_0Q15 51472 /* ~=round(pi/2*2^15) */ #define PI2_15Q16 0x0006487F /* ~=round(2*PI*2^16) */ @@ -19,7 +18,7 @@ #define P92_0Q15 30147 /* ~=round(0.92*2^15) */ #include "options.h" #include "rom_basop_util.h" -#include "prot_fx2.h" +#include "prot_fx.h" void ham_cos_window( diff --git a/lib_com/window_ola_fx.c b/lib_com/window_ola_fx.c index ac7e63d8a..20051c051 100644 --- a/lib_com/window_ola_fx.c +++ b/lib_com/window_ola_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_com/wtda.c b/lib_com/wtda.c index 868cd7057..f1b47ee6c 100644 --- a/lib_com/wtda.c +++ b/lib_com/wtda.c @@ -42,7 +42,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED /*--------------------------------------------------------------------------* diff --git a/lib_com/wtda_fx.c b/lib_com/wtda_fx.c index 07699e408..f6a2c5acd 100644 --- a/lib_com/wtda_fx.c +++ b/lib_com/wtda_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* required by wmc_tool */ -#include "prot_fx2.h" /* required by wmc_tool */ +#include "prot_fx.h" /* required by wmc_tool */ #include "stat_com.h" /*--------------------------------------------------------------------------* * mvr2r_inv() diff --git a/lib_dec/ACcontextMapping_dec_fx.c b/lib_dec/ACcontextMapping_dec_fx.c index 01298f6dd..92dddd54f 100644 --- a/lib_dec/ACcontextMapping_dec_fx.c +++ b/lib_dec/ACcontextMapping_dec_fx.c @@ -9,8 +9,7 @@ #include "rom_dec.h" #include "basop_util.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_dec/FEC_HQ_core.c b/lib_dec/FEC_HQ_core.c index f87cc884f..68f7d72de 100644 --- a/lib_dec/FEC_HQ_core.c +++ b/lib_dec/FEC_HQ_core.c @@ -43,8 +43,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif #ifndef IVAS_FLOAT_FIXED @@ -1558,7 +1557,7 @@ void save_synthesis_hq_fec_fx( move16(); BREAK; case IVAS_CPE_DFT: - IF( EQ_16( hCPE->nchan_out, 1 ) && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) + IF( EQ_16(hCPE->nchan_out , 1) && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) { post_hq_delay = NS2SA( st->output_Fs, DELAY_CLDFB_NS ); move16(); @@ -1582,10 +1581,10 @@ void save_synthesis_hq_fec_fx( test(); IF( ( EQ_16( st->codec_mode, MODE1 ) && st->hTcxDec != NULL ) && ( ( EQ_16( st->core, ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) ) || EQ_16( st->core, HQ_CORE ) ) ) { - Copy( st->hTcxDec->synth_history_fx + output_frame, st->hTcxDec->synth_history_fx, add( sub( output_frame, post_hq_delay ), NS2SA( st->output_Fs, PH_ECU_MEM_NS ) ) ); + Copy( st->hTcxDec->synth_history_fx + output_frame, st->hTcxDec->synth_history_fx, add(sub(output_frame , post_hq_delay) , NS2SA( st->output_Fs, PH_ECU_MEM_NS )) ); FOR( Word16 i = 0; i < output_frame; i++ ) { - st->hTcxDec->old_synthFB_fx[sub( add( i, output_frame ), post_hq_delay )] = extract_h( output_fx[i] ); + st->hTcxDec->old_synthFB_fx[sub(add(i , output_frame) , post_hq_delay)] = extract_h( output_fx[i] ); move16(); } @@ -1594,27 +1593,27 @@ void save_synthesis_hq_fec_fx( /* reset the remaining buffer, which is read in TCX concealment the necessary samples to fill this buffer are not available for all cases, the impact on the output is limited */ - set16_fx( st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), 0, post_hq_delay ); + set16_fx( st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , post_hq_delay), 0, post_hq_delay ); IF( GE_16( output_frame, L_FRAME16k ) ) { - Copy( st->prev_synth_buffer_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ); + Copy( st->prev_synth_buffer_fx, st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS )), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ); } ELSE { - Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); + Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl(output_frame, 1), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); } IF( st->core != ACELP_CORE ) { IF( GE_16( output_frame, L_FRAME16k ) ) { - Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ); - Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); + Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , NS2SA( st->output_Fs, DELAY_CLDFB_NS )), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ); + Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl(output_frame, 1), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); } ELSE { - Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ); - Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); + Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS )), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ); + Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS )), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); } } } @@ -1622,8 +1621,8 @@ void save_synthesis_hq_fec_fx( { IF( st->core != ACELP_CORE ) { - Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), post_hq_delay ); - Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); + Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , post_hq_delay), post_hq_delay ); + Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl(output_frame, 1), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); } } } diff --git a/lib_dec/FEC_HQ_core_fx.c b/lib_dec/FEC_HQ_core_fx.c index 2a375498e..9c9991330 100644 --- a/lib_dec/FEC_HQ_core_fx.c +++ b/lib_dec/FEC_HQ_core_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_dec/FEC_HQ_phase_ecu_fx.c b/lib_dec/FEC_HQ_phase_ecu_fx.c index 7d75f0029..921f4e09f 100644 --- a/lib_dec/FEC_HQ_phase_ecu_fx.c +++ b/lib_dec/FEC_HQ_phase_ecu_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "rom_dec.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" @@ -610,9 +609,9 @@ static void trans_ana_fx( #endif att_val = 32767; move16(); - IF( *pGrPowRight > 0 ) + IF ( *pGrPowRight > 0 ) { - IF( LT_32( *pGrPowRight, *pGrPowLeft ) ) /* i.e., (gr_pow_right/gr_pow_left) < 1.0 */ + IF ( LT_32( *pGrPowRight, *pGrPowLeft ) ) /* i.e., (gr_pow_right/gr_pow_left) < 1.0 */ { /* Compute sqrt(grp_pow_chg), where grp_pow_chg = gr_pow_right/gr_pow_left. */ tmp16 = ratio( *pGrPowRight, *pGrPowLeft, &expo ); /* tmp16 in Q14 */ @@ -666,7 +665,7 @@ static void trans_ana_fx( mag_chg[k] = mult_r( mag_chg_1st[k], att_val ); /* Q15 */ move16(); - IF( GT_16( burst_len, BETA_MUTE_THR ) ) + IF ( GT_16( burst_len, BETA_MUTE_THR ) ) { *beta_mute = shr( *beta_mute, 1 ); move16(); @@ -753,7 +752,7 @@ static void ivas_peakfinder_fx( pDx0 = pDx01 + 1; len = 0; move16(); - IF( endpoints ) + IF ( endpoints ) { *pX++ = *pX0++; move16(); @@ -769,7 +768,7 @@ static void ivas_peakfinder_fx( FOR( i = 0; i < len0Minus2; i++ ) { - IF( s_xor( *pDx01++, *pDx0++ ) < 0 ) /* Detect sign change. */ + IF ( s_xor( *pDx01++, *pDx0++ ) < 0 ) /* Detect sign change. */ { *pInd++ = add( i, 1 ); move16(); @@ -779,7 +778,7 @@ static void ivas_peakfinder_fx( } pX0++; } - IF( endpoints ) + IF ( endpoints ) { *pInd = len0Minus1; move16(); @@ -803,7 +802,7 @@ static void ivas_peakfinder_fx( move16(); threshold = add( leftMin, sel ); - IF( len > 0 ) + IF ( len > 0 ) { /* Deal with first point a little differently since tacked it on Calculate the sign of the derivative since we took the first point @@ -821,7 +820,7 @@ static void ivas_peakfinder_fx( { ii = -1; move16(); - IF( GE_16( xAt1, xAt2 ) ) /* x[1] is not extremum -> overwrite with x[0] */ + IF ( GE_16( xAt1, xAt2 ) ) /* x[1] is not extremum -> overwrite with x[0] */ { *pX = xAt0; /* x[1] = x[0] */ move16(); @@ -855,7 +854,7 @@ static void ivas_peakfinder_fx( // PMTE () ii = -1; /* First point is a peak */ move16(); - IF( GE_16( len, 2 ) ) + IF ( GE_16( len, 2 ) ) { if ( GE_16( x[1], x[0] ) ) { @@ -873,14 +872,14 @@ static void ivas_peakfinder_fx( ii = add( ii, 1 ); /* This is a peak */ /* Make sure we don't iterate past the length of our vector */ - IF( GE_16( ii, lenMinus1 ) ) + IF ( GE_16( ii, lenMinus1 ) ) { BREAK; } /*Reset peak finding if we had a peak and the next peak is bigger than the last or the left min was small enough to reset.*/ - IF( foundPeak > 0 ) + IF ( foundPeak > 0 ) { tempMag = minMag; move16(); @@ -890,9 +889,9 @@ static void ivas_peakfinder_fx( /* Found new peak that was larger than temp mag and selectivity larger than the minimum to its left. */ - IF( GT_16( *( ++pX ), tempMag ) ) + IF ( GT_16( *( ++pX ), tempMag ) ) { - IF( GT_16( *pX, threshold ) ) /* threshold = leftMin + sel */ + IF ( GT_16( *pX, threshold ) ) /* threshold = leftMin + sel */ { tempLoc = ii; move16(); @@ -905,9 +904,9 @@ static void ivas_peakfinder_fx( pX++; /* Come down at least sel from peak */ - IF( foundPeak == 0 ) + IF ( foundPeak == 0 ) { - IF( GT_16( tempMag, add( sel, *pX ) ) ) + IF ( GT_16( tempMag, add( sel, *pX ) ) ) { foundPeak = 1; /* We have found a peak */ move16(); @@ -922,9 +921,9 @@ static void ivas_peakfinder_fx( move16(); } } - IF( foundPeak == 0 ) /* The above IF-block has not found the peak yet. */ + IF ( foundPeak == 0 ) /* The above IF-block has not found the peak yet. */ { - IF( LT_16( *pX, leftMin ) ) /* New left minimum */ + IF ( LT_16( *pX, leftMin ) ) /* New left minimum */ { leftMin = *pX; move16(); @@ -934,9 +933,9 @@ static void ivas_peakfinder_fx( } /* Check end point */ - IF( GT_16( x[lenMinus1], tempMag ) ) + IF ( GT_16( x[lenMinus1], tempMag ) ) { - IF( GT_16( x[lenMinus1], threshold ) ) /* threshold = leftMin + sel */ + IF ( GT_16( x[lenMinus1], threshold ) ) /* threshold = leftMin + sel */ { peakLoc[*cInd] = lenMinus1; move16(); @@ -948,9 +947,9 @@ static void ivas_peakfinder_fx( move16(); } } - IF( foundPeak == 0 ) /* Check if we still need to add the last point */ + IF ( foundPeak == 0 ) /* Check if we still need to add the last point */ { - IF( GT_16( tempMag, minMag ) ) + IF ( GT_16( tempMag, minMag ) ) { peakLoc[*cInd] = tempLoc; move16(); @@ -1069,7 +1068,7 @@ static void peakfinder_fx( FOR( i = 0; i < len0Minus2; i++ ) { - IF( s_xor( *pDx01++, *pDx0++ ) < 0 ) /* Detect sign change. */ + IF ( s_xor( *pDx01++, *pDx0++ ) < 0 ) /* Detect sign change. */ { *pInd++ = add( i, 1 ); move16(); @@ -1188,7 +1187,7 @@ static void peakfinder_fx( /*Reset peak finding if we had a peak and the next peak is bigger than the last or the left min was small enough to reset.*/ - IF( foundPeak > 0 ) + IF ( foundPeak > 0 ) { tempMag = minMag; move16(); @@ -1198,9 +1197,9 @@ static void peakfinder_fx( /* Found new peak that was larger than temp mag and selectivity larger than the minimum to its left. */ - IF( GT_16( *( ++pX ), tempMag ) ) + IF ( GT_16( *( ++pX ), tempMag ) ) { - IF( GT_16( *pX, threshold ) ) /* threshold = leftMin + sel */ + IF ( GT_16( *pX, threshold ) ) /* threshold = leftMin + sel */ { tempLoc = ii; move16(); @@ -1213,9 +1212,9 @@ static void peakfinder_fx( pX++; /* Come down at least sel from peak */ - IF( foundPeak == 0 ) + IF ( foundPeak == 0 ) { - IF( GT_16( tempMag, add( sel, *pX ) ) ) + IF ( GT_16( tempMag, add( sel, *pX ) ) ) { foundPeak = 1; /* We have found a peak */ move16(); @@ -1230,9 +1229,9 @@ static void peakfinder_fx( move16(); } } - IF( foundPeak == 0 ) /* The above IF-block has not found the peak yet. */ + IF ( foundPeak == 0 ) /* The above IF-block has not found the peak yet. */ { - IF( LT_16( *pX, leftMin ) ) /* New left minimum */ + IF ( LT_16( *pX, leftMin ) ) /* New left minimum */ { leftMin = *pX; move16(); @@ -1242,9 +1241,9 @@ static void peakfinder_fx( } /* Check end point */ - IF( GT_16( x[lenMinus1], tempMag ) ) + IF ( GT_16( x[lenMinus1], tempMag ) ) { - IF( GT_16( x[lenMinus1], threshold ) ) /* threshold = leftMin + sel */ + IF ( GT_16( x[lenMinus1], threshold ) ) /* threshold = leftMin + sel */ { peakLoc[*cInd] = lenMinus1; move16(); @@ -1255,9 +1254,9 @@ static void peakfinder_fx( move16(); } } - IF( foundPeak == 0 ) /* Check if we still need to add the last point */ + IF ( foundPeak == 0 ) /* Check if we still need to add the last point */ { - IF( GT_16( tempMag, minMag ) ) + IF ( GT_16( tempMag, minMag ) ) { peakLoc[*cInd] = tempLoc; move16(); @@ -1354,11 +1353,11 @@ static Word16 imax_fx( /* o: The location, relative to the sign = L_xor( y3_y1, denom ); /* Preserve the sign since div_s() only takes positive arguments. */ numer = L_abs( y3_y1 ); denom = L_abs( denom ); - IF( numer == 0 ) + IF ( numer == 0 ) { return 0; } - IF( denom == 0 ) + IF ( denom == 0 ) { return 0; } @@ -1377,7 +1376,7 @@ static Word16 imax_fx( /* o: The location, relative to the /* For both edges (left and right), the extremum found above may be minimum. * It needs to reject the minimum. */ - IF( special != 0 ) /* Either edge specical case. */ + IF ( special != 0 ) /* Either edge specical case. */ { edge = 0x7fff; /* 1 in Q15 for the right edge special case */ move16(); @@ -1521,7 +1520,7 @@ static void ivas_spec_ana_fx( // PMTE() window_corr = w_hamm[0]; move16(); - window_corr_step = idiv1616( w_hamm[0], hamm_len2 ); + window_corr_step = idiv1616(w_hamm[0] , hamm_len2); FOR( i = 0; i < hamm_len2; i++ ) { xfp[i] = mult_r( shl( prevsynth[i], *Q ), sub( w_hamm[i], window_corr ) ); @@ -1546,12 +1545,12 @@ static void ivas_spec_ana_fx( // PMTE() window_corr = w_hamm[0]; move16(); - window_corr_step = idiv1616( w_hamm[0], hamm_len2 ); + window_corr_step = idiv1616(w_hamm[0] , hamm_len2); FOR( i = 0; i < hamm_len2; i++ ) { xfp[i] = mult_r( shl( prevsynth[i], *Q ), sub( w_hamm[i], window_corr ) ); move16(); - xfp[sub( sub( Lprot, i ), 1 )] = mult_r( shl( prevsynth[sub( sub( Lprot, i ), 1 )], *Q ), sub( w_hamm[i], window_corr ) ); + xfp[sub(sub(Lprot , i) , 1)] = mult_r( shl( prevsynth[sub(sub(Lprot , i) , 1)], *Q ), sub( w_hamm[i], window_corr ) ); move16(); window_corr = sub( window_corr, window_corr_step ); } @@ -1596,8 +1595,8 @@ static void ivas_spec_ana_fx( expo = norm_l( *pMagSq ); /* exponent */ man = extract_h( L_shl( *pMagSq++, expo ) ); /* mantissa */ man = sqrt2ndOrder( man ); - expoBy2 = shr( expo, 1 ); /* Divided by 2-- square root operation. */ - IF( s_and( expo, 1 ) == 0 ) /* Check even or odd. */ + expoBy2 = shr( expo, 1 ); /* Divided by 2-- square root operation. */ + IF ( s_and( expo, 1 ) == 0 ) /* Check even or odd. */ { man = mult_r( man, FEC_HQ_ECU_ROOT2 ); /* FEC_HQ_ECU_ROOT2 is sqrt(2) in Q14 */ expoBy2 = sub( expoBy2, 1 ); @@ -1636,7 +1635,7 @@ static void ivas_spec_ana_fx( pPlocs = plocs; n = sub( *num_plocs, 1 ); /* -1 so as to exclude the very last peak. */ /* Special case-- The very 1st peak if it is at 0 index position */ - IF( *pPlocs == 0 ) /* Only the very 1st peak is possible the peak at 0 index position. */ + IF ( *pPlocs == 0 ) /* Only the very 1st peak is possible the peak at 0 index position. */ { fraction = imax_fx( xfp, -1 ); /* -1 signifies special left edge case. */ acc = L_deposit_h( *pPlocs++ ); /* N.B., (*pPlocs) must be zero here. */ @@ -1654,7 +1653,7 @@ static void ivas_spec_ana_fx( *pPlocsi++ = L_mac( acc, fraction, 1 ); move32(); /* in Q16. Append the fractional part to the integral part. */ } - IF( n >= 0 ) + IF ( n >= 0 ) { /* Special case-- The very last peak */ pXfp = pXfp1 + *pPlocs; @@ -1718,7 +1717,7 @@ static void ivas_spec_ana_fx( endPlocs = sub( Lprot2_1, DELTA_CORR_F0_INT ); /* last *pPlocs position for Jacobsen */ /* precompute number of turns based on endpoint integer location and make into a proper for loop */ - IF( n > 0 ) + IF ( n > 0 ) { nJacob = n; move16(); @@ -1741,13 +1740,13 @@ static void ivas_spec_ana_fx( /* At this point there should at most two plocs left to process */ /* the position before fs/2 and fs/2 both use the same magnitude points */ - IF( n > 0 ) + IF ( n > 0 ) { /* [ . . . . . . . ] Lprot/2+1 positions */ /* | | | */ /* 0 (Lprot/2-2) (Lprot/2) */ - IF( EQ_16( currPlocs, ( sub( Lprot2_1, DELTA_CORR_F0_INT ) ) ) ) /* Also 2nd last peak position uses fs/2 which makes jacobsen less suitable. */ + IF ( EQ_16( currPlocs, ( sub( Lprot2_1, DELTA_CORR_F0_INT ) ) ) ) /* Also 2nd last peak position uses fs/2 which makes jacobsen less suitable. */ { fraction = imax_fx( &xfp[currPlocs - 1], 0 ); /* in Q15 */ acc = L_deposit_h( sub( currPlocs, 1 ) ); @@ -1761,7 +1760,7 @@ static void ivas_spec_ana_fx( /* Here the only remaining point would be a fs/2 plocs */ /* pXfp = xfp + sub(Lprot2,1); already set just a reminder where it * whould point */ - IF( n > 0 ) /* fs/2 which makes special case . */ + IF ( n > 0 ) /* fs/2 which makes special case . */ { fraction = imax_fx( &xfp[currPlocs - 2], 0 ); /* in Q15 */ acc = L_deposit_h( sub( currPlocs, 2 ) ); @@ -1784,7 +1783,7 @@ static void ivas_spec_ana_fx( { st_point = s_max( 0, sub( plocs[i], DELTA_CORR ) ); end_point = s_min( sub( Lprot2_1, 1 ), add( plocs[i], DELTA_CORR ) ); - set16_fx( &xfp[st_point], 0, extract_l( L_add( L_sub( end_point, st_point ), 1 ) ) ); + set16_fx( &xfp[st_point], 0, extract_l(L_add( L_sub( end_point, st_point ), 1 )) ); } noise = L_add( sum16_32_fx( xfp, Lprot2_1 ), 1 ); @@ -1934,7 +1933,7 @@ static void spec_ana_fx( } /* Apply zeroing of non-coded FFT spectrum */ - IF( GT_16( output_frame, inner_frame_tbl[bwidth_fx] ) ) + IF ( GT_16( output_frame, inner_frame_tbl[bwidth_fx] ) ) { stop_band_start = shl( 128, bwidth_fx ); stop_band_length = sub( Lprot, shl( stop_band_start, 1 ) ); @@ -1967,8 +1966,8 @@ static void spec_ana_fx( expo = norm_l( *pMagSq ); /* exponent */ man = extract_h( L_shl( *pMagSq++, expo ) ); /* mantissa */ man = sqrt2ndOrder( man ); - expoBy2 = shr( expo, 1 ); /* Divided by 2-- square root operation. */ - IF( s_and( expo, 1 ) == 0 ) /* Check even or odd. */ + expoBy2 = shr( expo, 1 ); /* Divided by 2-- square root operation. */ + IF ( s_and( expo, 1 ) == 0 ) /* Check even or odd. */ { man = mult_r( man, FEC_HQ_ECU_ROOT2 ); /* FEC_HQ_ECU_ROOT2 is sqrt(2) in Q14 */ expoBy2 = sub( expoBy2, 1 ); @@ -2021,7 +2020,7 @@ static void spec_ana_fx( pPlocs = plocs; n = sub( *num_plocs, 1 ); /* -1 so as to exclude the very last peak. */ /* Special case-- The very 1st peak if it is at 0 index position */ - IF( *pPlocs == 0 ) /* Only the very 1st peak is possible the peak at 0 index position. */ + IF ( *pPlocs == 0 ) /* Only the very 1st peak is possible the peak at 0 index position. */ { fraction = imax_fx( xfp, -1 ); /* -1 signifies special left edge case. */ acc = L_deposit_h( *pPlocs++ ); /* N.B., (*pPlocs) must be zero here. */ @@ -2039,7 +2038,7 @@ static void spec_ana_fx( *pPlocsi++ = L_mac( acc, fraction, 1 ); move32(); /* in Q16. Append the fractional part to the integral part. */ } - IF( n >= 0 ) + IF ( n >= 0 ) { /* Special case-- The very last peak */ pXfp = pXfp1 + *pPlocs; @@ -2266,7 +2265,7 @@ static void ivas_subst_spec_fx( } one_peak_flag_mask = 32767 /* 1.0f in Q15 */; /* all ones mask -> keep */ move16(); - IF( element_mode != EVS_MONO ) + IF ( element_mode != EVS_MONO ) { test(); if ( ( *num_plocs > 0 ) && ( sub( *num_plocs, 3 ) < 0 ) ) @@ -2274,7 +2273,7 @@ static void ivas_subst_spec_fx( one_peak_flag_mask = noise_fac; /* all zeroes mask -> zero */ move16(); } - IF( *num_plocs == 0 ) + IF ( *num_plocs == 0 ) { X[0] = 0; /* reset DC if there are no peaks */ move16(); @@ -2311,7 +2310,7 @@ static void ivas_subst_spec_fx( move16(); pkLocation1 = *pPlocs++; /* plocs[m + 1] */ move16(); - IF( m > 0 ) + IF ( m > 0 ) { delta_tmp = shr( sub( sub( pkLocation, pkLocation_1 ), 1 ), 1 ); if ( LT_16( delta_tmp, DELTA_CORR ) ) @@ -2321,7 +2320,7 @@ static void ivas_subst_spec_fx( } } - IF( LT_16( m, lastPeak ) ) + IF ( LT_16( m, lastPeak ) ) { delta_tmp = shr( sub( sub( pkLocation1, pkLocation ), 1 ), 1 ); if ( LT_16( delta_tmp, DELTA_CORR ) ) @@ -2420,7 +2419,7 @@ static void ivas_subst_spec_fx( { mag_chg_local = mag_chg[k]; move16(); - IF( ph_dith != 0 ) + IF ( ph_dith != 0 ) { Xph = *pCorrPhase; /* in Q16. 2*PI is not included. */ move32(); @@ -2429,7 +2428,7 @@ static void ivas_subst_spec_fx( acc = L_shr( acc, PHASE_DITH_SCALE_SHIFT ); Xph = L_add( Xph, acc ); /* in Q16. */ - IF( ph_dith > 0 ) /* up to 6 dB additional att of peaks in non_transient longer bursts, (when peak phase is randomized ) */ + IF ( ph_dith > 0 ) /* up to 6 dB additional att of peaks in non_transient longer bursts, (when peak phase is randomized ) */ { /* mag_chg_local *= 0.5 + (1.0 - ph_dith[i])/2 where 0.5~= sqrt((float)pow(10.0,-6/10.0)) and ph_dith=0..1.0--> scale=1.0 ...5 */ mag_chg_local = mult_r( mag_chg_local, sub( 32767, shr( ph_dith, 1 ) ) ); @@ -2485,7 +2484,7 @@ static void ivas_subst_spec_fx( expo = shr( expo, 1 ); beta_local = mult_r( beta_mute, round_fx( L_shl( acc, sub( 31, expo ) ) ) ); - IF( GE_16( k, LGW32K - 1 ) ) + IF ( GE_16( k, LGW32K - 1 ) ) { beta_local = mult_r( beta_local, 3277 ); /* 0.1 in Q15 */ } @@ -2713,7 +2712,7 @@ static void subst_spec_fx( move16(); pkLocation1 = *pPlocs++; /* plocs[m + 1] */ move16(); - IF( m > 0 ) + IF ( m > 0 ) { delta_tmp = shr( sub( sub( pkLocation, pkLocation_1 ), 1 ), 1 ); if ( LT_16( delta_tmp, DELTA_CORR ) ) @@ -2723,7 +2722,7 @@ static void subst_spec_fx( } } - IF( LT_16( m, lastPeak ) ) + IF ( LT_16( m, lastPeak ) ) { delta_tmp = shr( sub( sub( pkLocation1, pkLocation ), 1 ), 1 ); if ( LT_16( delta_tmp, DELTA_CORR ) ) @@ -2827,7 +2826,7 @@ static void subst_spec_fx( { mag_chg_local = mag_chg[k]; move16(); - IF( ph_dith != 0 ) + IF ( ph_dith != 0 ) { Xph = *pCorrPhase; /* in Q16. 2*PI is not included. */ move32(); @@ -2836,7 +2835,7 @@ static void subst_spec_fx( acc = L_shr( acc, PHASE_DITH_SCALE_SHIFT ); Xph = L_add( Xph, acc ); /* in Q16. */ - IF( ph_dith > 0 ) /* up to 6 dB additional att of peaks in non_transient longer bursts, (when peak phase is randomized ) */ + IF ( ph_dith > 0 ) /* up to 6 dB additional att of peaks in non_transient longer bursts, (when peak phase is randomized ) */ { /* mag_chg_local *= 0.5 + (1.0 - ph_dith[i])/2 where 0.5~= sqrt((float)pow(10.0,-6/10.0)) and ph_dith=0..1.0--> scale=1.0 ...5 */ mag_chg_local = mult_r( mag_chg_local, sub( 32767, shr( ph_dith, 1 ) ) ); @@ -3019,7 +3018,7 @@ static void ivas_rec_wtda_fx( Word16 copy_len; Word16 ola_len; - copy_len = NS2SA( output_frame * FRAMES_PER_SEC, ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* prototype fill on each side of xsubst to fill MDCT Frame */ + copy_len = NS2SA( output_frame * FRAMES_PER_SEC, ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* prototype fill on each side of xsubst to fill MDCT Frame */ move16(); ola_len = NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS - ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* remaining lengt of LA_ZEROS to overlap add decoded with xsubst */ move16(); @@ -3077,22 +3076,22 @@ static void ivas_rec_wtda_fx( } /* extract reconstructed frame with aldo window */ - timesh = sub( NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ), shr( sub( shl( output_frame, 1 ), Lprot ), 1 ) ); + timesh = sub(NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) , shr(sub( shl(output_frame, 1) , Lprot ) , 1)); - set16_fx( xsubst_, 0, add( sub( shl( output_frame, 1 ), Lprot ), timesh ) ); - Copy( X, xsubst_ + add( sub( shl( output_frame, 1 ), Lprot ), timesh ), sub( Lprot, timesh ) ); + set16_fx( xsubst_, 0, add(sub(shl(output_frame, 1) , Lprot) , timesh) ); + Copy( X, xsubst_ + add(sub(shl(output_frame, 1) , Lprot) , timesh), sub(Lprot , timesh) ); /* Copy and OLA look ahead zero part of MDCT window from decoded signal */ IF( element_mode != EVS_MONO ) { Copy( old_dec, xsubst_ + NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ), copy_len ); /* also need to scale to Q0 ?? */ pOld = old_dec + copy_len; - pNew = xsubst_ + add( copy_len, NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) ); + pNew = xsubst_ + add(copy_len , NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS )); tmp = div_s( 1, shl( ola_len, 1 ) ); // Q15 tmp = round_fx( L_shl( L_mult( tmp, EVS_PI_FX ), 2 ) ); // Q15 sinq_fx( tmp, 0, ola_len, xfwin ); v_mult16_fixed( xfwin, xfwin, xfwin, ola_len ); /* xfwin = sin^2 of 0..pi/4 */ - pOldW = xfwin + sub( ola_len, 1 ); + pOldW = xfwin + sub(ola_len , 1); pNewW = xfwin; FOR( i = 0; i < ola_len; i++ ) { @@ -3107,7 +3106,7 @@ static void ivas_rec_wtda_fx( ELSE { /* Smoothen onset of ECU frame */ - p_ecu = xsubst_ + add( sub( shl( output_frame, 1 ), Lprot ), timesh ); + p_ecu = xsubst_ + add( sub( shl(output_frame, 1), Lprot ), timesh ); FOR( i = 0; i < xf_len; ( i++, p_ecu++ ) ) { idx = extract_l( L_shr( L_mult0( i, tbl_delta ), 12 ) ); @@ -3268,7 +3267,7 @@ static void rec_wtda_fx( set16_fx( xsubst_ + add( output_frame, Lprot2 ), 0, l ); /* Smoothen onset of ECU frame */ - p_ecu = xsubst_ + sub( output_frame, Lprot2 ); + p_ecu = xsubst_ + sub( output_frame , Lprot2 ); FOR( i = 0; i < xf_len; i++ ) { idx = extract_l( L_shr( L_mult0( i, tbl_delta ), 12 ) ); @@ -3418,7 +3417,7 @@ static Word32 mult_32_32_q( const Word32 a, const Word32 b, const Word16 q ) Mpy_32_32_ss( a, b, &hi, &lo ); #ifdef BASOP_NOGLOB - return L_or( L_shl_o( hi, sub( 32 - 1, q ), &Overflow ), L_lshr( lo, add( q, 1 ) ) ); + return L_or( L_shl_o( hi, sub(32 - 1 , q ), &Overflow ), L_lshr( lo, add(q , 1) ) ); #else return L_or( L_shl( hi, 32 - q - 1 ), L_lshr( lo, q + 1 ) ); #endif @@ -3451,7 +3450,7 @@ static void fir_dwn_fx( { s = L_deposit_l( 0 ); ptr_h = h + 1; - ptr_x = x + sub( i, 1 ); + ptr_x = x + sub(i , 1); FOR( j = 1; j <= i; j++ ) { @@ -3473,7 +3472,7 @@ static void fir_dwn_fx( { s = L_deposit_l( 0 ); ptr_h = h + 1; - ptr_x = x + sub( i, 1 ); + ptr_x = x + sub(i , 1); move16(); FOR( j = 1; j <= K; j++ ) @@ -3653,7 +3652,7 @@ static void fec_ecu_pitch_fx( } - IF( EQ_16( HqVoicing, 1 ) ) + IF( EQ_16(HqVoicing , 1) ) { cb_start = 0; move16(); @@ -3677,7 +3676,7 @@ static void fec_ecu_pitch_fx( { accA = 0; move16(); - IF( EQ_16( i, cb_start ) ) + IF( EQ_16(i , cb_start) ) { accB = 0; move16(); @@ -3717,9 +3716,9 @@ static void fec_ecu_pitch_fx( accCisqrt = Isqrt( accC ); /* Q31 - 3 + tmpQLP*/ - Ryytmp = mult_32_32_q( accA, accCisqrt, sub( 16 + 3, tmpQLP ) ); /*Q 6 -2*tmpQLP + Q31 - 3 + tmpQLP -16 -3 +tmpQLP = Q15*/ - Ryytmp = mult_32_32_q( Ryytmp, accBisqrt, add( 15 - 3, tmpQLP ) ); /*Q15 + Q31 - 3 + tmpQLP -15 + 3- tmpQLP = Q31*/ - Ryy = extract_h( Ryytmp ); /* Q15 */ + Ryytmp = mult_32_32_q( accA, accCisqrt, sub(16 + 3 , tmpQLP) ); /*Q 6 -2*tmpQLP + Q31 - 3 + tmpQLP -16 -3 +tmpQLP = Q15*/ + Ryytmp = mult_32_32_q( Ryytmp, accBisqrt, add(15 - 3 , tmpQLP) ); /*Q15 + Q31 - 3 + tmpQLP -15 + 3- tmpQLP = Q31*/ + Ryy = extract_h( Ryytmp ); /* Q15 */ IF( GT_16( Ryy, *min_corr_fx ) ) @@ -4028,7 +4027,7 @@ static void fec_ecu_dft_fx( IF( EQ_16( *Nfft, N ) ) { - Copy( &target[1], &Tfr16[1], sub( *Nfft, 2 ) ); + Copy( &target[1], &Tfr16[1], sub(*Nfft , 2) ); } ELSE { @@ -4550,7 +4549,7 @@ static void ivas_fec_noise_filling_fx( Copy( synthesis_fx, synthesis_fx + kk, sub( 2 * L, kk ) ); Copy( synthesis_fx + L, gapsynth_fx, L ); - Copy( prevsynth_fx + sub( alignment_point, kk ), synthesis_fx, kk ); + Copy( prevsynth_fx + sub(alignment_point , kk), synthesis_fx, kk ); } #endif @@ -4918,7 +4917,7 @@ static void ivas_hq_phase_ecu_fx( lprot = L_PROT32k; /* 1024 */ move16(); } - ELSE IF( EQ_16( output_frame, L_FRAME16k ) ) + ELSE IF( EQ_16(output_frame , L_FRAME16k) ) { lprot = 512; move16(); @@ -4970,16 +4969,16 @@ static void ivas_hq_phase_ecu_fx( /* seed for own_rand2 */ seed = *time_offs; move16(); - IF( *num_p > 0 ) + IF ( *num_p > 0 ) { - seed = add( seed, plocs[sub( *num_p, 1 )] ); + seed = add( seed, plocs[sub(*num_p , 1)] ); } ivas_subst_spec_fx( plocs, plocsi, num_p, *time_offs, X, mag_chg, ph_dith, old_is_transient, output_frame, &seed, alpha, beta, *beta_mute, Xavg, element_mode, ph_ecu_lookahead, noise_fac ); /* reconstructed frame in tda domain */ - old_dec = prevsynth + sub( shl( output_frame, 1 ), NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) ); + old_dec = prevsynth + sub( shl(output_frame, 1), NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) ); ivas_rec_frame_fx( X, ecu_rec, output_frame, *Q_spec, old_dec, element_mode, num_p, plocs ); *last_fec = 0; @@ -5111,9 +5110,9 @@ static void hq_phase_ecu_fx( /* seed for own_rand2 */ seed = *time_offs; move16(); - IF( *num_p > 0 ) + IF ( *num_p > 0 ) { - seed = add( seed, plocs[sub( *num_p, 1 )] ); + seed = add( seed, plocs[sub(*num_p , 1)] ); } subst_spec_fx( plocs, plocsi, num_p, *time_offs, X, mag_chg, ph_dith, old_is_transient, output_frame, &seed, diff --git a/lib_dec/FEC_adapt_codebook_fx.c b/lib_dec/FEC_adapt_codebook_fx.c index 63c5559c0..cf159210b 100644 --- a/lib_dec/FEC_adapt_codebook_fx.c +++ b/lib_dec/FEC_adapt_codebook_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_dec.h" /* Decoder static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_dec/FEC_clas_estim_fx.c b/lib_dec/FEC_clas_estim_fx.c index 9591807b7..18cf6b5a8 100644 --- a/lib_dec/FEC_clas_estim_fx.c +++ b/lib_dec/FEC_clas_estim_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/FEC_fx.c b/lib_dec/FEC_fx.c index a029f1dfd..09efc3b5a 100644 --- a/lib_dec/FEC_fx.c +++ b/lib_dec/FEC_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common static table prototypes */ #include "rom_dec.h" /* Decoder static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* diff --git a/lib_dec/FEC_lsf_estim_fx.c b/lib_dec/FEC_lsf_estim_fx.c index 21efc90e7..36c0f0535 100644 --- a/lib_dec/FEC_lsf_estim_fx.c +++ b/lib_dec/FEC_lsf_estim_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_dec/FEC_pitch_estim_fx.c b/lib_dec/FEC_pitch_estim_fx.c index 1305f1373..ff0732f03 100644 --- a/lib_dec/FEC_pitch_estim_fx.c +++ b/lib_dec/FEC_pitch_estim_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" @@ -74,7 +73,7 @@ void FEC_pitch_estim_fx( test(); IF( ( ( element_mode == EVS_MONO ) && EQ_16( last_core, HQ_CORE ) ) || ( element_mode != EVS_MONO && ( EQ_16( last_core, HQ_CORE ) || EQ_16( last_core, TCX_20_CORE ) || EQ_16( last_core, TCX_10_CORE ) ) ) ) { - *bfi_pitch = pitch_buf[sub( shr( L_frame, 6 ), 1 )]; + *bfi_pitch = pitch_buf[sub(shr( L_frame, 6 ) , 1)]; move16(); *bfi_pitch_frame = L_frame; move16(); @@ -105,7 +104,7 @@ void FEC_pitch_estim_fx( ( EQ_16( L_frame, L_FRAME16k ) ) ) || ( EQ_16( coder_type, TRANSITION ) ) ) { - *bfi_pitch = pitch_buf[sub( shr( L_frame, 6 ), 1 )]; + *bfi_pitch = pitch_buf[sub(shr( L_frame, 6 ) , 1)]; move16(); *bfi_pitch_frame = L_frame; move16(); diff --git a/lib_dec/FEC_scale_syn_fx.c b/lib_dec/FEC_scale_syn_fx.c index 9a8da8454..c4fe1bfd7 100644 --- a/lib_dec/FEC_scale_syn_fx.c +++ b/lib_dec/FEC_scale_syn_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* * Local constants @@ -225,7 +224,7 @@ void FEC_scale_syn_fx( h1[0] = 1024; move16(); /*syn_filt( Aq+(3*(M+1)), M, h1, h1, L_FRAME/2, h1+(M+1), 0 );*/ - E_UTIL_synthesis( 1, Aq + ( 3 * ( M + 1 ) ), h1, h1, L_FRAME / 2, h1 + ( M + 1 ), 0, M ); + E_UTIL_synthesis( 1, Aq + (3 * ( M + 1 ) ), h1, h1, L_FRAME / 2, h1 + ( M + 1 ), 0, M ); /*Compute tilt */ /*rr0 = dotp( h1, h1, L_FRAME/2-1 ) + 0.1f;*/ @@ -272,7 +271,7 @@ void FEC_scale_syn_fx( ener_max = *lp_ener_FEC_max; move32(); test(); - if ( EQ_16( clas, VOICED_TRANSITION ) || ( GE_16( clas, INACTIVE_CLAS ) ) ) + if( EQ_16( clas, VOICED_TRANSITION ) || ( GE_16( clas, INACTIVE_CLAS ) ) ) { ener_max = *lp_ener_FEC_av; move32(); diff --git a/lib_dec/LD_music_post_filter_fx.c b/lib_dec/LD_music_post_filter_fx.c index 454e59ddd..d1d4d1807 100644 --- a/lib_dec/LD_music_post_filter_fx.c +++ b/lib_dec/LD_music_post_filter_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_dec/TonalComponentDetection_fx.c b/lib_dec/TonalComponentDetection_fx.c index c3224a099..6ef4f65da 100644 --- a/lib_dec/TonalComponentDetection_fx.c +++ b/lib_dec/TonalComponentDetection_fx.c @@ -7,16 +7,12 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "cnst.h" #include "rom_basop_util.h" #include "rom_com.h" #include "basop_util.h" -#ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" -#endif /*---------------------------------------------------------------------* diff --git a/lib_dec/acelp_core_dec.c b/lib_dec/acelp_core_dec.c index c0267b47f..61ff0b8c3 100644 --- a/lib_dec/acelp_core_dec.c +++ b/lib_dec/acelp_core_dec.c @@ -42,8 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_dec/acelp_core_dec_fx.c b/lib_dec/acelp_core_dec_fx.c index c3cf9be3b..0b1bd4142 100644 --- a/lib_dec/acelp_core_dec_fx.c +++ b/lib_dec/acelp_core_dec_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" /* Compilation switches */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_prot_fx.h" #include "ivas_cnst.h" /* Common constants */ #include "cnst.h" /* Common constants */ diff --git a/lib_dec/acelp_core_dec_ivas_fx.c b/lib_dec/acelp_core_dec_ivas_fx.c index 8e84bc1ed..d724b48ae 100644 --- a/lib_dec/acelp_core_dec_ivas_fx.c +++ b/lib_dec/acelp_core_dec_ivas_fx.c @@ -40,8 +40,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_dec/acelp_core_switch_dec_fx.c b/lib_dec/acelp_core_switch_dec_fx.c index 76b8b8ed2..8252de5a1 100644 --- a/lib_dec/acelp_core_switch_dec_fx.c +++ b/lib_dec/acelp_core_switch_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*---------------------------------------------------------------------* diff --git a/lib_dec/amr_wb_dec.c b/lib_dec/amr_wb_dec.c index 895af0860..29b2e5a26 100644 --- a/lib_dec/amr_wb_dec.c +++ b/lib_dec/amr_wb_dec.c @@ -43,7 +43,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif #ifndef IVAS_FLOAT_FIXED diff --git a/lib_dec/amr_wb_dec_fx.c b/lib_dec/amr_wb_dec_fx.c index 2ea166a70..b5d194c6d 100644 --- a/lib_dec/amr_wb_dec_fx.c +++ b/lib_dec/amr_wb_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* diff --git a/lib_dec/ari_dec.c b/lib_dec/ari_dec.c index 334e24195..51badb5bc 100644 --- a/lib_dec/ari_dec.c +++ b/lib_dec/ari_dec.c @@ -39,6 +39,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" +#include "prot_fx.h" #include "stat_com.h" #include "basop_util.h" #include "wmc_auto.h" diff --git a/lib_dec/ari_dec_fx.c b/lib_dec/ari_dec_fx.c index 78d7b799c..8a310b8b8 100644 --- a/lib_dec/ari_dec_fx.c +++ b/lib_dec/ari_dec_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------- * Ari decode 14 bits routines diff --git a/lib_dec/ari_hm_dec.c b/lib_dec/ari_hm_dec.c index fc45166c1..fbd863d6f 100644 --- a/lib_dec/ari_hm_dec.c +++ b/lib_dec/ari_hm_dec.c @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifndef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* * DecodeIndex() diff --git a/lib_dec/arith_coder_dec.c b/lib_dec/arith_coder_dec.c index 507a8d2e0..1d23d827d 100644 --- a/lib_dec/arith_coder_dec.c +++ b/lib_dec/arith_coder_dec.c @@ -43,8 +43,7 @@ #include "basop_util.h" #include "basop_proto_func.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------* * tcx_arith_decode() diff --git a/lib_dec/arith_coder_dec_fx.c b/lib_dec/arith_coder_dec_fx.c index ddd4ac478..61bb24b66 100644 --- a/lib_dec/arith_coder_dec_fx.c +++ b/lib_dec/arith_coder_dec_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /* Returns: number of bits consumed */ #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/avq_dec_fx.c b/lib_dec/avq_dec_fx.c index d4351b1a5..594030258 100644 --- a/lib_dec/avq_dec_fx.c +++ b/lib_dec/avq_dec_fx.c @@ -8,8 +8,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ #include "prot.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* * Local prototypes diff --git a/lib_dec/bass_psfilter.c b/lib_dec/bass_psfilter.c index 13c822522..c33edf96c 100644 --- a/lib_dec/bass_psfilter.c +++ b/lib_dec/bass_psfilter.c @@ -38,8 +38,7 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "cnst.h" #include "stat_dec.h" diff --git a/lib_dec/bass_psfilter_fx.c b/lib_dec/bass_psfilter_fx.c index d3984a7e4..0e46a6aed 100644 --- a/lib_dec/bass_psfilter_fx.c +++ b/lib_dec/bass_psfilter_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ #include "rom_dec.h" /* Static table prototypes */ diff --git a/lib_dec/cng_dec.c b/lib_dec/cng_dec.c index cb202f38b..83854f3ae 100644 --- a/lib_dec/cng_dec.c +++ b/lib_dec/cng_dec.c @@ -39,7 +39,6 @@ #include #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_dec/cng_dec_fx.c b/lib_dec/cng_dec_fx.c index ab41059c5..b612638f9 100644 --- a/lib_dec/cng_dec_fx.c +++ b/lib_dec/cng_dec_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" /*Temporary location to be move in prot* when merge is done*/ diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c index d8c00803e..2ae22c470 100644 --- a/lib_dec/core_dec_init.c +++ b/lib_dec/core_dec_init.c @@ -41,7 +41,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------* * open_decoder_LPD() * diff --git a/lib_dec/core_dec_init_fx.c b/lib_dec/core_dec_init_fx.c index 684b21fb2..960ef827d 100644 --- a/lib_dec/core_dec_init_fx.c +++ b/lib_dec/core_dec_init_fx.c @@ -7,9 +7,8 @@ #include #include #include "options.h" -#include "prot_fx1.h" #include "prot.h" //Can be removed later -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" #include "cnst.h" /* for MIN_CNG_LEV */ diff --git a/lib_dec/core_dec_reconf.c b/lib_dec/core_dec_reconf.c index 13aa708dc..2599303f3 100644 --- a/lib_dec/core_dec_reconf.c +++ b/lib_dec/core_dec_reconf.c @@ -40,7 +40,7 @@ #include "rom_com.h" #include "rom_dec.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifndef IVAS_FLOAT_FIXED /*---------------------------------------------------------------------* * reconfig_decoder_LPD_ivas() diff --git a/lib_dec/core_dec_reconf_fx.c b/lib_dec/core_dec_reconf_fx.c index c347fbe8d..13ddbe6f2 100644 --- a/lib_dec/core_dec_reconf_fx.c +++ b/lib_dec/core_dec_reconf_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" diff --git a/lib_dec/core_dec_switch_fx.c b/lib_dec/core_dec_switch_fx.c index 6aaad23ef..835b93097 100644 --- a/lib_dec/core_dec_switch_fx.c +++ b/lib_dec/core_dec_switch_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" // Temporarily added diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c index 7e7bfbd6c..43431ba30 100644 --- a/lib_dec/core_switching_dec.c +++ b/lib_dec/core_switching_dec.c @@ -40,8 +40,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "wmc_auto.h" diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c index 4f8854d7c..8fec002bb 100644 --- a/lib_dec/core_switching_dec_fx.c +++ b/lib_dec/core_switching_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_dec/d_gain2p_fx.c b/lib_dec/d_gain2p_fx.c index 1507c284e..63eff5413 100644 --- a/lib_dec/d_gain2p_fx.c +++ b/lib_dec/d_gain2p_fx.c @@ -4,8 +4,7 @@ #include #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stl.h" #include "rom_com.h" diff --git a/lib_dec/dec2t32_fx.c b/lib_dec/dec2t32_fx.c index e62814cc6..c285cf331 100644 --- a/lib_dec/dec2t32_fx.c +++ b/lib_dec/dec2t32_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*==========================================================================*/ diff --git a/lib_dec/dec4t64_fx.c b/lib_dec/dec4t64_fx.c index 10e9b5b13..452775200 100644 --- a/lib_dec/dec4t64_fx.c +++ b/lib_dec/dec4t64_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #include "assert.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED @@ -299,7 +298,7 @@ void dec_1p_N1_fx( /* i = ((index >> N) & 1); */ i = L_shr( index, N ) & 1L; - IF( i != 0 ) + IF ( i != 0 ) { pos1 = add( pos1, NB_POS_FCB_4T ); } @@ -697,7 +696,7 @@ static void fcb_decode_position_fx( FOR( ; PI_select_table[L_sub( 16, l )][temp] >= k; l += 2 ); - IF( GT_32( k, PI_select_table[L_sub( 17, l )][temp] ) ) + IF ( GT_32( k, PI_select_table[L_sub( 17, l )][temp] ) ) { l = L_sub( l, 1 ); } @@ -779,7 +778,7 @@ void D_ACELP_decode_43bit_fx( UWord16 idxs[], Word16 code[], Word16 *pulsestrack move32(); joint_index = L_shr( L_add( L_shl( (Word32) idxs[2], 16 ), (Word32) idxs[1] ), 2 ); - IF( GE_32( joint_index, joint_offset ) ) + IF ( GE_32( joint_index, joint_offset ) ) { joint_index = L_sub( joint_index, joint_offset ); } diff --git a/lib_dec/dec_LPD.c b/lib_dec/dec_LPD.c index 746e18e38..e45e44b47 100644 --- a/lib_dec/dec_LPD.c +++ b/lib_dec/dec_LPD.c @@ -44,7 +44,7 @@ #include "basop_proto_func.h" #include "stat_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/dec_LPD_fx.c b/lib_dec/dec_LPD_fx.c index 11afd0184..3b840fc5e 100644 --- a/lib_dec/dec_LPD_fx.c +++ b/lib_dec/dec_LPD_fx.c @@ -6,8 +6,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/dec_ace_fx.c b/lib_dec/dec_ace_fx.c index 8764b1d2a..7c3de901a 100644 --- a/lib_dec/dec_ace_fx.c +++ b/lib_dec/dec_ace_fx.c @@ -8,8 +8,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stl.h" #include "rom_com.h" diff --git a/lib_dec/dec_acelp_fx.c b/lib_dec/dec_acelp_fx.c index b560f7bea..b05086d9f 100644 --- a/lib_dec/dec_acelp_fx.c +++ b/lib_dec/dec_acelp_fx.c @@ -7,8 +7,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_basop_util.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/dec_acelp_tcx_main_fx.c b/lib_dec/dec_acelp_tcx_main_fx.c index 93eb4605f..ad7117763 100644 --- a/lib_dec/dec_acelp_tcx_main_fx.c +++ b/lib_dec/dec_acelp_tcx_main_fx.c @@ -8,8 +8,7 @@ #include "options.h" #include "rom_com.h" #include "stat_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED static void decode_frame_type_fx( Decoder_State *st diff --git a/lib_dec/dec_amr_wb_fx.c b/lib_dec/dec_amr_wb_fx.c index 9682b152b..c9c180aad 100644 --- a/lib_dec/dec_amr_wb_fx.c +++ b/lib_dec/dec_amr_wb_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*---------------------------------------------------------------------* diff --git a/lib_dec/dec_gen_voic_fx.c b/lib_dec/dec_gen_voic_fx.c index e48c4aae2..623b7a823 100644 --- a/lib_dec/dec_gen_voic_fx.c +++ b/lib_dec/dec_gen_voic_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/dec_higher_acelp.c b/lib_dec/dec_higher_acelp.c index 304884e71..962bbc686 100644 --- a/lib_dec/dec_higher_acelp.c +++ b/lib_dec/dec_higher_acelp.c @@ -42,7 +42,7 @@ #include "rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED /*-----------------------------------------------------------------* diff --git a/lib_dec/dec_higher_acelp_fx.c b/lib_dec/dec_higher_acelp_fx.c index 0bc9665d8..a01d8287c 100644 --- a/lib_dec/dec_higher_acelp_fx.c +++ b/lib_dec/dec_higher_acelp_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #define IVAS_CODE diff --git a/lib_dec/dec_nelp_fx.c b/lib_dec/dec_nelp_fx.c index 9732ce9f1..4ea42d182 100644 --- a/lib_dec/dec_nelp_fx.c +++ b/lib_dec/dec_nelp_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*======================================================================*/ /* FUNCTION : decod_nelp_fx() */ diff --git a/lib_dec/dec_pit_exc_fx.c b/lib_dec/dec_pit_exc_fx.c index 0197fe36d..7ecdb9cdb 100644 --- a/lib_dec/dec_pit_exc_fx.c +++ b/lib_dec/dec_pit_exc_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*==========================================================================*/ @@ -150,7 +149,7 @@ void dec_pit_exc_fx( test(); test(); test(); - IF( ( ( GE_32( st_fx->core_brate, MIN_RATE_FCB ) || ( EQ_16( st_fx->GSC_noisy_speech, 1 ) && ( ( EQ_16( st_fx->L_frame, L_FRAME ) && GE_32( st_fx->core_brate, ACELP_13k20 ) ) || ( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, GSC_H_RATE_STG ) ) || st_fx->GSC_IVAS_mode == 0 ) ) ) && EQ_16( L_subfr_fx, L_SUBFR ) ) ) + IF ( ( ( GE_32( st_fx->core_brate, MIN_RATE_FCB ) || ( EQ_16( st_fx->GSC_noisy_speech, 1 ) && ( ( EQ_16( st_fx->L_frame, L_FRAME ) && GE_32( st_fx->core_brate, ACELP_13k20 ) ) || ( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, GSC_H_RATE_STG ) ) || st_fx->GSC_IVAS_mode == 0 ) ) ) && EQ_16( L_subfr_fx, L_SUBFR ) ) ) { use_fcb = 1; move16(); diff --git a/lib_dec/dec_post_fx.c b/lib_dec/dec_post_fx.c index 2552a15ec..a8580c8ce 100644 --- a/lib_dec/dec_post_fx.c +++ b/lib_dec/dec_post_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_dec.h" #include "rom_com.h" diff --git a/lib_dec/dec_ppp_fx.c b/lib_dec/dec_ppp_fx.c index cd4d6462f..19642686d 100644 --- a/lib_dec/dec_ppp_fx.c +++ b/lib_dec/dec_ppp_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*===================================================================*/ /* FUNCTION : void decod_ppp_fx () */ @@ -78,7 +77,7 @@ ivas_error decod_ppp_fx( deemph_lpc_fx( p_Aq_curr_fx, p_Aq_old_fx, LPC_de_curr_fx, LPC_de_old_fx, 0 ); /*LPC in Q12 */ - IF( ( error = ppp_voiced_decoder_fx( st_fx, excQ_ppp_fx, LPC_de_curr_fx, exc_fx, pitch_fx, bfi ) ) != IVAS_ERR_OK ) + IF ( ( error = ppp_voiced_decoder_fx( st_fx, excQ_ppp_fx, LPC_de_curr_fx, exc_fx, pitch_fx, bfi ) ) != IVAS_ERR_OK ) { return error; } diff --git a/lib_dec/dec_prm.c b/lib_dec/dec_prm.c index c10b3f587..fc3f4c511 100644 --- a/lib_dec/dec_prm.c +++ b/lib_dec/dec_prm.c @@ -41,7 +41,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * getTCXMode_ivas() @@ -217,7 +217,7 @@ void getTCXMode_ivas_fx( /*Core extended mode mapping for correct PLC classification*/ st->core_ext_mode = st->coder_type; move16(); - if ( EQ_16( st->coder_type, INACTIVE ) ) + if( EQ_16( st->coder_type, INACTIVE ) ) { st->core_ext_mode = UNVOICED; move16(); diff --git a/lib_dec/dec_prm_fx.c b/lib_dec/dec_prm_fx.c index f238f3e3a..795cb07cb 100644 --- a/lib_dec/dec_prm_fx.c +++ b/lib_dec/dec_prm_fx.c @@ -9,8 +9,7 @@ #include #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* @@ -135,7 +134,7 @@ void dec_prm_hm_fx( { tmp = 0; move16(); - if ( GE_16( L_frame, 256 ) ) + if( GE_16( L_frame, 256 ) ) { tmp = 1; move16(); @@ -225,7 +224,7 @@ void getTCXparam_fx( nSubframes = 1; move16(); - if ( EQ_16( core, TCX_10_CORE ) ) + if( EQ_16( core, TCX_10_CORE ) ) { nSubframes = 2; move16(); @@ -353,7 +352,7 @@ void getTCXparam_fx( lg = add( lg, st->hTcxCfg->tcx_offset ); lgFB = add( lgFB, shr( lgFB, sub( 3, nSubframes ) ) ); - if ( st->hTcxCfg->lfacNext < 0 ) + if( st->hTcxCfg->lfacNext < 0 ) { lg = sub( lg, st->hTcxCfg->lfacNext ); } @@ -600,7 +599,7 @@ void dec_prm_fx( Mpy_32_16_ss( st->total_brate, 5243, &L_tmp, &lsb ); /* 5243 is 1/50 in Q18. (0+18-15=3) */ num_bits = extract_l( L_shr( L_tmp, 3 ) ); /* Q0 */ assert( num_bits == st->total_brate / 50 ); - if ( EQ_16( FrameSizeConfig[n].frame_bits, num_bits ) ) + if( EQ_16( FrameSizeConfig[n].frame_bits, num_bits ) ) { st->bits_frame_core = add( st->bits_frame_core, FrameSizeConfig[n].bandwidth_bits ); BREAK; @@ -650,7 +649,7 @@ void dec_prm_fx( ind = get_next_indice( st, 2 ); st->clas_dec = ONSET; move16(); - if ( ind == 0 ) + if( ind == 0 ) { st->clas_dec = UNVOICED_CLAS; move16(); @@ -659,7 +658,7 @@ void dec_prm_fx( { st->clas_dec = UNVOICED_TRANSITION; move16(); - if ( GE_16( st->last_good, VOICED_TRANSITION ) ) + if( GE_16( st->last_good, VOICED_TRANSITION ) ) { st->clas_dec = VOICED_TRANSITION; move16(); @@ -851,7 +850,7 @@ void dec_prm_fx( st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode; move16(); test(); - if ( ( NE_16( st->core, TCX_10_CORE ) ) && ( EQ_16( st->hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) ) ) + if( ( NE_16( st->core, TCX_10_CORE ) ) && ( EQ_16( st->hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) ) ) { st->hTcxCfg->tcx_last_overlap_mode = ALDO_WINDOW; move16(); @@ -1078,7 +1077,7 @@ void dec_prm_fx( n = ACELP_LTP_BITS_SFR[st->acelp_cfg.ltp_mode][sfr]; move16(); - IF( n != 0 ) + IF ( n != 0 ) { prm[j] = get_next_indice( st, n ); j = add( j, 1 ); @@ -1086,7 +1085,7 @@ void dec_prm_fx( } /* Adaptive codebook filtering (1 bit) */ - IF( EQ_16( st->acelp_cfg.ltf_mode, 2 ) ) + IF ( EQ_16( st->acelp_cfg.ltf_mode, 2 ) ) { prm[j] = get_next_indice( st, 1 ); j = add( j, 1 ); @@ -1188,7 +1187,7 @@ void dec_prm_fx( /* Pitch lag (5, or 8 bits) */ n = ACELP_LTP_BITS_SFR[ltp_mode][sfr]; move16(); - IF( n != 0 ) + IF ( n != 0 ) { prm[j] = get_next_indice( st, n ); j = add( j, 1 ); @@ -1320,7 +1319,7 @@ void dec_prm_fx( IF( st->hTcxCfg->fIsTNSAllowed ) { - SetTnsConfig( st->hTcxCfg, 1, (Word16) EQ_16( st->last_core_from_bs, ACELP_CORE ) ); + SetTnsConfig( st->hTcxCfg, 1, (Word16)EQ_16(st->last_core_from_bs , ACELP_CORE) ); ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); j = add( j, nTnsParams ); diff --git a/lib_dec/dec_tcx.c b/lib_dec/dec_tcx.c index 06c9bc5ba..ab4558791 100644 --- a/lib_dec/dec_tcx.c +++ b/lib_dec/dec_tcx.c @@ -37,7 +37,7 @@ #include #include "prot.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include #include "options.h" #include @@ -45,8 +45,6 @@ #include "cnst.h" #include "wmc_auto.h" #include "ivas_rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot_fx.h" #ifndef IVAS_FLOAT_FIXED_UNIT_TESTING #include "debug.h" diff --git a/lib_dec/dec_tcx_fx.c b/lib_dec/dec_tcx_fx.c index 96fcfb25d..064ae2849 100644 --- a/lib_dec/dec_tcx_fx.c +++ b/lib_dec/dec_tcx_fx.c @@ -5,8 +5,7 @@ #include #include #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stl.h" #include "options.h" diff --git a/lib_dec/dec_tran_fx.c b/lib_dec/dec_tran_fx.c index 95c0fb1ce..2ba42b675 100644 --- a/lib_dec/dec_tran_fx.c +++ b/lib_dec/dec_tran_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*======================================================================*/ /* FUNCTION : decod_tran_fx() */ diff --git a/lib_dec/dec_uv_fx.c b/lib_dec/dec_uv_fx.c index 1b6c4b424..63be30656 100644 --- a/lib_dec/dec_uv_fx.c +++ b/lib_dec/dec_uv_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED static void gain_dec_gacelp_uv_fx( Word16 index, /* i : Quantization index vector Q0 */ diff --git a/lib_dec/decision_matrix_dec_fx.c b/lib_dec/decision_matrix_dec_fx.c index 8c9a12b69..7362cb20b 100644 --- a/lib_dec/decision_matrix_dec_fx.c +++ b/lib_dec/decision_matrix_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_dec.h" #include "rom_com.h" #include "stl.h" diff --git a/lib_dec/dlpc_avq_fx.c b/lib_dec/dlpc_avq_fx.c index 07f20ce6a..1cb91e22f 100644 --- a/lib_dec/dlpc_avq_fx.c +++ b/lib_dec/dlpc_avq_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED /* Constants */ diff --git a/lib_dec/dlpc_stoch_fx.c b/lib_dec/dlpc_stoch_fx.c index 742f76dd3..f42d7d457 100644 --- a/lib_dec/dlpc_stoch_fx.c +++ b/lib_dec/dlpc_stoch_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED /* Constants */ #define M 16 diff --git a/lib_dec/er_dec_acelp_fx.c b/lib_dec/er_dec_acelp_fx.c index ca23584a1..3a8a3de62 100644 --- a/lib_dec/er_dec_acelp_fx.c +++ b/lib_dec/er_dec_acelp_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_dec.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/er_dec_tcx_fx.c b/lib_dec/er_dec_tcx_fx.c index c3cf2f0ab..a4102230e 100644 --- a/lib_dec/er_dec_tcx_fx.c +++ b/lib_dec/er_dec_tcx_fx.c @@ -6,8 +6,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_dec.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/er_scale_syn_fx.c b/lib_dec/er_scale_syn_fx.c index ed78d8842..652041e67 100644 --- a/lib_dec/er_scale_syn_fx.c +++ b/lib_dec/er_scale_syn_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "cnst.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/er_sync_exc_fx.c b/lib_dec/er_sync_exc_fx.c index f4535152f..48f811e71 100644 --- a/lib_dec/er_sync_exc_fx.c +++ b/lib_dec/er_sync_exc_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop32.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/er_util_fx.c b/lib_dec/er_util_fx.c index ee0c52b8e..93ccaed26 100644 --- a/lib_dec/er_util_fx.c +++ b/lib_dec/er_util_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/evs_dec.c b/lib_dec/evs_dec.c index 96c3b5792..d5498c622 100644 --- a/lib_dec/evs_dec.c +++ b/lib_dec/evs_dec.c @@ -42,8 +42,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #ifndef IVAS_FLOAT_FIXED diff --git a/lib_dec/evs_dec_fx.c b/lib_dec/evs_dec_fx.c index e258c68e9..690e59b05 100644 --- a/lib_dec/evs_dec_fx.c +++ b/lib_dec/evs_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/fd_cng_dec.c b/lib_dec/fd_cng_dec.c index e4bab0bf9..e5a7bb666 100644 --- a/lib_dec/fd_cng_dec.c +++ b/lib_dec/fd_cng_dec.c @@ -45,8 +45,7 @@ #include "ivas_prot.h" #include "ivas_rom_dec.h" #include "ivas_rom_com_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_dec/fd_cng_dec_fx.c b/lib_dec/fd_cng_dec_fx.c index a97ac3809..0984c7698 100644 --- a/lib_dec/fd_cng_dec_fx.c +++ b/lib_dec/fd_cng_dec_fx.c @@ -9,8 +9,7 @@ #include "options.h" #include "rom_com.h" #include "stat_dec.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_dec/gain_dec_fx.c b/lib_dec/gain_dec_fx.c index ae4a95966..d793092e9 100644 --- a/lib_dec/gain_dec_fx.c +++ b/lib_dec/gain_dec_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*===========================================================================*/ diff --git a/lib_dec/gaus_dec_fx.c b/lib_dec/gaus_dec_fx.c index 516dfc498..ea5ab985c 100644 --- a/lib_dec/gaus_dec_fx.c +++ b/lib_dec/gaus_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/gs_dec_amr_wb_fx.c b/lib_dec/gs_dec_amr_wb_fx.c index 4ad733294..1ada34c63 100644 --- a/lib_dec/gs_dec_amr_wb_fx.c +++ b/lib_dec/gs_dec_amr_wb_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* @@ -441,7 +440,7 @@ void improv_amr_wb_gs_fx( IF( ( locattack == 0 && LE_32( core_brate, ACELP_12k65 ) ) && ( ( LT_32( core_brate, ACELP_8k85 ) && NE_16( clas, AUDIO_CLAS ) && ( clas == UNVOICED_CLAS || EQ_16( clas, VOICED_TRANSITION ) ) ) || - ( coder_type == INACTIVE ) ) ) + ( coder_type == INACTIVE ) ) ) #endif { /*------------------------------------------------------------* @@ -463,18 +462,18 @@ void improv_amr_wb_gs_fx( { Copy( Aq_fx, Aq_orig, NB_SUBFR * ( M + 1 ) ); - exp_a = norm_s( Aq_fx[imult1616( i, ( M + 1 ) )] ); - exp_b = norm_s( old_Aq_fx[imult1616( i, ( M + 1 ) )] ); + exp_a = norm_s( Aq_fx[imult1616(i , ( M + 1 ))] ); + exp_b = norm_s( old_Aq_fx[imult1616(i , ( M + 1 ))] ); exp_diff = sub( exp_a, exp_b ); IF( exp_diff > 0 ) { - Scale_sig( &old_Aq_fx[imult1616( i, ( M + 1 ) )], ( M + 1 ), negate( exp_diff ) ); + Scale_sig( &old_Aq_fx[imult1616(i , ( M + 1 ))], ( M + 1 ), negate( exp_diff ) ); } ELSE { - Scale_sig( &Aq_fx[imult1616( i, ( M + 1 ) )], ( M + 1 ), exp_diff ); + Scale_sig( &Aq_fx[imult1616(i , ( M + 1 ))], ( M + 1 ), exp_diff ); } - FOR( j = imult1616( i, ( M + 1 ) ); j < imult1616( add( i, 1 ), ( M + 1 ) ); j++ ) + FOR( j = imult1616(i , ( M + 1 )); j < imult1616(add( i , 1 ) , ( M + 1 )); j++ ) { Aq_fx[j] = round_fx( L_mac( L_mult( ALP_FX, old_Aq_fx[j] ), MALP_FX, Aq_fx[j] ) ); @@ -490,12 +489,12 @@ void improv_amr_wb_gs_fx( FOR( i = 0; i < NB_SUBFR; i++ ) { #ifdef BASOP_NOGLOB - enr_LP_new = Enr_1_Az_fx_o( Aq_fx + imult1616( i, ( M + 1 ) ), L_SUBFR, &Overflow ); + enr_LP_new = Enr_1_Az_fx_o( Aq_fx + imult1616(i , ( M + 1 )), L_SUBFR, &Overflow ); #else enr_LP_new = Enr_1_Az_fx( Aq_fx + i * ( M + 1 ), L_SUBFR ); #endif test(); - IF( GT_16( shr( enr_LP_new, 7 ), enr_LP_old ) || Overflow ) + IF( GT_16( shr( enr_LP_new, 7 ) , enr_LP_old ) || Overflow ) { /* filter is unstable, do not modify the excitation */ Copy( Aq_orig, Aq_fx, NB_SUBFR * ( M + 1 ) ); diff --git a/lib_dec/gs_dec_fx.c b/lib_dec/gs_dec_fx.c index bd5f9b7f8..9310ee442 100644 --- a/lib_dec/gs_dec_fx.c +++ b/lib_dec/gs_dec_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #ifdef IVAS_FLOAT_FIXED /*=========================================================================*/ @@ -484,7 +483,7 @@ void decod_audio_fx( * Update BWE excitation *--------------------------------------------------------------------------------------*/ - IF( st_fx->hBWE_TD != NULL ) + IF ( st_fx->hBWE_TD != NULL ) { set16_fx( voice_factors, 0, NB_SUBFR16k ); IF( EQ_16( st_fx->L_frame, L_FRAME16k ) ) @@ -568,7 +567,7 @@ void decod_audio_ivas_fx( GSC_DEC_HANDLE hGSCDec; hGSCDec = st_fx->hGSCDec; - move16(); // Es_pred + move16(); //Es_pred /*---------------------------------------------------------------* * Initialization @@ -632,7 +631,7 @@ void decod_audio_ivas_fx( hGSCDec->noise_lev = NOISE_LEVEL_SP3; move16(); #if 1 // def ADD_LRTD - IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) ) + IF ( GE_16( st_fx->GSC_IVAS_mode, 1 ) ) { test(); if ( LT_32( st_fx->core_brate, GSC_L_RATE_STG ) && LT_32( st_fx->GSC_IVAS_mode, 3 ) ) @@ -690,7 +689,7 @@ void decod_audio_ivas_fx( nb_subfr = SWNB_SUBFR; move16(); - IF( GE_32( st_fx->core_brate, ACELP_9k60 ) ) + IF ( GE_32( st_fx->core_brate, ACELP_9k60 ) ) { nbits = 1; move16(); @@ -721,7 +720,7 @@ void decod_audio_ivas_fx( if ( EQ_16( shr( nb_frame_flg, 1 ), 1 ) ) { - nb_subfr = shl( nb_subfr, 1 ); + nb_subfr = shl(nb_subfr, 1); } #endif } @@ -766,7 +765,7 @@ void decod_audio_ivas_fx( pit_band_idx = (Word16) get_next_indice( st_fx, nbits ); } - IF( pit_band_idx != 0 ) + IF ( pit_band_idx != 0 ) { IF( LT_32( st_fx->core_brate, ACELP_9k60 ) ) { @@ -779,7 +778,7 @@ void decod_audio_ivas_fx( } /* detect bit errors in the bitstream */ - IF( GT_16( pit_band_idx, 13 ) ) /* The maximum decodable index is 10 + BAND1k2 (3) = 13 */ + IF ( GT_16( pit_band_idx, 13 ) ) /* The maximum decodable index is 10 + BAND1k2 (3) = 13 */ { pit_band_idx = 13; move16(); @@ -836,7 +835,7 @@ void decod_audio_ivas_fx( #else dec_pit_exc_fx( st_fx, Aq, st_fx->coder_type, Es_pred, pitch_buf, code, exc, bwe_exc, nb_subfr, gain_buf ); #endif - IF( LT_32( st_fx->core_brate, ACELP_9k60 ) ) + IF ( LT_32( st_fx->core_brate, ACELP_9k60 ) ) { minimum_fx( pitch_buf, shr( st_fx->L_frame, 6 ), &low_pit ); low_pit = shr( low_pit, 6 ); /*Q6 -> Q0 */ @@ -990,7 +989,7 @@ void decod_audio_ivas_fx( } #if 1 // ydef ADD_LRTD - IF( EQ_16( st_fx->idchan, 1 ) ) + IF ( EQ_16( st_fx->idchan, 1 ) ) { tmp_nb_bits_tot = add( tmp_nb_bits_tot, TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS ); if ( EQ_16( st_fx->tdm_LRTD_flag, 1 ) ) @@ -1017,7 +1016,7 @@ void decod_audio_ivas_fx( * Update BWE excitation *--------------------------------------------------------------------------------------*/ - IF( st_fx->hBWE_TD != NULL ) + IF ( st_fx->hBWE_TD != NULL ) { set16_fx( voice_factors, 0, NB_SUBFR16k ); IF( EQ_16( st_fx->L_frame, L_FRAME16k ) ) @@ -1288,7 +1287,7 @@ void gsc_dec_fx( { FOR( j = 0; j < shl( nb_subbands, 4 ); j++ ) { - IF( concat_out[j] > 0 ) + IF ( concat_out[j] > 0 ) { seed_init = extract_l( L_shl( seed_init, 3 ) ); } @@ -1490,7 +1489,7 @@ void gsc_dec_ivas_fx( move16(); WHILE( LT_16( i, SIZE_BRATE_INTERMED_TBL ) ) { - IF( LE_32( st_fx->core_brate, brate_intermed_tbl[i] ) ) + IF ( LE_32( st_fx->core_brate, brate_intermed_tbl[i] ) ) { break; } @@ -1570,7 +1569,7 @@ void gsc_dec_ivas_fx( st_fx->L_frame, st_fx->element_mode, st_fx->GSC_IVAS_mode ); #if 1 // def ADD_LRTD - IF( bit == 0 ) + IF ( bit == 0 ) { set16_fx( concat_out, 0, L_FRAME16k ); } diff --git a/lib_dec/hdecnrm_fx.c b/lib_dec/hdecnrm_fx.c index 4894ee0e8..c97344274 100644 --- a/lib_dec/hdecnrm_fx.c +++ b/lib_dec/hdecnrm_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_dec.h" /*--------------------------------------------------------------------------*/ diff --git a/lib_dec/hf_synth.c b/lib_dec/hf_synth.c index 38aaab11f..b2589a9bc 100644 --- a/lib_dec/hf_synth.c +++ b/lib_dec/hf_synth.c @@ -42,8 +42,7 @@ #include "rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "basop32.h" #endif diff --git a/lib_dec/hf_synth_fx.c b/lib_dec/hf_synth_fx.c index a40ae1a30..4c1e2f66a 100644 --- a/lib_dec/hf_synth_fx.c +++ b/lib_dec/hf_synth_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #include "basop32.h" #include "prot.h" @@ -116,7 +115,7 @@ void hf_synth_fx( p_Aq = Aq; FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR ) { - hf_synthesis_fx( hBWE_zero, core_brate, output_subfr, p_Aq, &exc[i_subfr], Q_exc, &synth[i_subfr], &synth16k[imult3216( (Word32) i_subfr, output_subfr ) / L_SUBFR], + hf_synthesis_fx( hBWE_zero, core_brate, output_subfr, p_Aq, &exc[i_subfr], Q_exc, &synth[i_subfr], &synth16k[imult3216((Word32)i_subfr , output_subfr) / L_SUBFR], Q_syn2, delay_syn_hf, memExp1, mem_hp_interp, extl, CNG_mode ); p_Aq += ( M + 1 ); @@ -347,8 +346,8 @@ static void hf_synthesis_fx( /* delay by 5 samples @16kHz to compensate CLDFB resampling delay (20samples) and HP filtering delay (roughly 15 samples) */ delay = NS2SA( 16000, DELAY_CLDFB_NS ) - 15; - Copy( HF_syn + sub( L_SUBFR16k, delay ), temp_buffer, delay ); - Copy( HF_syn, HF_syn + delay, sub( L_SUBFR16k, delay ) ); + Copy( HF_syn + sub(L_SUBFR16k , delay), temp_buffer, delay ); + Copy( HF_syn, HF_syn + delay, sub(L_SUBFR16k , delay) ); Copy( delay_syn_hf, HF_syn, delay ); Copy( temp_buffer, delay_syn_hf, delay ); @@ -656,7 +655,7 @@ static void filt_6k_7k_scale_fx( Word16 j; L_tmp = 0; move32(); - FOR( j = 0; j < 31; j++ ) + FOR ( j = 0; j < 31; j++ ) { #ifdef BASOP_NOGLOB L_tmp = L_mac_o( L_tmp, x[i + j], fir_6k_7k_fx[j], &Overflow ); @@ -1150,7 +1149,7 @@ void hf_synth_amr_wb_fx( pt4 = signum; FOR( i = 0; i < L_SUBFR16k; i++ ) { - IF( *pt1 > 0 ) + IF ( *pt1 > 0 ) { *pt1 = mult_r( *pt1, g ); /*qdct */ move16(); @@ -1264,7 +1263,7 @@ void hf_synth_amr_wb_fx( FOR( i = 240; i < L_FRAME16k; i++ ) { *pt1 = mult_r( *pt1, scale ); /*qdct */ - IF( GT_16( i, 255 ) ) + IF ( GT_16( i, 255 ) ) { *pt1 = mult_r( 19505, *pt1 ); move16(); @@ -1674,7 +1673,7 @@ static void envelope_fx( } /* LPC envelope level estimate */ - L_tmp = 0; + L_tmp = 0 ; move32(); pt1 = Ap; pt2 = exp_tab_p_fx; diff --git a/lib_dec/hq_classifier_dec_fx.c b/lib_dec/hq_classifier_dec_fx.c index 3a2d3f511..8b49892ee 100644 --- a/lib_dec/hq_classifier_dec_fx.c +++ b/lib_dec/hq_classifier_dec_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif @@ -39,7 +38,7 @@ Word16 ivas_hq_classifier_dec_fx( /* o : Consumed bits test(); IF( ( EQ_16( length, L_SPEC32k ) || EQ_16( length, L_SPEC48k ) ) && LE_32( core_brate, max_brate ) ) { - *hqswb_clas = (Word16) get_next_indice( st_fx, 2 ); + *hqswb_clas = (Word16)get_next_indice( st_fx, 2 ); move16(); bits = 2; move16(); @@ -70,7 +69,7 @@ Word16 ivas_hq_classifier_dec_fx( /* o : Consumed bits test(); IF( LE_32( st_fx->core_brate, HQ_32k ) && *hqswb_clas == HQ_NORMAL ) { - IF( EQ_16( length, L_SPEC32k ) ) + IF ( EQ_16( length, L_SPEC32k ) ) { *hqswb_clas = HQ_GEN_SWB; move16(); diff --git a/lib_dec/hq_conf_fec_fx.c b/lib_dec/hq_conf_fec_fx.c index dacd23a76..dfc19c542 100644 --- a/lib_dec/hq_conf_fec_fx.c +++ b/lib_dec/hq_conf_fec_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" diff --git a/lib_dec/hq_core_dec_fx.c b/lib_dec/hq_core_dec_fx.c index fb0f5f024..ccdb58986 100644 --- a/lib_dec/hq_core_dec_fx.c +++ b/lib_dec/hq_core_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED #include "prot.h" diff --git a/lib_dec/hq_env_dec_fx.c b/lib_dec/hq_env_dec_fx.c index 0226c32f3..20c64df45 100644 --- a/lib_dec/hq_env_dec_fx.c +++ b/lib_dec/hq_env_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/hq_hr_dec_fx.c b/lib_dec/hq_hr_dec_fx.c index d42acd11b..602df7dd3 100644 --- a/lib_dec/hq_hr_dec_fx.c +++ b/lib_dec/hq_hr_dec_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_dec/hq_lr_dec_fx.c b/lib_dec/hq_lr_dec_fx.c index a454af97a..a954f98aa 100644 --- a/lib_dec/hq_lr_dec_fx.c +++ b/lib_dec/hq_lr_dec_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_dec.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /*--------------------------------------------------------------------------* diff --git a/lib_dec/igf_dec.c b/lib_dec/igf_dec.c index c6d72f5d8..451b7e29b 100644 --- a/lib_dec/igf_dec.c +++ b/lib_dec/igf_dec.c @@ -44,7 +44,7 @@ #include "ivas_prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_dec/igf_dec_fx.c b/lib_dec/igf_dec_fx.c index cdcdfab1f..c2acb5be5 100644 --- a/lib_dec/igf_dec_fx.c +++ b/lib_dec/igf_dec_fx.c @@ -11,8 +11,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "stat_dec.h" #include "basop_util.h" diff --git a/lib_dec/igf_scf_dec_fx.c b/lib_dec/igf_scf_dec_fx.c index b9af11db1..221b9b7a4 100644 --- a/lib_dec/igf_scf_dec_fx.c +++ b/lib_dec/igf_scf_dec_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include "stl.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_dec.h" #include "basop_util.h" diff --git a/lib_dec/init_dec.c b/lib_dec/init_dec.c index 3a56b99e5..908738df3 100644 --- a/lib_dec/init_dec.c +++ b/lib_dec/init_dec.c @@ -40,12 +40,9 @@ #include "ivas_cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/init_dec_fx.c b/lib_dec/init_dec_fx.c index ba95b6933..05cda5a46 100644 --- a/lib_dec/init_dec_fx.c +++ b/lib_dec/init_dec_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ #include "stl.h" /* required for wmc_tool */ diff --git a/lib_dec/inov_dec.c b/lib_dec/inov_dec.c index ad5df5d4a..03831b28c 100644 --- a/lib_dec/inov_dec.c +++ b/lib_dec/inov_dec.c @@ -38,7 +38,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_dec/inov_dec_fx.c b/lib_dec/inov_dec_fx.c index 24c82e20a..9377005a0 100644 --- a/lib_dec/inov_dec_fx.c +++ b/lib_dec/inov_dec_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED /*======================================================================*/ diff --git a/lib_dec/ivas_agc_dec_fx.c b/lib_dec/ivas_agc_dec_fx.c index 2bf3ad9ca..26aad59c1 100644 --- a/lib_dec/ivas_agc_dec_fx.c +++ b/lib_dec/ivas_agc_dec_fx.c @@ -35,7 +35,7 @@ #ifdef IVAS_FLOAT_FIXED #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 0f92acf2d..191bea1c1 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -44,8 +44,7 @@ #include "ivas_rom_binauralRenderer.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com_fx.h" #include "debug.h" #endif diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c index 1ef2e9d41..9d2aa6d7e 100644 --- a/lib_dec/ivas_core_dec.c +++ b/lib_dec/ivas_core_dec.c @@ -42,8 +42,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig.c index ccb39cadf..a66795dca 100644 --- a/lib_dec/ivas_corecoder_dec_reconfig.c +++ b/lib_dec/ivas_corecoder_dec_reconfig.c @@ -35,8 +35,7 @@ #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #include "prot.h" #include diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c index 4faab3eb7..f0e4bfece 100644 --- a/lib_dec/ivas_cpe_dec.c +++ b/lib_dec/ivas_cpe_dec.c @@ -38,7 +38,7 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com.h" #include "wmc_auto.h" #include diff --git a/lib_dec/ivas_cpe_dec_fx.c b/lib_dec/ivas_cpe_dec_fx.c index 1a97e84b5..a246eb92f 100644 --- a/lib_dec/ivas_cpe_dec_fx.c +++ b/lib_dec/ivas_cpe_dec_fx.c @@ -40,8 +40,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com.h" #include "wmc_auto.h" #include diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index ae75fcf2f..2d84e7604 100644 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -36,8 +36,6 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_cnst.h" @@ -46,8 +44,7 @@ #include "ivas_rom_rend.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_rom_com_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_dirac_output_synthesis_cov.c b/lib_dec/ivas_dirac_output_synthesis_cov.c index c11dda7cc..10660be2d 100644 --- a/lib_dec/ivas_dirac_output_synthesis_cov.c +++ b/lib_dec/ivas_dirac_output_synthesis_cov.c @@ -49,8 +49,7 @@ #include "wmc_auto.h" #include "rom_dec.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 6119dde7d..193324414 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -42,8 +42,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec.c index 5a62afa9e..71a9514d8 100644 --- a/lib_dec/ivas_ism_dec.c +++ b/lib_dec/ivas_ism_dec.c @@ -39,7 +39,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #define IVAS_FLOAT_FIXED_TO_BE_REMOVED diff --git a/lib_dec/ivas_ism_dtx_dec.c b/lib_dec/ivas_ism_dtx_dec.c index d891ccfca..7a1494764 100644 --- a/lib_dec/ivas_ism_dtx_dec.c +++ b/lib_dec/ivas_ism_dtx_dec.c @@ -39,7 +39,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*-------------------------------------------------------------------* diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec.c index 2c2e61b70..e28a1214a 100644 --- a/lib_dec/ivas_ism_metadata_dec.c +++ b/lib_dec/ivas_ism_metadata_dec.c @@ -38,8 +38,7 @@ #include "ivas_rom_com.h" #include "ivas_rom_com_fx.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_stat_enc.h" #include #include "wmc_auto.h" diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec.c index 5aad96908..3f1cfbd1f 100644 --- a/lib_dec/ivas_ism_param_dec.c +++ b/lib_dec/ivas_ism_param_dec.c @@ -41,8 +41,7 @@ #include "ivas_rom_dec.h" #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer.c index 11fd356f4..7950e6db5 100644 --- a/lib_dec/ivas_ism_renderer.c +++ b/lib_dec/ivas_ism_renderer.c @@ -34,8 +34,7 @@ #include "options.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_prot_rend.h" diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 85963d371..42605102d 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -46,8 +46,7 @@ #ifdef DUMPS_ENABLED #include "debug.h" #endif // DUMPS_ENABLED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define float_to_fixed( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fixed_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_dec/ivas_lfe_dec_fx.c b/lib_dec/ivas_lfe_dec_fx.c index f615bbd1e..775535614 100644 --- a/lib_dec/ivas_lfe_dec_fx.c +++ b/lib_dec/ivas_lfe_dec_fx.c @@ -34,8 +34,7 @@ #include "options.h" #ifdef IVAS_FLOAT_FIXED #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" diff --git a/lib_dec/ivas_lfe_plc_fx.c b/lib_dec/ivas_lfe_plc_fx.c index f878ecf16..6a65839b8 100644 --- a/lib_dec/ivas_lfe_plc_fx.c +++ b/lib_dec/ivas_lfe_plc_fx.c @@ -33,8 +33,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include diff --git a/lib_dec/ivas_ls_custom_dec.c b/lib_dec/ivas_ls_custom_dec.c index 86414d84a..f87889e27 100644 --- a/lib_dec/ivas_ls_custom_dec.c +++ b/lib_dec/ivas_ls_custom_dec.c @@ -36,7 +36,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c index 9dff654ad..78aa9867b 100644 --- a/lib_dec/ivas_masa_dec.c +++ b/lib_dec/ivas_masa_dec.c @@ -39,12 +39,9 @@ #include "ivas_rom_com.h" #include "ivas_stat_dec.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot_fx.h" #include "ivas_rom_com_fx.h" diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c index 4887ffa12..57210b2cb 100644 --- a/lib_dec/ivas_mc_param_dec.c +++ b/lib_dec/ivas_mc_param_dec.c @@ -46,8 +46,7 @@ #include "wmc_auto.h" #include "rom_dec.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED #endif diff --git a/lib_dec/ivas_mc_paramupmix_dec.c b/lib_dec/ivas_mc_paramupmix_dec.c index 9b35fb7c9..246e81643 100644 --- a/lib_dec/ivas_mc_paramupmix_dec.c +++ b/lib_dec/ivas_mc_paramupmix_dec.c @@ -35,10 +35,8 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #include "ivas_prot.h" diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec.c index 7bd948ad6..cc014dd76 100644 --- a/lib_dec/ivas_mct_core_dec.c +++ b/lib_dec/ivas_mct_core_dec.c @@ -43,8 +43,7 @@ #include "ivas_stat_dec.h" #include "ivas_stat_com.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c index d83e28576..34ab57de5 100644 --- a/lib_dec/ivas_mct_dec.c +++ b/lib_dec/ivas_mct_dec.c @@ -37,14 +37,13 @@ #include "cnst.h" #include "ivas_cnst.h" #include "rom_com.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_mct_dec_mct_fx.c b/lib_dec/ivas_mct_dec_mct_fx.c index 83c66b62e..29685d898 100644 --- a/lib_dec/ivas_mct_dec_mct_fx.c +++ b/lib_dec/ivas_mct_dec_mct_fx.c @@ -39,8 +39,7 @@ #include #include "stat_enc.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" /*----------------------------------------------------------* diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index 4cb343648..36c68e3cf 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -45,10 +45,8 @@ #include "ivas_stat_com.h" #include #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_mono_dmx_renderer.c b/lib_dec/ivas_mono_dmx_renderer.c index 892298f1c..fabd897f5 100644 --- a/lib_dec/ivas_mono_dmx_renderer.c +++ b/lib_dec/ivas_mono_dmx_renderer.c @@ -35,8 +35,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_cnst.h" diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c index 51cf795b3..d6f965c8f 100644 --- a/lib_dec/ivas_objectRenderer_internal.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -40,8 +40,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #endif diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c index f376e8d7e..bc136eb1a 100644 --- a/lib_dec/ivas_omasa_dec.c +++ b/lib_dec/ivas_omasa_dec.c @@ -40,7 +40,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "math.h" // temporary (for fabs) #endif diff --git a/lib_dec/ivas_osba_dec.c b/lib_dec/ivas_osba_dec.c index 47d3ee5ec..4b9951065 100644 --- a/lib_dec/ivas_osba_dec.c +++ b/lib_dec/ivas_osba_dec.c @@ -40,8 +40,7 @@ #include "wmc_auto.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_out_setup_conversion.c b/lib_dec/ivas_out_setup_conversion.c index 60f3f8158..505b6797f 100644 --- a/lib_dec/ivas_out_setup_conversion.c +++ b/lib_dec/ivas_out_setup_conversion.c @@ -41,8 +41,7 @@ #include "ivas_rom_rend.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_pca_dec_fx.c b/lib_dec/ivas_pca_dec_fx.c index 40052469b..7dd2e334c 100644 --- a/lib_dec/ivas_pca_dec_fx.c +++ b/lib_dec/ivas_pca_dec_fx.c @@ -38,7 +38,7 @@ #include #include "ivas_cnst.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "math.h" /*-----------------------------------------------------------------------* diff --git a/lib_dec/ivas_post_proc.c b/lib_dec/ivas_post_proc.c index 694bc5320..c2decb8c5 100644 --- a/lib_dec/ivas_post_proc.c +++ b/lib_dec/ivas_post_proc.c @@ -36,8 +36,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_cnst.h" diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c index 7332f26f1..c80e1dbfb 100644 --- a/lib_dec/ivas_qmetadata_dec.c +++ b/lib_dec/ivas_qmetadata_dec.c @@ -41,8 +41,7 @@ #include "wmc_auto.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 336155665..5bc296fbc 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -43,7 +43,7 @@ #include #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * ivas_sba_set_cna_cng_flag() * diff --git a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c index 2ad1c081b..16e93aeb6 100644 --- a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c +++ b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c @@ -34,8 +34,7 @@ #include "options.h" #include "cnst.h" #include "ivas_cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" diff --git a/lib_dec/ivas_sba_rendering_internal.c b/lib_dec/ivas_sba_rendering_internal.c index 19113a09a..5a2ee5c77 100644 --- a/lib_dec/ivas_sba_rendering_internal.c +++ b/lib_dec/ivas_sba_rendering_internal.c @@ -41,7 +41,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #ifdef DUMPS_ENABLED #include "debug.h" diff --git a/lib_dec/ivas_sce_dec.c b/lib_dec/ivas_sce_dec.c index 7c30d3032..8c2ee04ba 100644 --- a/lib_dec/ivas_sce_dec.c +++ b/lib_dec/ivas_sce_dec.c @@ -37,8 +37,7 @@ #include "ivas_cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include "wmc_auto.h" diff --git a/lib_dec/ivas_sce_dec_fx.c b/lib_dec/ivas_sce_dec_fx.c index 5976c81a3..8e1b5d140 100644 --- a/lib_dec/ivas_sce_dec_fx.c +++ b/lib_dec/ivas_sce_dec_fx.c @@ -38,8 +38,7 @@ #include "ivas_cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" diff --git a/lib_dec/ivas_sns_dec_fx.c b/lib_dec/ivas_sns_dec_fx.c index f240029b3..ff96b6c06 100644 --- a/lib_dec/ivas_sns_dec_fx.c +++ b/lib_dec/ivas_sns_dec_fx.c @@ -40,8 +40,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" #endif diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c index 416ac4f73..007074796 100644 --- a/lib_dec/ivas_spar_decoder.c +++ b/lib_dec/ivas_spar_decoder.c @@ -34,7 +34,6 @@ #include "options.h" #include "ivas_stat_dec.h" #include "prot.h" -#include "prot_fx2.h" #include "string.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" @@ -46,8 +45,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED #ifdef DUMPS_ENABLED diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c index 1a894ce10..bf72059f0 100644 --- a/lib_dec/ivas_spar_md_dec.c +++ b/lib_dec/ivas_spar_md_dec.c @@ -34,15 +34,13 @@ #include "options.h" #include "math.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include #include "wmc_auto.h" #include "ivas_stat_dec.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_stereo_cng_dec.c b/lib_dec/ivas_stereo_cng_dec.c index eef15da05..50603a381 100644 --- a/lib_dec/ivas_stereo_cng_dec.c +++ b/lib_dec/ivas_stereo_cng_dec.c @@ -41,8 +41,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c index c9bf60ddf..09fc9f2fd 100644 --- a/lib_dec/ivas_stereo_dft_dec.c +++ b/lib_dec/ivas_stereo_dft_dec.c @@ -38,7 +38,7 @@ #include "rom_com.h" #include "rom_dec.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" diff --git a/lib_dec/ivas_stereo_dft_dec_dmx.c b/lib_dec/ivas_stereo_dft_dec_dmx.c index 7250baa6b..ee2c781b5 100644 --- a/lib_dec/ivas_stereo_dft_dec_dmx.c +++ b/lib_dec/ivas_stereo_dft_dec_dmx.c @@ -44,8 +44,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif @@ -295,13 +294,13 @@ void stereo_dft_unify_dmx_fx( Word16 exp_sum_abs = exp_sum_nrg_l; move16(); - if ( GT_16( exp_sum_nrg_R, exp_sum_nrg_l ) ) + if( GT_16( exp_sum_nrg_R, exp_sum_nrg_l ) ) { exp_sum_abs = exp_sum_nrg_R; move16(); } exp_sum_abs = add( exp_sum_abs, 1 ); - sum_abs = L_add( L_shr( tmp_nrg_L, sub( exp_sum_abs, exp_sum_nrg_l ) ), L_shr( tmp_nrg_R, sub( exp_sum_abs, exp_sum_nrg_R ) ) ); + sum_abs = L_add( L_shr( tmp_nrg_L, sub(exp_sum_abs , exp_sum_nrg_l) ), L_shr( tmp_nrg_R, sub( exp_sum_abs, exp_sum_nrg_R ) ) ); dot_prod_abs = Sqrt32( L_add( Mpy_32_32( dot_prod_real_32, dot_prod_real_32 ), Mpy_32_32( dot_prod_img_32, dot_prod_img_32 ) ), &exp_dot_prod_abs ); Word32 num = L_add( L_shr( L_add( sum_nrg_L_32, sum_nrg_R_32 ), 1 ), L_shr( dot_prod_abs, sub( sub( 31, exp_dot_prod_abs ), q_sum_nrg_L ) ) ); Word16 E_num = sub( 31, q_sum_nrg_L ); @@ -309,7 +308,7 @@ void stereo_dft_unify_dmx_fx( Word16 exp_wR = exp_sum_abs; move16(); - if ( LT_16( exp_sum_abs, E_num ) ) + if( LT_16( exp_sum_abs, E_num ) ) { exp_wR = E_num; move16(); @@ -329,14 +328,14 @@ void stereo_dft_unify_dmx_fx( } ELSE { - wR_temp = shr( divide3232( L_shr( num_sqrt, sub( exp_wR, E_num ) ), L_shr( sum_abs, sub( exp_wR, exp_sum_abs ) ) ), 2 ); + wR_temp = shr( divide3232( L_shr( num_sqrt, sub(exp_wR , E_num) ), L_shr( sum_abs, sub(exp_wR , exp_sum_abs) ) ), 2 ); } Word32 sum_nrg_Mid_sqrt = Sqrt32( sum_nrg_Mid, &exp_sum_nrg_Mid ); Word16 exp_wL = exp_sum_abs; move16(); - if ( LT_16( exp_sum_abs, exp_sum_nrg_Mid ) ) + if( LT_16( exp_sum_abs, exp_sum_nrg_Mid ) ) { exp_wL = exp_sum_nrg_Mid; move16(); diff --git a/lib_dec/ivas_stereo_dft_dec_fx.c b/lib_dec/ivas_stereo_dft_dec_fx.c index 52fc6e26c..ea5f56998 100644 --- a/lib_dec/ivas_stereo_dft_dec_fx.c +++ b/lib_dec/ivas_stereo_dft_dec_fx.c @@ -38,7 +38,7 @@ #include "rom_com.h" #include "rom_dec.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_cnst.h" @@ -49,7 +49,6 @@ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #include "basop_util.h" -#include "prot_fx1.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_dec/ivas_stereo_dft_plc_fx.c b/lib_dec/ivas_stereo_dft_plc_fx.c index 5abf182fe..3e41b5991 100644 --- a/lib_dec/ivas_stereo_dft_plc_fx.c +++ b/lib_dec/ivas_stereo_dft_plc_fx.c @@ -34,8 +34,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" @@ -111,12 +110,12 @@ void stereo_dft_res_ecu_fx( move16(); FOR( i = 0; i < STEREO_DFT32MS_N_8k / 4; i++ ) { - trigo_dec[i] = hStereoDft->dft_trigo_8k_fx[i_mult( i, trigo_step )]; + trigo_dec[i] = hStereoDft->dft_trigo_8k_fx[i_mult(i , trigo_step)]; move16(); - trigo_dec[STEREO_DFT32MS_N_8k / 2 - i] = hStereoDft->dft_trigo_8k_fx[i_mult( i, trigo_step )]; + trigo_dec[STEREO_DFT32MS_N_8k / 2 - i] = hStereoDft->dft_trigo_8k_fx[i_mult(i , trigo_step)]; move16(); } - trigo_dec[STEREO_DFT32MS_N_8k / 4] = hStereoDft->dft_trigo_8k_fx[i_mult( STEREO_DFT32MS_N_8k / 4, trigo_step )]; + trigo_dec[STEREO_DFT32MS_N_8k / 4] = hStereoDft->dft_trigo_8k_fx[i_mult(STEREO_DFT32MS_N_8k / 4 , trigo_step)]; move16(); /* estimation of res_cod_mem (ola part in imdct residual signal) and input_mem (memory for buffer in DFT analysis)*/ @@ -312,7 +311,7 @@ static void ivas_peakfinder_fx( move32(); ind[k] = 0; move16(); - k = add( k, 1 ); + k = add(k, 1); } FOR( i = 1; i < sub( len0, 1 ); i++ ) @@ -435,7 +434,7 @@ static void ivas_peakfinder_fx( move32(); } - ii = add( ii, 1 ); /* Move onto the valley */ + ii = add(ii,1); /* Move onto the valley */ /* Come down at least sel from peak */ test(); @@ -449,8 +448,8 @@ static void ivas_peakfinder_fx( move16(); peakMag[*cInd] = tempMag; move32(); - ( *cInd ) = add( *( cInd ), 1 ); - move16(); + ( *cInd ) = add(*(cInd),1); + move16(); } ELSE IF( LT_32( x[ii], leftMin ) ) /* New left minimum */ { @@ -582,7 +581,7 @@ void stereo_dft_res_subst_spec_fx( FOR( i = 1; i < L_res; i++ ) { Word32 r = L_shl( p_mem[2 * i], q_res ); - Word32 l = L_shl( p_mem[add( shl( i, 1 ), 1 )], q_res ); + Word32 l = L_shl( p_mem[add(shl(i,1), 1)], q_res ); abs_res[i] = Madd_32_32( Mpy_32_32( r, r ), l, l ); move32(); } @@ -694,7 +693,7 @@ void stereo_dft_res_subst_spec_fx( cos_F = shl_o( getCosWord16( extract_l( corr_phase ) ), 1, &flg_ov ); sin_F = getSinWord16( extract_l( corr_phase ) ); - idx = s_max( 0, sub( plocs[i], Np ) ); /* Iterate over plocs[i]-1:plocs[i]+1, considering the edges of the spectrum */ + idx = s_max( 0, sub(plocs[i] , Np) ); /* Iterate over plocs[i]-1:plocs[i]+1, considering the edges of the spectrum */ WHILE( ( idx < add( add( plocs[i], Np ), 1 ) ) && LT_16( idx, L_res ) ) { pDFT_RES[2 * idx] = Msub_32_16( Mpy_32_16_1( p_mem[2 * idx], cos_F ), p_mem[add( shl( idx, 1 ), 1 )], sin_F ); diff --git a/lib_dec/ivas_stereo_ica_dec.c b/lib_dec/ivas_stereo_ica_dec.c index 62bbbcdda..2553f40af 100644 --- a/lib_dec/ivas_stereo_ica_dec.c +++ b/lib_dec/ivas_stereo_ica_dec.c @@ -41,7 +41,7 @@ #include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop32.h" #include "ivas_stat_dec.h" @@ -694,7 +694,7 @@ void stereo_tca_scale_R_channel_fx( Word16 temp_a_q = 2; move16(); tempF1_fx = Inv16( temp_a, &temp_a_q ); - tempF1_fx = L_shl( tempF1_fx, sub( ( 31 - 4 ), sub( 15, temp_a_q ) ) ); + tempF1_fx = L_shl( tempF1_fx, sub(( 31 - 4 ) , sub( 15 , temp_a_q )) ); } @@ -709,7 +709,7 @@ void stereo_tca_scale_R_channel_fx( Word16 temp_b_q = 2; move16(); tempF_fx = Inv16( temp_b, &temp_b_q ); - tempF_fx = L_shl( tempF_fx, sub( ( 31 - 4 ), sub( 15, temp_b_q ) ) ); + tempF_fx = L_shl( tempF_fx, sub(( 31 - 4 ) , sub( 15 , temp_b_q )) ); } } SWITCH( output_Fs ) diff --git a/lib_dec/ivas_stereo_icbwe_dec.c b/lib_dec/ivas_stereo_icbwe_dec.c index ca3159f3e..95d43ad48 100644 --- a/lib_dec/ivas_stereo_icbwe_dec.c +++ b/lib_dec/ivas_stereo_icbwe_dec.c @@ -37,8 +37,7 @@ #include "cnst.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "wmc_auto.h" diff --git a/lib_dec/ivas_stereo_mdct_core_dec.c b/lib_dec/ivas_stereo_mdct_core_dec.c index de1bb794d..6a3638bfc 100644 --- a/lib_dec/ivas_stereo_mdct_core_dec.c +++ b/lib_dec/ivas_stereo_mdct_core_dec.c @@ -41,7 +41,7 @@ #include "ivas_stat_dec.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_stereo_mdct_core_dec_fx.c b/lib_dec/ivas_stereo_mdct_core_dec_fx.c index 88b25b872..17e2d3601 100644 --- a/lib_dec/ivas_stereo_mdct_core_dec_fx.c +++ b/lib_dec/ivas_stereo_mdct_core_dec_fx.c @@ -41,8 +41,7 @@ #include "ivas_prot.h" #include "ivas_stat_dec.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" /*------------------------------------------------------------------------- @@ -82,7 +81,7 @@ static void stereo_mdct_dec_stereo_fx( sts[0]->bits_frame_channel = add( sts[0]->bits_frame_channel, i_mult( sts[0]->core, SMDCT_MINIMUM_ARITH_BITS ) ); sts[1]->bits_frame_channel = add( sts[1]->bits_frame_channel, i_mult( sts[1]->core, SMDCT_MINIMUM_ARITH_BITS ) ); - sts[1]->bit_stream = &sts[0]->bit_stream[add( add( sts[0]->next_bit_pos, sts[0]->bits_frame_channel ), i_mult( sts[0]->core, NF_GAIN_BITS ) )]; + sts[1]->bit_stream = &sts[0]->bit_stream[add(add(sts[0]->next_bit_pos , sts[0]->bits_frame_channel) , i_mult(sts[0]->core , NF_GAIN_BITS))]; return; } @@ -820,7 +819,7 @@ static void apply_dmx_weights_fx( { /* subframe is TCX5, but TCX10 or TCX20 in other channel -> convert channel with TCX5 to TCX10 resolution */ pTmp[ch][k] = sig[ch][k] = convertRes[ch] + i_mult( k, shr( frameSize, 1 ) ); - convert_coeffs_to_higher_res_fx( x[ch][k], x[ch][k] + shr( frameSize, 2 ), pTmp[ch][k], shr( frameSize, 2 ) ); + convert_coeffs_to_higher_res_fx( x[ch][k], x[ch][k] + shr(frameSize ,2), pTmp[ch][k], shr( frameSize, 2 ) ); } } @@ -841,7 +840,7 @@ static void apply_dmx_weights_fx( FOR( l = 0; l < nsub2[k]; l++ ) { // mdst[ch][k][l * numCoeffs[k]] = mdst[ch][k][( l + 1 ) * numCoeffs[k] - 1] = 0.f; - mdst[ch][k][i_mult( l, numCoeffs[k] )] = mdst[ch][k][sub( i_mult( add( l, 1 ), numCoeffs[k] ), 1 )] = 0; + mdst[ch][k][i_mult(l , numCoeffs[k])] = mdst[ch][k][sub(i_mult(add( l , 1 ) , numCoeffs[k]) , 1)] = 0; move32(); move32(); FOR( i = l * numCoeffs[k] + 1; i < ( l + 1 ) * numCoeffs[k] - 1; i++ ) @@ -1164,7 +1163,7 @@ static void run_min_stats_fx( FOR( Word16 i = 1; i < L_FRAME16k - 1; i++ ) { Word32 mdst; - mdst = L_sub( spec_in[i + 1], spec_in[i - 1] ); /* Q31 - x_e */ + mdst = L_sub( spec_in[i + 1], spec_in[i - 1] ); /* Q31 - x_e */ power_spec[i] = L_add( W_extract_h( W_shl( W_mult_32_32( spec_in[i], spec_in[i] ), sub( tmp16, 4 ) ) ), W_extract_h( W_shl( W_mult_32_32( mdst, mdst ), sub( tmp16, 4 ) ) ) ); /* 2 * (Q31 - x_e) + tmp16 - Q4 - Q31*/ move32(); } diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c index d88e31198..9177bf69c 100644 --- a/lib_dec/ivas_stereo_mdct_stereo_dec.c +++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c @@ -39,8 +39,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec.c index c1c049cbd..774c1a8e0 100644 --- a/lib_dec/ivas_stereo_switching_dec.c +++ b/lib_dec/ivas_stereo_switching_dec.c @@ -35,17 +35,15 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" #include "assert.h" #include "wmc_auto.h" #include -#include "prot_fx2.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED +#include "prot_fx.h" #include "ivas_rom_com_fx.h" #endif diff --git a/lib_dec/ivas_stereo_td_dec.c b/lib_dec/ivas_stereo_td_dec.c index 83b6d67a4..79eac072c 100644 --- a/lib_dec/ivas_stereo_td_dec.c +++ b/lib_dec/ivas_stereo_td_dec.c @@ -36,8 +36,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include "ivas_cnst.h" diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec.c index 5d5ccedb4..9156aa718 100644 --- a/lib_dec/ivas_svd_dec.c +++ b/lib_dec/ivas_svd_dec.c @@ -38,8 +38,7 @@ #include "ivas_cnst.h" #include #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------* diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec.c index d51543302..626b71a10 100644 --- a/lib_dec/ivas_tcx_core_dec.c +++ b/lib_dec/ivas_tcx_core_dec.c @@ -35,14 +35,13 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx1.h" #include "rom_com.h" #include "stat_dec.h" #include "wmc_auto.h" #include "basop_proto_func.h" #include "stat_com.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" /*-------------------------------------------------------------* @@ -631,7 +630,7 @@ void stereo_tcx_core_dec_fx( IF( !bfi ) { st->stab_fac_fx = lsf_stab_fx( &lsf_fx[M], &lsf_fx[0], 0, st->L_frame ); - move16(); + move16(); } IF( hTcxDec->enableTcxLpc ) diff --git a/lib_dec/ivas_td_low_rate_dec.c b/lib_dec/ivas_td_low_rate_dec.c index bdaa26ebc..e1eaca3d3 100644 --- a/lib_dec/ivas_td_low_rate_dec.c +++ b/lib_dec/ivas_td_low_rate_dec.c @@ -38,8 +38,7 @@ #include "ivas_rom_com.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "wmc_auto.h" #ifndef IVAS_FLOAT_FIXED diff --git a/lib_dec/jbm_jb4sb.c b/lib_dec/jbm_jb4sb.c index 095868940..394452fb8 100644 --- a/lib_dec/jbm_jb4sb.c +++ b/lib_dec/jbm_jb4sb.c @@ -49,7 +49,7 @@ #include "jbm_jb4_jmf.h" #include "jbm_jb4sb.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define WMC_TOOL_SKIP #define INV_500_Q31 4294967 /*1/500 IN Q_31*/ diff --git a/lib_dec/jbm_pcmdsp_apa.c b/lib_dec/jbm_pcmdsp_apa.c index 72e57c5b5..9e11f8085 100644 --- a/lib_dec/jbm_pcmdsp_apa.c +++ b/lib_dec/jbm_pcmdsp_apa.c @@ -54,7 +54,7 @@ #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #define INV_100_Q15 328 #define INV_400_Q15 82 #define INV_80_Q15 410 diff --git a/lib_dec/lead_deindexing_fx.c b/lib_dec/lead_deindexing_fx.c index 2e9ea383f..80508277f 100644 --- a/lib_dec/lead_deindexing_fx.c +++ b/lib_dec/lead_deindexing_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" #include "rom_com.h" #include "rom_dec.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * Local function prototype diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 2b66b1084..44e0c0770 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -36,8 +36,7 @@ #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "jbm_jb4sb.h" #include "jbm_pcmdsp_apa.h" #include "jbm_pcmdsp_fifo.h" diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c index 900aa4d54..c2b52ecd1 100644 --- a/lib_dec/lib_dec_fx.c +++ b/lib_dec/lib_dec_fx.c @@ -36,8 +36,7 @@ #include "ivas_prot_rend.h" #include "prot.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "jbm_jb4sb.h" #include "jbm_pcmdsp_apa.h" #include "jbm_pcmdsp_fifo.h" diff --git a/lib_dec/lp_exc_d_fx.c b/lib_dec/lp_exc_d_fx.c index 40318b376..acad06090 100644 --- a/lib_dec/lp_exc_d_fx.c +++ b/lib_dec/lp_exc_d_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*======================================================================*/ /* FUNCTION : lp_filt_exc_dec_fx() */ diff --git a/lib_dec/lsf_dec.c b/lib_dec/lsf_dec.c index 2fb00b693..0628ccd33 100644 --- a/lib_dec/lsf_dec.c +++ b/lib_dec/lsf_dec.c @@ -39,7 +39,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_proto_func.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_dec/lsf_dec_fx.c b/lib_dec/lsf_dec_fx.c index 4ac20d1e6..2e99272cb 100644 --- a/lib_dec/lsf_dec_fx.c +++ b/lib_dec/lsf_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #if defined LSF_RE_USE_SECONDARY_CHANNEL || defined FIX_798_LSF_SECONDARY_CH_MISSING_CODE #include "ivas_prot.h" //#include "ivas_rom_com.h" diff --git a/lib_dec/lsf_msvq_ma_dec_fx.c b/lib_dec/lsf_msvq_ma_dec_fx.c index a8fb91fe3..3fc69d588 100644 --- a/lib_dec/lsf_msvq_ma_dec_fx.c +++ b/lib_dec/lsf_msvq_ma_dec_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_dec/nelp_dec_fx.c b/lib_dec/nelp_dec_fx.c index 418e74bcb..e5df5d6e4 100644 --- a/lib_dec/nelp_dec_fx.c +++ b/lib_dec/nelp_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /*===================================================================*/ diff --git a/lib_dec/peak_vq_dec_fx.c b/lib_dec/peak_vq_dec_fx.c index 356592067..a23ff76b4 100644 --- a/lib_dec/peak_vq_dec_fx.c +++ b/lib_dec/peak_vq_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "enh64.h" diff --git a/lib_dec/pit_dec_fx.c b/lib_dec/pit_dec_fx.c index faa3cb2d3..f99c8ac16 100644 --- a/lib_dec/pit_dec_fx.c +++ b/lib_dec/pit_dec_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #define inv_T0_res InvIntTable diff --git a/lib_dec/pitch_extr_fx.c b/lib_dec/pitch_extr_fx.c index 2e327938e..9b42a9b57 100644 --- a/lib_dec/pitch_extr_fx.c +++ b/lib_dec/pitch_extr_fx.c @@ -7,8 +7,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" diff --git a/lib_dec/post_dec_fx.c b/lib_dec/post_dec_fx.c index e6e4fffa4..071bc5188 100644 --- a/lib_dec/post_dec_fx.c +++ b/lib_dec/post_dec_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/ppp_dec_fx.c b/lib_dec/ppp_dec_fx.c index 1f0f485df..275229e36 100644 --- a/lib_dec/ppp_dec_fx.c +++ b/lib_dec/ppp_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /*===================================================================*/ diff --git a/lib_dec/pvq_core_dec_fx.c b/lib_dec/pvq_core_dec_fx.c index 65f94c317..f9e994cc6 100644 --- a/lib_dec/pvq_core_dec_fx.c +++ b/lib_dec/pvq_core_dec_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_dec/pvq_decode_fx.c b/lib_dec/pvq_decode_fx.c index 1ae7b0988..24aa0cfac 100644 --- a/lib_dec/pvq_decode_fx.c +++ b/lib_dec/pvq_decode_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/range_dec_fx.c b/lib_dec/range_dec_fx.c index 440137a95..515bd9cda 100644 --- a/lib_dec/range_dec_fx.c +++ b/lib_dec/range_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_dec/re8_dec_fx.c b/lib_dec/re8_dec_fx.c index e1177d1ec..2108ca24d 100644 --- a/lib_dec/re8_dec_fx.c +++ b/lib_dec/re8_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------------- * re8_dec_fx() diff --git a/lib_dec/rst_dec_fx.c b/lib_dec/rst_dec_fx.c index a4810115b..9e4f056d3 100644 --- a/lib_dec/rst_dec_fx.c +++ b/lib_dec/rst_dec_fx.c @@ -6,8 +6,7 @@ #include "stl.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*----------------------------------------------------------------------------------* * CNG_reset_dec() diff --git a/lib_dec/stat_noise_uv_dec_fx.c b/lib_dec/stat_noise_uv_dec_fx.c index b3c6998b6..0ea10d749 100644 --- a/lib_dec/stat_noise_uv_dec_fx.c +++ b/lib_dec/stat_noise_uv_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*---------------------------------------------------------* diff --git a/lib_dec/swb_bwe_dec.c b/lib_dec/swb_bwe_dec.c index f2b096d72..a1b61cdc6 100644 --- a/lib_dec/swb_bwe_dec.c +++ b/lib_dec/swb_bwe_dec.c @@ -39,14 +39,13 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "basop_util.h" #include "basop_proto_func.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" #endif // IVAS_FLOAT_FIXED #ifndef IVAS_FLOAT_FIXED diff --git a/lib_dec/swb_bwe_dec_fx.c b/lib_dec/swb_bwe_dec_fx.c index 742706db3..4b172de7b 100644 --- a/lib_dec/swb_bwe_dec_fx.c +++ b/lib_dec/swb_bwe_dec_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_enc.h" #include "ivas_prot_fx.h" diff --git a/lib_dec/swb_bwe_dec_hr.c b/lib_dec/swb_bwe_dec_hr.c index 5d090e708..1332bec60 100644 --- a/lib_dec/swb_bwe_dec_hr.c +++ b/lib_dec/swb_bwe_dec_hr.c @@ -41,7 +41,7 @@ #include "rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* diff --git a/lib_dec/swb_bwe_dec_hr_fx.c b/lib_dec/swb_bwe_dec_hr_fx.c index ed6ed4ae6..660415302 100644 --- a/lib_dec/swb_bwe_dec_hr_fx.c +++ b/lib_dec/swb_bwe_dec_hr_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ #include "rom_dec.h" /* Static table prototypes */ #include "cnst.h" /* Static table prototypes */ diff --git a/lib_dec/swb_bwe_dec_lr_fx.c b/lib_dec/swb_bwe_dec_lr_fx.c index 52c200bc4..485bbe6e2 100644 --- a/lib_dec/swb_bwe_dec_lr_fx.c +++ b/lib_dec/swb_bwe_dec_lr_fx.c @@ -4,8 +4,7 @@ #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/swb_tbe_dec.c b/lib_dec/swb_tbe_dec.c index 613e82b3f..0bd0bb8b7 100644 --- a/lib_dec/swb_tbe_dec.c +++ b/lib_dec/swb_tbe_dec.c @@ -39,8 +39,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_dec.h" #include "wmc_auto.h" diff --git a/lib_dec/swb_tbe_dec_fx.c b/lib_dec/swb_tbe_dec_fx.c index 333361cc8..330156ce0 100644 --- a/lib_dec/swb_tbe_dec_fx.c +++ b/lib_dec/swb_tbe_dec_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_dec.h" #include "stl.h" diff --git a/lib_dec/syn_outp_fx.c b/lib_dec/syn_outp_fx.c index 67399e2dd..32eebbfe8 100644 --- a/lib_dec/syn_outp_fx.c +++ b/lib_dec/syn_outp_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Debug prototypes */ -#include "prot_fx2.h" /* Debug prototypes */ +#include "prot_fx.h" /* Debug prototypes */ /*-------------------------------------------------------------------* * syn_output() diff --git a/lib_dec/tcq_core_dec_fx.c b/lib_dec/tcq_core_dec_fx.c index 0e3fa5f90..fcfe057ba 100644 --- a/lib_dec/tcq_core_dec_fx.c +++ b/lib_dec/tcq_core_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* * tcq_core_LR_dec() * diff --git a/lib_dec/tcx_utils_dec_fx.c b/lib_dec/tcx_utils_dec_fx.c index 7eb2d7576..e6a0dd262 100644 --- a/lib_dec/tcx_utils_dec_fx.c +++ b/lib_dec/tcx_utils_dec_fx.c @@ -8,8 +8,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_basop_util.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_dec/tns_base_dec_fx.c b/lib_dec/tns_base_dec_fx.c index 5ef1756b7..0631dad11 100644 --- a/lib_dec/tns_base_dec_fx.c +++ b/lib_dec/tns_base_dec_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include #include "rom_com.h" diff --git a/lib_dec/tonalMDCTconcealment.c b/lib_dec/tonalMDCTconcealment.c index 8e2097d74..f3456310a 100644 --- a/lib_dec/tonalMDCTconcealment.c +++ b/lib_dec/tonalMDCTconcealment.c @@ -45,8 +45,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/tonalMDCTconcealment_fx.c b/lib_dec/tonalMDCTconcealment_fx.c index 9881d47ec..d465a03cd 100644 --- a/lib_dec/tonalMDCTconcealment_fx.c +++ b/lib_dec/tonalMDCTconcealment_fx.c @@ -12,8 +12,7 @@ #include "options.h" #include "typedef.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_com.h" #include "prot.h" #include "ivas_prot_fx.h" @@ -520,7 +519,7 @@ void TonalMDCTConceal_SaveFreqSignal_ivas_fx( FOR( i = 0; i < nNewSamples; i++ ) { Word16 tmp = 0; - if ( mdctSpectrum[i] != 0 ) + if (mdctSpectrum[i] != 0) { tmp = 1; move16(); diff --git a/lib_dec/transition_dec_fx.c b/lib_dec/transition_dec_fx.c index 46bb39bf9..d0ee6d307 100644 --- a/lib_dec/transition_dec_fx.c +++ b/lib_dec/transition_dec_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" /*----------------------------------------------------------------------* diff --git a/lib_dec/updt_dec_fx.c b/lib_dec/updt_dec_fx.c index a92130a62..c71e93f35 100644 --- a/lib_dec/updt_dec_fx.c +++ b/lib_dec/updt_dec_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* * updt_dec() diff --git a/lib_dec/vlpc_1st_dec_fx.c b/lib_dec/vlpc_1st_dec_fx.c index 5d89a7696..1ba7a64d0 100644 --- a/lib_dec/vlpc_1st_dec_fx.c +++ b/lib_dec/vlpc_1st_dec_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" diff --git a/lib_dec/vlpc_2st_dec_fx.c b/lib_dec/vlpc_2st_dec_fx.c index df4d8e53e..3aa39e86a 100644 --- a/lib_dec/vlpc_2st_dec_fx.c +++ b/lib_dec/vlpc_2st_dec_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" //#ifdef DEBUGGING to be removed #include //#endif diff --git a/lib_dec/voiced_dec_fx.c b/lib_dec/voiced_dec_fx.c index e31032d4c..a52332fa0 100644 --- a/lib_dec/voiced_dec_fx.c +++ b/lib_dec/voiced_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "log2.h" diff --git a/lib_dec/waveadjust_fec_dec_fx.c b/lib_dec/waveadjust_fec_dec_fx.c index e7aadde27..095a56bc9 100644 --- a/lib_dec/waveadjust_fec_dec_fx.c +++ b/lib_dec/waveadjust_fec_dec_fx.c @@ -6,8 +6,7 @@ #include #include #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stat_com.h" #include "rom_com.h" diff --git a/lib_enc/ACcontextMapping_enc_fx.c b/lib_enc/ACcontextMapping_enc_fx.c index 62516fe35..11d60b854 100644 --- a/lib_enc/ACcontextMapping_enc_fx.c +++ b/lib_enc/ACcontextMapping_enc_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "basop_util.h" #include "cnst.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" //#include "prot_fx.h" #include "prot_fx_enc.h" diff --git a/lib_enc/FEC_enc_fx.c b/lib_enc/FEC_enc_fx.c index 8338409fb..c662d0572 100644 --- a/lib_enc/FEC_enc_fx.c +++ b/lib_enc/FEC_enc_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/SNR_calc_fx.c b/lib_enc/SNR_calc_fx.c index f39bc2b86..e3805a1f1 100644 --- a/lib_enc/SNR_calc_fx.c +++ b/lib_enc/SNR_calc_fx.c @@ -6,8 +6,7 @@ #include "options.h" #include "basop_util.h" #include "vad_basop.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_enc.h" #include "rom_com.h" diff --git a/lib_enc/acelp_core_enc.c b/lib_enc/acelp_core_enc.c index d006fa1ea..6b95f3abf 100644 --- a/lib_enc/acelp_core_enc.c +++ b/lib_enc/acelp_core_enc.c @@ -43,7 +43,7 @@ #include "prot.h" #include "ivas_cnst.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "ivas_rom_com.h" #include "wmc_auto.h" diff --git a/lib_enc/acelp_core_enc_fx.c b/lib_enc/acelp_core_enc_fx.c index c7688e7df..fb993c10a 100644 --- a/lib_enc/acelp_core_enc_fx.c +++ b/lib_enc/acelp_core_enc_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_enc.h" #include "rom_com.h" #include "rom_enc.h" /* Encoder static table prototypes */ diff --git a/lib_enc/acelp_core_switch_enc_fx.c b/lib_enc/acelp_core_switch_enc_fx.c index bda7304c8..574ccb191 100644 --- a/lib_enc/acelp_core_switch_enc_fx.c +++ b/lib_enc/acelp_core_switch_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/acelp_enc_util_fx.c b/lib_enc/acelp_enc_util_fx.c index 8dde5a319..9ac0accad 100644 --- a/lib_enc/acelp_enc_util_fx.c +++ b/lib_enc/acelp_enc_util_fx.c @@ -9,8 +9,7 @@ //#include "prot_fx.h" #include "basop_util.h" #include "cnst.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stat_enc.h" #include "rom_com.h" diff --git a/lib_enc/amr_wb_enc_fx.c b/lib_enc/amr_wb_enc_fx.c index 0fd37dd5d..f8ab8e6b5 100644 --- a/lib_enc/amr_wb_enc_fx.c +++ b/lib_enc/amr_wb_enc_fx.c @@ -10,8 +10,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" diff --git a/lib_enc/analy_lp_fx.c b/lib_enc/analy_lp_fx.c index 51c40ec5e..959cbecbe 100644 --- a/lib_enc/analy_lp_fx.c +++ b/lib_enc/analy_lp_fx.c @@ -9,8 +9,7 @@ #include "rom_com.h" /* Static table prototypes */ #include "rom_enc.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/analy_sp_fx.c b/lib_enc/analy_sp_fx.c index fd96bfe4e..ffef5bb62 100644 --- a/lib_enc/analy_sp_fx.c +++ b/lib_enc/analy_sp_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" #include "basop_util.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_enc.h" #include "rom_com.h" diff --git a/lib_enc/ari_enc.c b/lib_enc/ari_enc.c index 192479aa6..8481d6c94 100644 --- a/lib_enc/ari_enc.c +++ b/lib_enc/ari_enc.c @@ -39,7 +39,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_com.h" #include "basop_util.h" #include "wmc_auto.h" diff --git a/lib_enc/ari_enc_fx.c b/lib_enc/ari_enc_fx.c index 5e01f8f35..dd203aee0 100644 --- a/lib_enc/ari_enc_fx.c +++ b/lib_enc/ari_enc_fx.c @@ -9,8 +9,7 @@ #include "cnst.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------- diff --git a/lib_enc/ari_hm_enc_fx.c b/lib_enc/ari_hm_enc_fx.c index bc4c225df..93670491c 100644 --- a/lib_enc/ari_hm_enc_fx.c +++ b/lib_enc/ari_hm_enc_fx.c @@ -12,8 +12,7 @@ #include "rom_enc.h" #include "prot.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/arith_coder_enc_fx.c b/lib_enc/arith_coder_enc_fx.c index 5c96532be..585bd3ab3 100644 --- a/lib_enc/arith_coder_enc_fx.c +++ b/lib_enc/arith_coder_enc_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" #include "rom_com.h" diff --git a/lib_enc/avq_cod_fx.c b/lib_enc/avq_cod_fx.c index 5b1756bfd..ca75917b7 100644 --- a/lib_enc/avq_cod_fx.c +++ b/lib_enc/avq_cod_fx.c @@ -8,8 +8,7 @@ #include /* Compilation switches */ #include "prot.h" /* Function prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ diff --git a/lib_enc/bass_psfilter_enc_fx.c b/lib_enc/bass_psfilter_enc_fx.c index c8ea49bf3..a468f94e6 100644 --- a/lib_enc/bass_psfilter_enc_fx.c +++ b/lib_enc/bass_psfilter_enc_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/bw_detect_fx.c b/lib_enc/bw_detect_fx.c index 2496d54d3..004aa55d6 100644 --- a/lib_enc/bw_detect_fx.c +++ b/lib_enc/bw_detect_fx.c @@ -10,8 +10,7 @@ #include "rom_com.h" #include "basop_util.h" #include "ivas_cnst.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/cng_enc_fx.c b/lib_enc/cng_enc_fx.c index dc5ed20df..9f5ec0ebf 100644 --- a/lib_enc/cng_enc_fx.c +++ b/lib_enc/cng_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ //#include "basop_mpy.h" diff --git a/lib_enc/cod2t32_fx.c b/lib_enc/cod2t32_fx.c index afb4d7ff3..a975eeda4 100644 --- a/lib_enc/cod2t32_fx.c +++ b/lib_enc/cod2t32_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/cod4t64_fx.c b/lib_enc/cod4t64_fx.c index 43d1e6434..2afb691c1 100644 --- a/lib_enc/cod4t64_fx.c +++ b/lib_enc/cod4t64_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/cod_ace_fx.c b/lib_enc/cod_ace_fx.c index 667843880..222f330c8 100644 --- a/lib_enc/cod_ace_fx.c +++ b/lib_enc/cod_ace_fx.c @@ -11,8 +11,7 @@ #include "options.h" #include "rom_basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/cod_tcx_fx.c b/lib_enc/cod_tcx_fx.c index 0c3f7d4df..0b74d6de4 100644 --- a/lib_enc/cod_tcx_fx.c +++ b/lib_enc/cod_tcx_fx.c @@ -9,8 +9,7 @@ #include "rom_com.h" #include "stat_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stl.h" //#include "basop_mpy.h" diff --git a/lib_enc/cod_uv_fx.c b/lib_enc/cod_uv_fx.c index bf20ecfd0..accb947c7 100644 --- a/lib_enc/cod_uv_fx.c +++ b/lib_enc/cod_uv_fx.c @@ -7,8 +7,7 @@ #include //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/comvad_decision_fx.c b/lib_enc/comvad_decision_fx.c index 2fa8069f8..489b7861c 100644 --- a/lib_enc/comvad_decision_fx.c +++ b/lib_enc/comvad_decision_fx.c @@ -11,8 +11,7 @@ //#include "prot_fx.h" #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" diff --git a/lib_enc/cor_shif_fx.c b/lib_enc/cor_shif_fx.c index 6645155ef..e96d59f08 100644 --- a/lib_enc/cor_shif_fx.c +++ b/lib_enc/cor_shif_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_2div_fx.c b/lib_enc/core_enc_2div_fx.c index 37df43e37..6318fe62d 100644 --- a/lib_enc/core_enc_2div_fx.c +++ b/lib_enc/core_enc_2div_fx.c @@ -11,8 +11,7 @@ //#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_init_fx.c b/lib_enc/core_enc_init_fx.c index 938997bd4..5cbc60c31 100644 --- a/lib_enc/core_enc_init_fx.c +++ b/lib_enc/core_enc_init_fx.c @@ -15,8 +15,7 @@ #include #include "rom_com.h" /* Common constants */ #include "prot.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_ol_fx.c b/lib_enc/core_enc_ol_fx.c index 4a7db5f69..a92d1a309 100644 --- a/lib_enc/core_enc_ol_fx.c +++ b/lib_enc/core_enc_ol_fx.c @@ -10,8 +10,7 @@ #include "basop_util.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_reconf_fx.c b/lib_enc/core_enc_reconf_fx.c index 49631b178..e1f50ba23 100644 --- a/lib_enc/core_enc_reconf_fx.c +++ b/lib_enc/core_enc_reconf_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_switch_fx.c b/lib_enc/core_enc_switch_fx.c index 0eede724a..644de838f 100644 --- a/lib_enc/core_enc_switch_fx.c +++ b/lib_enc/core_enc_switch_fx.c @@ -11,8 +11,7 @@ #include "ivas_cnst.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_updt_fx.c b/lib_enc/core_enc_updt_fx.c index 9fa4f0ff3..fba6cb439 100644 --- a/lib_enc/core_enc_updt_fx.c +++ b/lib_enc/core_enc_updt_fx.c @@ -8,8 +8,7 @@ #include "cnst.h" /* Common constants */ #include "basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_switching_enc_fx.c b/lib_enc/core_switching_enc_fx.c index 457d93bd8..b4b9ea120 100644 --- a/lib_enc/core_switching_enc_fx.c +++ b/lib_enc/core_switching_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/corr_xh_fx.c b/lib_enc/corr_xh_fx.c index 698d14830..c25ee1450 100644 --- a/lib_enc/corr_xh_fx.c +++ b/lib_enc/corr_xh_fx.c @@ -5,8 +5,7 @@ #include "options.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/decision_matrix_enc_fx.c b/lib_enc/decision_matrix_enc_fx.c index 5f0eaf0cd..413dd876e 100644 --- a/lib_enc/decision_matrix_enc_fx.c +++ b/lib_enc/decision_matrix_enc_fx.c @@ -10,8 +10,7 @@ #include "stat_enc.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/detect_transient_fx.c b/lib_enc/detect_transient_fx.c index 0d86e3aab..b8df7d373 100644 --- a/lib_enc/detect_transient_fx.c +++ b/lib_enc/detect_transient_fx.c @@ -37,8 +37,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------*/ diff --git a/lib_enc/diffcod_fx.c b/lib_enc/diffcod_fx.c index 5fd01046a..708568261 100644 --- a/lib_enc/diffcod_fx.c +++ b/lib_enc/diffcod_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Compilation switches */ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function Prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------*/ diff --git a/lib_enc/dtx_fx.c b/lib_enc/dtx_fx.c index aa3bd7fd6..e79b8ace1 100644 --- a/lib_enc/dtx_fx.c +++ b/lib_enc/dtx_fx.c @@ -8,8 +8,7 @@ #include "rom_com.h" // #include "basop_mpy.h" #include -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "prot.h" @@ -68,8 +67,8 @@ void dtx_ivas_fx( Encoder_State *st_fx, /* i/o: encoder state structure */ const Word32 ivas_total_brate, /* i : IVAS total bitrate */ const Word16 vad, /* i : vad flag for DTX */ - const Word16 speech[] /* i : Pointer to the speech frame */ - + const Word16 speech[] /* i : Pointer to the speech frame */ + ) { Word16 alpha; @@ -425,7 +424,7 @@ void dtx_ivas_fx( #endif // hDtxEnc->frame_ener = sum2_f( speech, L_FRAME ); Word16 guard_bits = find_guarded_bits_fx( L_FRAME ); - // Word16 Q_frame_ener = 2 * Q_speech; + // Word16 Q_frame_ener = 2 * Q_speech; hDtxEnc->frame_ener_fx = sum2_f_16_gb_fx( speech, L_FRAME, guard_bits ); // 2*Q_speech-guard_bits /* Active speech (voiced) */ diff --git a/lib_enc/enc_acelp_fx.c b/lib_enc/enc_acelp_fx.c index b8aacc998..5f5943ac1 100644 --- a/lib_enc/enc_acelp_fx.c +++ b/lib_enc/enc_acelp_fx.c @@ -12,8 +12,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_acelp_tcx_main_fx.c b/lib_enc/enc_acelp_tcx_main_fx.c index 0688f7311..3b003e8f2 100644 --- a/lib_enc/enc_acelp_tcx_main_fx.c +++ b/lib_enc/enc_acelp_tcx_main_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_acelpx_fx.c b/lib_enc/enc_acelpx_fx.c index b24bcd066..550147215 100644 --- a/lib_enc/enc_acelpx_fx.c +++ b/lib_enc/enc_acelpx_fx.c @@ -8,8 +8,7 @@ #include "basop_util.h" #include "options.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------------------* diff --git a/lib_enc/enc_amr_wb_fx.c b/lib_enc/enc_amr_wb_fx.c index 492dd620d..9a03bffb0 100644 --- a/lib_enc/enc_amr_wb_fx.c +++ b/lib_enc/enc_amr_wb_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/enc_gain_fx.c b/lib_enc/enc_gain_fx.c index 8cd87ad10..dbc0e4d29 100644 --- a/lib_enc/enc_gain_fx.c +++ b/lib_enc/enc_gain_fx.c @@ -11,8 +11,7 @@ #include "rom_com.h" #include "rom_enc.h" #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ void E_GAIN_norm_corr( Word16 exc[], Word16 xn[], Word16 h[], Word16 t_min, Word16 t_max, Word16 corr_norm[], Word16 L_subfr ); diff --git a/lib_enc/enc_gen_voic_fx.c b/lib_enc/enc_gen_voic_fx.c index 1b9823e73..a1c09310f 100644 --- a/lib_enc/enc_gen_voic_fx.c +++ b/lib_enc/enc_gen_voic_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_gen_voic_rf.c b/lib_enc/enc_gen_voic_rf.c index ae4458960..7c38a433d 100644 --- a/lib_enc/enc_gen_voic_rf.c +++ b/lib_enc/enc_gen_voic_rf.c @@ -40,7 +40,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * reset_rf_indices() diff --git a/lib_enc/enc_gen_voic_rf_fx.c b/lib_enc/enc_gen_voic_rf_fx.c index c60767394..665cb8d45 100644 --- a/lib_enc/enc_gen_voic_rf_fx.c +++ b/lib_enc/enc_gen_voic_rf_fx.c @@ -11,8 +11,7 @@ #include "rom_basop_util.h" //#include "basop_mpy.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/enc_higher_acelp_fx.c b/lib_enc/enc_higher_acelp_fx.c index a67071533..59e2a359e 100644 --- a/lib_enc/enc_higher_acelp_fx.c +++ b/lib_enc/enc_higher_acelp_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" /*---------------------------------------------------------------------* diff --git a/lib_enc/enc_nelp_fx.c b/lib_enc/enc_nelp_fx.c index bca4d2a77..3fae11009 100644 --- a/lib_enc/enc_nelp_fx.c +++ b/lib_enc/enc_nelp_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/enc_pit_exc_fx.c b/lib_enc/enc_pit_exc_fx.c index f8d6eb8a4..5c223a033 100644 --- a/lib_enc/enc_pit_exc_fx.c +++ b/lib_enc/enc_pit_exc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*======================================================================*/ diff --git a/lib_enc/enc_ppp_fx.c b/lib_enc/enc_ppp_fx.c index 31cdc0a5c..a3ea6dcbb 100644 --- a/lib_enc/enc_ppp_fx.c +++ b/lib_enc/enc_ppp_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/enc_prm_fx.c b/lib_enc/enc_prm_fx.c index b32c0f2ae..0580c786d 100644 --- a/lib_enc/enc_prm_fx.c +++ b/lib_enc/enc_prm_fx.c @@ -12,8 +12,7 @@ #include "rom_com.h" #include "stl.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_tran_fx.c b/lib_enc/enc_tran_fx.c index a0a9ff902..d9cf06004 100644 --- a/lib_enc/enc_tran_fx.c +++ b/lib_enc/enc_tran_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*=================================================================================*/ diff --git a/lib_enc/enc_uv_fx.c b/lib_enc/enc_uv_fx.c index c67a5781e..4e11b34d2 100644 --- a/lib_enc/enc_uv_fx.c +++ b/lib_enc/enc_uv_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/energy_fx.c b/lib_enc/energy_fx.c index f14e0b407..f3708d604 100644 --- a/lib_enc/energy_fx.c +++ b/lib_enc/energy_fx.c @@ -9,8 +9,7 @@ #include "rom_enc.h" #include "vad_basop.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* * est_energy_fx() diff --git a/lib_enc/eval_pit_contr_fx.c b/lib_enc/eval_pit_contr_fx.c index df7622653..349b34f0f 100644 --- a/lib_enc/eval_pit_contr_fx.c +++ b/lib_enc/eval_pit_contr_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/evs_enc_fx.c b/lib_enc/evs_enc_fx.c index 7cc08c96b..b2262ece7 100644 --- a/lib_enc/evs_enc_fx.c +++ b/lib_enc/evs_enc_fx.c @@ -7,8 +7,7 @@ #include "prot.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" diff --git a/lib_enc/ext_sig_ana_fx.c b/lib_enc/ext_sig_ana_fx.c index a24b15f88..ab3dc57bb 100644 --- a/lib_enc/ext_sig_ana_fx.c +++ b/lib_enc/ext_sig_ana_fx.c @@ -9,8 +9,7 @@ //#include "prot_fx.h" #include "rom_com.h" #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/fd_cng_enc.c b/lib_enc/fd_cng_enc.c index d54d787f2..38803594f 100644 --- a/lib_enc/fd_cng_enc.c +++ b/lib_enc/fd_cng_enc.c @@ -41,7 +41,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "stat_enc.h" diff --git a/lib_enc/fd_cng_enc_fx.c b/lib_enc/fd_cng_enc_fx.c index 410cec202..33f693d4b 100644 --- a/lib_enc/fd_cng_enc_fx.c +++ b/lib_enc/fd_cng_enc_fx.c @@ -12,8 +12,7 @@ #include "rom_com.h" #include "rom_enc.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_enc/find_tar_fx.c b/lib_enc/find_tar_fx.c index 14de5fe44..6b4fde721 100644 --- a/lib_enc/find_tar_fx.c +++ b/lib_enc/find_tar_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "cnst.h" /* Common constants */ #include "basop_util.h" diff --git a/lib_enc/find_tilt_fx.c b/lib_enc/find_tilt_fx.c index 11106323e..f2e57a6c4 100644 --- a/lib_enc/find_tilt_fx.c +++ b/lib_enc/find_tilt_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/find_uv_fx.c b/lib_enc/find_uv_fx.c index dbe7714c9..41ddc0ebf 100644 --- a/lib_enc/find_uv_fx.c +++ b/lib_enc/find_uv_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/find_wsp.c b/lib_enc/find_wsp.c index fb9efa29b..9ecbc8a48 100644 --- a/lib_enc/find_wsp.c +++ b/lib_enc/find_wsp.c @@ -39,7 +39,7 @@ #include "cnst.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * find_wsp() * @@ -96,32 +96,32 @@ void ivas_find_wsp( const Word16 L_frame, /* i : length of the frame */ const Word16 L_subfr, /* i : length of subframe */ const Word16 nb_subfr, /* i : number of subframes */ - const Word16 *A_fx, /* i : A(z) filter coefficients */ - Word16 *Aw_fx, /* o : weighted A(z) filter coefficients */ - const Word16 *speech_fx, /* i : pointer to the denoised speech frame */ + const Word16 *A_fx, /* i : A(z) filter coefficients */ + Word16 *Aw_fx, /* o : weighted A(z) filter coefficients */ + const Word16 *speech_fx, /* i : pointer to the denoised speech frame */ const Word16 tilt_fact, /* i : tilt factor */ - Word16 *wsp_fx, /* o : poitnter to the weighted speech frame */ - Word16 *mem_wsp_fx, /* i/o: W(Z) denominator memory */ + Word16 *wsp_fx, /* o : poitnter to the weighted speech frame */ + Word16 *mem_wsp_fx, /* i/o: W(Z) denominator memory */ const Word16 gamma, /* i : weighting factor */ - const Word16 L_look /* i : look-ahead */ + const Word16 L_look /* i : look-ahead */ ) { Word16 *p_Aw_fx, tmp_fx; Word16 i_subfr; - /*-----------------------------------------------------------------* - * Compute weighted A(z) unquantized for subframes - *-----------------------------------------------------------------*/ +/*-----------------------------------------------------------------* + * Compute weighted A(z) unquantized for subframes + *-----------------------------------------------------------------*/ weight_a_subfr_fx( nb_subfr, A_fx, Aw_fx, gamma, M ); - + /*-----------------------------------------------------------------* * Compute weighted speech for all subframes *-----------------------------------------------------------------*/ p_Aw_fx = Aw_fx; for ( i_subfr = 0; i_subfr < L_frame; i_subfr += L_subfr ) { - Residu3_fx( p_Aw_fx, &speech_fx[i_subfr], &wsp_fx[i_subfr], L_subfr, 0 ); + Residu3_fx( p_Aw_fx, &speech_fx[i_subfr], &wsp_fx[i_subfr], L_subfr,0 ); p_Aw_fx += ( M + 1 ); } p_Aw_fx -= ( M + 1 ); @@ -131,7 +131,7 @@ void ivas_find_wsp( *-----------------------------------------------------------------*/ deemph_fx( wsp_fx, tilt_fact, L_frame, mem_wsp_fx ); - Residu3_fx( p_Aw_fx, &speech_fx[L_frame], &wsp_fx[L_frame], L_look, 0 ); + Residu3_fx( p_Aw_fx, &speech_fx[L_frame], &wsp_fx[L_frame], L_look,0 ); tmp_fx = *mem_wsp_fx; deemph_fx( &wsp_fx[L_frame], tilt_fact, L_look, &tmp_fx ); return; diff --git a/lib_enc/find_wsp_fx.c b/lib_enc/find_wsp_fx.c index 21be0073b..06b22cc5e 100644 --- a/lib_enc/find_wsp_fx.c +++ b/lib_enc/find_wsp_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/frame_spec_dif_cor_rate_fx.c b/lib_enc/frame_spec_dif_cor_rate_fx.c index fb0930579..c94ccedeb 100644 --- a/lib_enc/frame_spec_dif_cor_rate_fx.c +++ b/lib_enc/frame_spec_dif_cor_rate_fx.c @@ -10,8 +10,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/gain_enc_fx.c b/lib_enc/gain_enc_fx.c index ad366278c..f9576afeb 100644 --- a/lib_enc/gain_enc_fx.c +++ b/lib_enc/gain_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/gaus_enc_fx.c b/lib_enc/gaus_enc_fx.c index 56ac45f26..8f35bc6fb 100644 --- a/lib_enc/gaus_enc_fx.c +++ b/lib_enc/gaus_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com.h" /* Static table prototypes */ #include "rom_enc.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ //#include "basop_mpy.h" diff --git a/lib_enc/gp_clip_fx.c b/lib_enc/gp_clip_fx.c index 1a1f1debf..3a82ddd64 100644 --- a/lib_enc/gp_clip_fx.c +++ b/lib_enc/gp_clip_fx.c @@ -37,8 +37,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/gs_enc_fx.c b/lib_enc/gs_enc_fx.c index 615b09fd0..29f6fbb3a 100644 --- a/lib_enc/gs_enc_fx.c +++ b/lib_enc/gs_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/guided_plc_enc_fx.c b/lib_enc/guided_plc_enc_fx.c index aebdfb748..64694bbdc 100644 --- a/lib_enc/guided_plc_enc_fx.c +++ b/lib_enc/guided_plc_enc_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stat_enc.h" #include "basop_util.h" diff --git a/lib_enc/hf_cod_amrwb_fx.c b/lib_enc/hf_cod_amrwb_fx.c index 0fa53be51..170bb9408 100644 --- a/lib_enc/hf_cod_amrwb_fx.c +++ b/lib_enc/hf_cod_amrwb_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" #include "cnst.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/hq_classifier_enc_fx.c b/lib_enc/hq_classifier_enc_fx.c index ebf3855ee..c72ebb8cc 100644 --- a/lib_enc/hq_classifier_enc_fx.c +++ b/lib_enc/hq_classifier_enc_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/hq_core_enc_fx.c b/lib_enc/hq_core_enc_fx.c index 132df11bb..a0ca2a16d 100644 --- a/lib_enc/hq_core_enc_fx.c +++ b/lib_enc/hq_core_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------------- diff --git a/lib_enc/hq_env_enc_fx.c b/lib_enc/hq_env_enc_fx.c index d64685dda..f995f364a 100644 --- a/lib_enc/hq_env_enc_fx.c +++ b/lib_enc/hq_env_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------------------* diff --git a/lib_enc/hq_hr_enc_fx.c b/lib_enc/hq_hr_enc_fx.c index 3049e6c21..706304fe0 100644 --- a/lib_enc/hq_hr_enc_fx.c +++ b/lib_enc/hq_hr_enc_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_enc/hq_lr_enc_fx.c b/lib_enc/hq_lr_enc_fx.c index d1f352057..414a77c97 100644 --- a/lib_enc/hq_lr_enc_fx.c +++ b/lib_enc/hq_lr_enc_fx.c @@ -9,8 +9,7 @@ #include "rom_enc.h" //#include "basop_mpy.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/hvq_enc_fx.c b/lib_enc/hvq_enc_fx.c index 107905ccb..4d817c104 100644 --- a/lib_enc/hvq_enc_fx.c +++ b/lib_enc/hvq_enc_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define HVQ_ENC_NOISE_DELTA ( (Word16) 3277 ) /* 0.1 in Q15 */ diff --git a/lib_enc/igf_enc_fx.c b/lib_enc/igf_enc_fx.c index 1841bd93a..c9661e16b 100644 --- a/lib_enc/igf_enc_fx.c +++ b/lib_enc/igf_enc_fx.c @@ -9,8 +9,7 @@ #include "cnst.h" #include "stl.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stat_enc.h" #include "basop_util.h" diff --git a/lib_enc/igf_scf_enc_fx.c b/lib_enc/igf_scf_enc_fx.c index b5a74687a..49bfbe9da 100644 --- a/lib_enc/igf_scf_enc_fx.c +++ b/lib_enc/igf_scf_enc_fx.c @@ -9,8 +9,7 @@ #include "stat_enc.h" #include "stat_com.h" #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/init_enc.c b/lib_enc/init_enc.c index 44b398a89..56144429e 100644 --- a/lib_enc/init_enc.c +++ b/lib_enc/init_enc.c @@ -41,7 +41,7 @@ #include "rom_enc.h" #include "prot.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_enc/init_enc_fx.c b/lib_enc/init_enc_fx.c index d740915c1..13c3e06ee 100644 --- a/lib_enc/init_enc_fx.c +++ b/lib_enc/init_enc_fx.c @@ -10,8 +10,7 @@ #include "stl.h" #include "ivas_cnst.h" #include "ivas_error.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/inov_enc_fx.c b/lib_enc/inov_enc_fx.c index 3b21cb7e7..f3e9dbfd3 100644 --- a/lib_enc/inov_enc_fx.c +++ b/lib_enc/inov_enc_fx.c @@ -8,8 +8,7 @@ #include "basop_util.h" #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/isf_enc_amr_wb_fx.c b/lib_enc/isf_enc_amr_wb_fx.c index 8d19855a4..02bdb00ad 100644 --- a/lib_enc/isf_enc_amr_wb_fx.c +++ b/lib_enc/isf_enc_amr_wb_fx.c @@ -34,8 +34,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/ivas_agc_enc.c b/lib_enc/ivas_agc_enc.c index acfd266eb..8e7055410 100644 --- a/lib_enc/ivas_agc_enc.c +++ b/lib_enc/ivas_agc_enc.c @@ -39,8 +39,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop_util.h" #endif diff --git a/lib_enc/ivas_core_pre_proc_front.c b/lib_enc/ivas_core_pre_proc_front.c index 616d5cc15..39530d87e 100644 --- a/lib_enc/ivas_core_pre_proc_front.c +++ b/lib_enc/ivas_core_pre_proc_front.c @@ -37,8 +37,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "ivas_prot.h" #include "wmc_auto.h" @@ -920,7 +919,7 @@ ivas_error pre_proc_front_ivas_fx( float sp_div, PS[128]; /* speech/music clasif. parameters */ int16_t L_look; /* length of look-ahead */ #if 1 - float snr_sum_he; /* HE SAD parameters */ + float snr_sum_he; /* HE SAD parameters */ #endif float mem_decim_dummy[2 * L_FILT_MAX]; /* dummy decimation filter memory */ float temp1F_icatdmResampBuf[L_FILT_MAX]; /* temp buffers for ICA TDM resamplers */ @@ -962,8 +961,8 @@ ivas_error pre_proc_front_ivas_fx( Word16 *temp1F_icatdmResampBuf_fx; Word16 *old_inp_12k8_fx; Word16 *old_inp_16k_fx; - Word16 *mem_decim_dummy_fx; /* dummy decimation filter memory */ - Word32 Etot_fx; /* total energy */ + Word16 *mem_decim_dummy_fx; /* dummy decimation filter memory */ + Word32 Etot_fx; /* total energy */ #if 0 Word32 fr_bands_fx[2 * NB_BANDS]; /* energy in frequency bands */ Word16 Q_new; @@ -1354,7 +1353,7 @@ ivas_error pre_proc_front_ivas_fx( { mvr2r( new_inp_12k8, st->buf_speech_enc_flt + L_FRAME32k, L_FRAME ); } -#ifndef MSAN_FIX /*To be enabled when updations related to new_inp_12k8_fx is enabled */ +#ifndef MSAN_FIX/*To be enabled when updations related to new_inp_12k8_fx is enabled */ #if 1 IF( EQ_16( element_mode, IVAS_CPE_DFT ) ) { @@ -1730,7 +1729,7 @@ ivas_error pre_proc_front_ivas_fx( st->lt_mean_NB_fx = (Word16) st->lt_mean_NB * ( 1 << 11 ); st->lt_mean_WB_fx = (Word16) st->lt_mean_WB * ( 1 << 11 ); st->lt_mean_SWB_fx = (Word16) st->lt_mean_SWB * ( 1 << 11 ); - st->lp_noise_fx = (Word16) st->lp_noise * ( 1 << 8 ); // have taken Q8 as above one functions uses Q8 + st->lp_noise_fx = (Word16) st->lp_noise * ( 1 << 8 ); //have taken Q8 as above one functions uses Q8 #endif bw_detect_fx( st, st->input_fx, NULL, enerBuffer_fx, sf_energySum, ivas_format, 0 ); diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c index cfd4348cb..da80d795c 100644 --- a/lib_enc/ivas_cpe_enc.c +++ b/lib_enc/ivas_cpe_enc.c @@ -43,8 +43,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/ivas_dirac_enc.c b/lib_enc/ivas_dirac_enc.c index bd7b63a4c..61a8092ca 100644 --- a/lib_enc/ivas_dirac_enc.c +++ b/lib_enc/ivas_dirac_enc.c @@ -36,8 +36,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_cnst.h" diff --git a/lib_enc/ivas_enc.c b/lib_enc/ivas_enc.c index d7e2d24b2..821389abc 100644 --- a/lib_enc/ivas_enc.c +++ b/lib_enc/ivas_enc.c @@ -41,8 +41,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler.c index 804470189..0265ac6d1 100644 --- a/lib_enc/ivas_enc_cov_handler.c +++ b/lib_enc/ivas_enc_cov_handler.c @@ -37,7 +37,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*------------------------------------------------------------------------------------------* diff --git a/lib_enc/ivas_front_vad.c b/lib_enc/ivas_front_vad.c index be9a837de..87ae69efe 100644 --- a/lib_enc/ivas_front_vad.c +++ b/lib_enc/ivas_front_vad.c @@ -39,13 +39,12 @@ #include "prot.h" #include "ivas_prot.h" #include "prot_fx_enc.h" -#include "prot_fx1.h" #include #include "wmc_auto.h" #include #ifdef IVAS_FLOAT_FIXED #include "prot_fx_enc.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*-----------------------------------------------------------------------------------------* diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index 5af37336d..10fae0321 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -42,7 +42,7 @@ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #include "prot_fx_enc.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc.c index 157b81378..1aa7a85c3 100644 --- a/lib_enc/ivas_ism_dtx_enc.c +++ b/lib_enc/ivas_ism_dtx_enc.c @@ -38,8 +38,7 @@ #include "ivas_prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "prot_fx_enc.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED @@ -155,7 +154,7 @@ Word16 ivas_ism_dtx_enc_fx( test(); test(); - if ( GT_16( lp_noise_mean_fx, ( 50 << 8 ) ) || ( GT_16( lp_noise_mean_fx, ( 25 << 8 ) ) && GT_16( lp_noise_variation_fx, ( 32 << 8 ) ) ) ) + if( GT_16( lp_noise_mean_fx, ( 50 << 8 ) ) || ( GT_16( lp_noise_mean_fx, ( 25 << 8 ) ) && GT_16( lp_noise_variation_fx, ( 32 << 8 ) ) ) ) { dtx_flag = 0; move16(); @@ -173,11 +172,11 @@ Word16 ivas_ism_dtx_enc_fx( test(); test(); test(); - if ( !( ( EQ_16( nchan_ism, 1 ) && LE_32( ivas_total_brate, IVAS_24k4 ) ) || - ( EQ_16( nchan_ism, 2 ) && LE_32( ivas_total_brate, IVAS_48k ) ) || - ( EQ_16( nchan_ism, 3 ) && LE_32( ivas_total_brate, IVAS_80k ) ) || - ( EQ_16( nchan_ism, 4 ) && LE_32( ivas_total_brate, IVAS_96k ) ) || - LT_16( lp_noise_max_fx, ( 15 << 8 ) ) ) ) + if( !( ( EQ_16( nchan_ism, 1 ) && LE_32( ivas_total_brate, IVAS_24k4 ) ) || + ( EQ_16( nchan_ism, 2 ) && LE_32( ivas_total_brate, IVAS_48k ) ) || + ( EQ_16( nchan_ism, 3 ) && LE_32( ivas_total_brate, IVAS_80k ) ) || + ( EQ_16( nchan_ism, 4 ) && LE_32( ivas_total_brate, IVAS_96k ) ) || + LT_16( lp_noise_max_fx, ( 15 << 8 ) ) ) ) { dtx_flag = 0; move16(); @@ -209,13 +208,13 @@ Word16 ivas_ism_dtx_enc_fx( /* check difference between current and last metadata */ md_diff_flag[ch] = 0; move16(); - if ( GT_32( L_abs( L_sub( hIsmMeta[ch]->azimuth_fx, hIsmMeta[ch]->last_azimuth_fx ) ), MD_MAX_DIFF_AZIMUTH_FX ) ) + if( GT_32( L_abs( L_sub( hIsmMeta[ch]->azimuth_fx, hIsmMeta[ch]->last_azimuth_fx ) ), MD_MAX_DIFF_AZIMUTH_FX ) ) { md_diff_flag[ch] = 1; move16(); } - if ( GT_32( L_abs( L_sub( hIsmMeta[ch]->elevation_fx, hIsmMeta[ch]->last_elevation_fx ) ), MD_MAX_DIFF_ELEVATION_FX ) ) + if( GT_32( L_abs( L_sub( hIsmMeta[ch]->elevation_fx, hIsmMeta[ch]->last_elevation_fx ) ), MD_MAX_DIFF_ELEVATION_FX ) ) { md_diff_flag[ch] = 1; move16(); @@ -236,7 +235,7 @@ Word16 ivas_ism_dtx_enc_fx( move16(); nBits_MD_max = sub( nBits_MD_max, SID_FORMAT_NBITS ); - if ( GT_16( nchan_transport, 1 ) ) + if( GT_16( nchan_transport, 1 ) ) { nBits_MD_max = sub( nBits_MD_max, nBits_sce_id ); } @@ -246,13 +245,13 @@ Word16 ivas_ism_dtx_enc_fx( nBits_MD_max = sub( nBits_MD_max, nBits_coh ); /* coherence */ } - if ( GT_16( nchan_ism, 3 ) ) + if( GT_16( nchan_ism, 3 ) ) { nBits_MD_max = sub( nBits_MD_max, 1 ); /* ism_mode flag */ } /* too many metadata bits -> switch to active coding */ - if ( GT_16( nBits, nBits_MD_max ) ) + if( GT_16( nBits, nBits_MD_max ) ) { dtx_flag = 0; move16(); @@ -718,7 +717,7 @@ void ivas_ism_coh_estim_dtx_enc_fx( { norm_inp = norm_l( st_id0->input32_fx[i] ); scaled_inp = L_shl( st_id0->input32_fx[i], norm_inp ); - tot_exp = shl( sub( 20, norm_inp ), 1 ); + tot_exp = shl( sub( 20, norm_inp), 1 ); acorr_ene_fx[hISMDTX->sce_id_dtx] = BASOP_Util_Add_Mant32Exp( acorr_ene_fx[hISMDTX->sce_id_dtx], acorr_ene_e[hISMDTX->sce_id_dtx], Mult_32_32( scaled_inp, scaled_inp ), tot_exp, &acorr_ene_e[hISMDTX->sce_id_dtx] ); move32(); } @@ -745,7 +744,7 @@ void ivas_ism_coh_estim_dtx_enc_fx( { norm_inp = norm_l( st->input32_fx[i] ); scaled_inp = L_shl( st->input32_fx[i], norm_inp ); - tot_exp = shl( sub( 20, norm_inp ), 1 ); + tot_exp = shl( sub( 20, norm_inp), 1 ); acorr_ene_fx[sce_id] = BASOP_Util_Add_Mant32Exp( acorr_ene_fx[sce_id], acorr_ene_e[sce_id], Mult_32_32( scaled_inp, scaled_inp ), tot_exp, &acorr_ene_e[sce_id] ); move32(); xcorr_ene_fx = BASOP_Util_Add_Mant32Exp( xcorr_ene_fx, xcorr_ene_e, Mult_32_32( scaled_inp, scaled_inp ), tot_exp, &xcorr_ene_e ); diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc.c index 45e4f6534..43cc16ecc 100644 --- a/lib_enc/ivas_ism_enc.c +++ b/lib_enc/ivas_ism_enc.c @@ -39,8 +39,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif @@ -204,12 +203,12 @@ ivas_error ivas_ism_enc( /* compute the dominant sce_id using long term energy */ #ifdef IVAS_FLOAT_FIXED #if 1 /************************flt_to_fix****************************/ - for ( int j = 0; j < st_ivas->nchan_transport; j++ ) + for( int j = 0; j < st_ivas->nchan_transport; j++ ) { - floatToFixed_arrL( st_ivas->hSCE[j]->hCoreCoder[0]->input, st_ivas->hSCE[j]->hCoreCoder[0]->input32_fx, Q11, input_frame ); /*Q0*/ + floatToFixed_arrL( st_ivas->hSCE[j]->hCoreCoder[0]->input, st_ivas->hSCE[j]->hCoreCoder[0]->input32_fx, Q11, input_frame ); /*Q0*/ } f2me_buf( &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc[0][0], &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_fx[0][0], &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_e, st_ivas->nchan_transport * PARAM_ISM_HYS_BUF_SIZE ); - for ( int ch = 0; ch < nchan_ism; ch++ ) + for( int ch = 0; ch < nchan_ism; ch++ ) { st_ivas->hIsmMetaData[ch]->azimuth_fx = float_to_fix( st_ivas->hIsmMetaData[ch]->azimuth, Q22 ); st_ivas->hIsmMetaData[ch]->last_azimuth_fx = float_to_fix( st_ivas->hIsmMetaData[ch]->last_azimuth, Q22 ); @@ -224,15 +223,15 @@ ivas_error ivas_ism_enc( #endif /****************************ends here*********************************/ ivas_ism_get_sce_id_dtx_fx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame ); dtx_flag = ivas_ism_dtx_enc_fx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->hEncoderConfig->ivas_total_brate, nchan_ism, st_ivas->nchan_transport, vad_flag, st_ivas->hIsmMetaData, md_diff_flag, &sid_flag ); - IF( sid_flag ) + IF ( sid_flag ) { /* estimate coherence between objects */ ivas_ism_coh_estim_dtx_enc_fx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame ); } #if 1 /************************fix_to_flt****************************/ - me2f_buf( &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_fx[0][0], st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_e, &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc[0][0], st_ivas->nchan_transport * PARAM_ISM_HYS_BUF_SIZE ); + me2f_buf(&st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_fx[0][0], st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_e, &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc[0][0], st_ivas->nchan_transport * PARAM_ISM_HYS_BUF_SIZE); fixedToFloat_arr( st_ivas->hISMDTX->coh_fx, st_ivas->hISMDTX->coh, Q15, st_ivas->nchan_transport ); -#endif /****************************ends here*********************************/ +#endif/****************************ends here*********************************/ #else ivas_ism_get_sce_id_dtx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame ); diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c index dd90f0711..49ba2e480 100644 --- a/lib_enc/ivas_ism_metadata_enc.c +++ b/lib_enc/ivas_ism_metadata_enc.c @@ -39,14 +39,11 @@ #include "ivas_prot_fx.h" #include "ivas_rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED +#include "prot_fx.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_rom_com_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED #endif @@ -1649,15 +1646,15 @@ ivas_error ivas_ism_metadata_enc_create( st_ivas->hIsmMetaData[ch]->last_true_radius_fx = ONE_IN_Q9; /*===============fix-to-flt====================*/ - st_ivas->hIsmMetaData[ch]->last_azimuth = fix_to_float( st_ivas->hIsmMetaData[ch]->last_azimuth_fx, Q22 ); - st_ivas->hIsmMetaData[ch]->last_elevation = fix_to_float( st_ivas->hIsmMetaData[ch]->last_elevation_fx, Q22 ); + st_ivas->hIsmMetaData[ch]->last_azimuth = fix_to_float(st_ivas->hIsmMetaData[ch]->last_azimuth_fx, Q22); + st_ivas->hIsmMetaData[ch]->last_elevation = fix_to_float(st_ivas->hIsmMetaData[ch]->last_elevation_fx, Q22); - st_ivas->hIsmMetaData[ch]->last_true_azimuth = fix_to_float( st_ivas->hIsmMetaData[ch]->last_true_azimuth_fx, Q22 ); - st_ivas->hIsmMetaData[ch]->last_true_elevation = fix_to_float( st_ivas->hIsmMetaData[ch]->last_true_elevation_fx, Q22 ); - st_ivas->hIsmMetaData[ch]->last_true_radius = fix16_to_float( st_ivas->hIsmMetaData[ch]->last_true_radius_fx, Q9 ); + st_ivas->hIsmMetaData[ch]->last_true_azimuth = fix_to_float(st_ivas->hIsmMetaData[ch]->last_true_azimuth_fx, Q22); + st_ivas->hIsmMetaData[ch]->last_true_elevation = fix_to_float(st_ivas->hIsmMetaData[ch]->last_true_elevation_fx, Q22); + st_ivas->hIsmMetaData[ch]->last_true_radius = fix16_to_float(st_ivas->hIsmMetaData[ch]->last_true_radius_fx, Q9); /*===============fix-to-flt====================*/ } - + IF( EQ_16( st_ivas->hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) ) { test(); diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c index 49507f078..56b4d4f7d 100644 --- a/lib_enc/ivas_ism_param_enc.c +++ b/lib_enc/ivas_ism_param_enc.c @@ -37,8 +37,7 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" @@ -556,14 +555,14 @@ void ivas_param_ism_compute_noisy_speech_flag( Word16 i; /* Move the Noisy speech buffer */ - FOR( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) + FOR ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) { st_ivas->hParamIsm->noisy_speech_buffer[i] = st_ivas->hParamIsm->noisy_speech_buffer[i + 1]; move16(); } /* Set flag_noisy_speech to 0 for cases where object energies are not roughly equal */ - IF( !st_ivas->hParamIsm->flag_equal_energy ) + IF ( !st_ivas->hParamIsm->flag_equal_energy ) { st_ivas->hParamIsm->noisy_speech_buffer[i] = 0; st_ivas->hParamIsm->flag_noisy_speech = 0; @@ -574,10 +573,10 @@ void ivas_param_ism_compute_noisy_speech_flag( { /* For the current frame, make a decision based on some core-coder flags */ test(); - IF( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr ) + IF ( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr ) { test(); - IF( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) + IF ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) { st_ivas->hParamIsm->noisy_speech_buffer[i] = 0; move16(); @@ -597,7 +596,7 @@ void ivas_param_ism_compute_noisy_speech_flag( /* Do a decision based on hysteresis */ st_ivas->hParamIsm->flag_noisy_speech = 1; move16(); - FOR( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ ) + FOR ( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ ) { test(); st_ivas->hParamIsm->flag_noisy_speech = st_ivas->hParamIsm->flag_noisy_speech && st_ivas->hParamIsm->noisy_speech_buffer[i]; diff --git a/lib_enc/ivas_lfe_enc.c b/lib_enc/ivas_lfe_enc.c index 6a011d23c..6719ae1d7 100644 --- a/lib_enc/ivas_lfe_enc.c +++ b/lib_enc/ivas_lfe_enc.c @@ -40,8 +40,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c index 6ccf6af51..1684d34a1 100644 --- a/lib_enc/ivas_masa_enc.c +++ b/lib_enc/ivas_masa_enc.c @@ -39,11 +39,8 @@ #include "ivas_stat_enc.h" #include "wmc_auto.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #ifdef IVAS_FLOAT_FIXED diff --git a/lib_enc/ivas_mc_paramupmix_enc.c b/lib_enc/ivas_mc_paramupmix_enc.c index 9c3d0bfb1..a4ba849d4 100644 --- a/lib_enc/ivas_mc_paramupmix_enc.c +++ b/lib_enc/ivas_mc_paramupmix_enc.c @@ -40,7 +40,7 @@ #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif #include "ivas_cnst.h" #include "ivas_rom_com.h" diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc.c index 3748ef6a4..0588844fb 100644 --- a/lib_enc/ivas_mcmasa_enc.c +++ b/lib_enc/ivas_mcmasa_enc.c @@ -39,8 +39,7 @@ #include "ivas_prot_fx.h" #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com.h" #include "ivas_rom_enc.h" #include "wmc_auto.h" @@ -1026,21 +1025,21 @@ void ivas_mcmasa_param_est_enc( Word16 x1_q_fx[MASA_FREQUENCY_BANDS]; Word16 x2_q_fx[MASA_FREQUENCY_BANDS]; Word16 y_q_fx[MASA_FREQUENCY_BANDS]; - FOR( i = 0; i < num_freq_bands; i++ ) + FOR(i = 0; i < num_freq_bands; i++) { - x1_q_fx[i] = Q_factor_L( diffuseness_vector[i] ); - x1_fx[i] = (Word32) ( diffuseness_vector[i] * ( W_shl( 1, x1_q_fx[i] ) ) ); - x2_q_fx[i] = Q_factor_L( vertical_diffuseness_vector[i] ); - x2_fx[i] = (Word32) ( vertical_diffuseness_vector[i] * ( W_shl( 1, x2_q_fx[i] ) ) ); + x1_q_fx[i] = Q_factor_L(diffuseness_vector[i]); + x1_fx[i] = (Word32)(diffuseness_vector[i] * (W_shl(1, x1_q_fx[i]))); + x2_q_fx[i] = Q_factor_L(vertical_diffuseness_vector[i]); + x2_fx[i] = (Word32)(vertical_diffuseness_vector[i] * (W_shl(1, x2_q_fx[i]))); } ///////////////////////////////////////////////////////////////////////// - v_min_fx( (const Word32 *) x1_fx, x1_q_fx, (const Word32 *) x2_fx, x2_q_fx, y_fx, y_q_fx, num_freq_bands ); + v_min_fx((const Word32 *)x1_fx, x1_q_fx, (const Word32 *)x2_fx, x2_q_fx, y_fx, y_q_fx, num_freq_bands ); //////////////////////// to be removed //////////////////////////////// - FOR( i = 0; i < num_freq_bands; i++ ) + FOR(i = 0; i < num_freq_bands; i++) { - diffuseness_vector[i] = (Float32) y_fx[i] / ( W_shl( 1, y_q_fx[i] ) ); + diffuseness_vector[i] = (Float32)y_fx[i] / (W_shl(1, y_q_fx[i])); } /////////////////////////////////////////////////////////////////////// #else diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct.c index 4e4bdded5..d3628b7e1 100644 --- a/lib_enc/ivas_mct_enc_mct.c +++ b/lib_enc/ivas_mct_enc_mct.c @@ -37,7 +37,7 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" #include diff --git a/lib_enc/ivas_omasa_enc.c b/lib_enc/ivas_omasa_enc.c index 8f3d726a5..7d815d5d1 100644 --- a/lib_enc/ivas_omasa_enc.c +++ b/lib_enc/ivas_omasa_enc.c @@ -38,8 +38,7 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com.h" #include "ivas_rom_enc.h" #include "wmc_auto.h" diff --git a/lib_enc/ivas_osba_enc.c b/lib_enc/ivas_osba_enc.c index 5a8fcfa78..8e65a938f 100644 --- a/lib_enc/ivas_osba_enc.c +++ b/lib_enc/ivas_osba_enc.c @@ -42,8 +42,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c index 37d72eda5..819a42d3e 100644 --- a/lib_enc/ivas_qmetadata_enc.c +++ b/lib_enc/ivas_qmetadata_enc.c @@ -42,8 +42,7 @@ #include "wmc_auto.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c index 2ebcdba1e..5d77849e8 100644 --- a/lib_enc/ivas_sba_enc.c +++ b/lib_enc/ivas_sba_enc.c @@ -43,8 +43,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc.c index c2b53d5f5..cbaf1faa3 100644 --- a/lib_enc/ivas_sce_enc.c +++ b/lib_enc/ivas_sce_enc.c @@ -37,7 +37,7 @@ #include "ivas_cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_enc/ivas_sns_enc.c b/lib_enc/ivas_sns_enc.c index 7b1a19313..673df674f 100644 --- a/lib_enc/ivas_sns_enc.c +++ b/lib_enc/ivas_sns_enc.c @@ -38,7 +38,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "ivas_rom_com.h" #include "ivas_cnst.h" diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index b1e9ad53a..29ec47922 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -35,8 +35,7 @@ #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "options.h" #endif #include "ivas_rom_com.h" @@ -596,7 +595,6 @@ ivas_error ivas_spar_enc( /* write the number of objects in ISM_SBA format*/ push_indice( hMetaData, IND_ISM_NUM_OBJECTS, hEncoderConfig->nchan_ism - 1, NO_BITS_MASA_ISM_NO_OBJ ); } - /* front VAD */ if ( ( error = front_vad_spar( st_ivas->hSpar, data_f[0], hEncoderConfig, input_frame ) ) != IVAS_ERR_OK ) { diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index 00e6acb31..b28abea78 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -41,7 +41,7 @@ #include "ivas_rom_enc.h" #include "ivas_cnst.h" #include "wmc_auto.h" -#include "prot_fx1.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* @@ -233,7 +233,7 @@ void stereo_classifier_init( hStereoClassif->nchar_ch2 = 0.0f; hStereoClassif->non_sta_ch1 = 0.0f; hStereoClassif->sp_div_ch1 = 0.0f; - + #ifdef IVAS_FLOAT_FIXED hStereoClassif->ps_diff_ch1_fx = 0; hStereoClassif->ps_diff_ch2_fx = 0; diff --git a/lib_enc/ivas_stereo_cng_enc.c b/lib_enc/ivas_stereo_cng_enc.c index f8fa5aea4..55247933e 100644 --- a/lib_enc/ivas_stereo_cng_enc.c +++ b/lib_enc/ivas_stereo_cng_enc.c @@ -41,7 +41,7 @@ #include "ivas_cnst.h" #include "ivas_rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c index 27552f50b..46db4d6a5 100644 --- a/lib_enc/ivas_stereo_dft_enc.c +++ b/lib_enc/ivas_stereo_dft_enc.c @@ -40,7 +40,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" #include "ivas_rom_com_fx.h" diff --git a/lib_enc/ivas_stereo_ica_enc.c b/lib_enc/ivas_stereo_ica_enc.c index dc9fdc301..aadfd8d58 100644 --- a/lib_enc/ivas_stereo_ica_enc.c +++ b/lib_enc/ivas_stereo_ica_enc.c @@ -41,8 +41,7 @@ #include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------- * Local function prototypes diff --git a/lib_enc/ivas_stereo_icbwe_enc.c b/lib_enc/ivas_stereo_icbwe_enc.c index d762468aa..f1f837150 100644 --- a/lib_enc/ivas_stereo_icbwe_enc.c +++ b/lib_enc/ivas_stereo_icbwe_enc.c @@ -40,7 +40,7 @@ #include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" -#include "prot_fx1.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * ic_bwe_enc_reset() diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc.c index db45ca3f9..4068c17ef 100644 --- a/lib_enc/ivas_stereo_mdct_core_enc.c +++ b/lib_enc/ivas_stereo_mdct_core_enc.c @@ -36,7 +36,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "rom_com.h" #include "wmc_auto.h" @@ -470,8 +470,8 @@ void stereo_mdct_core_enc( if ( !hStereoMdct->isSBAStereoMode ) { #ifdef IVAS_FLOAT_FIXED - IF( hStereoMdct->hItd ) - hStereoMdct->hItd->itd_fx[1] = float_to_fix( hStereoMdct->hItd->itd[1], Q23 ); + IF(hStereoMdct->hItd) + hStereoMdct->hItd->itd_fx[1] = float_to_fix(hStereoMdct->hItd->itd[1], Q23); #endif stereo_bits = write_stereo_to_bitstream( hStereoMdct, sts, ms_mask, 0, hBstr ); } @@ -488,16 +488,16 @@ void stereo_mdct_core_enc( FindSplitRatio( hCPE, sts ); #else #if 1 - FOR( ch = 0; ch < CPE_CHANNELS; ch++ ) + FOR( ch = 0; ch < CPE_CHANNELS; ch++) { - L_subframeTCX = sts[ch]->hTcxEnc->L_frameTCX / ( ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV ); - IF( sts[ch]->last_core == ACELP_CORE ) + L_subframeTCX = sts[ch]->hTcxEnc->L_frameTCX / (( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV); + IF(sts[ch]->last_core == ACELP_CORE) { L_subframeTCX += L_subframeTCX / 4; } - FOR( n = 0; n <= ( ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV ) - 1; n++ ) + FOR ( n = 0; n <= (( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV) - 1; n++ ) { - f2me_buf( sts[ch]->hTcxEnc->spectrum[n], sts[ch]->hTcxEnc->spectrum_fx[n], &sts[ch]->hTcxEnc->spectrum_e[n], L_subframeTCX ); + f2me_buf(sts[ch]->hTcxEnc->spectrum[n], sts[ch]->hTcxEnc->spectrum_fx[n], &sts[ch]->hTcxEnc->spectrum_e[n], L_subframeTCX); } } #endif diff --git a/lib_enc/ivas_stereo_mdct_igf_enc.c b/lib_enc/ivas_stereo_mdct_igf_enc.c index 329401343..51862db72 100644 --- a/lib_enc/ivas_stereo_mdct_igf_enc.c +++ b/lib_enc/ivas_stereo_mdct_igf_enc.c @@ -35,7 +35,7 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "stat_enc.h" #include "ivas_stat_enc.h" diff --git a/lib_enc/ivas_stereo_mdct_stereo_enc.c b/lib_enc/ivas_stereo_mdct_stereo_enc.c index 54618a32a..9528fa9cb 100644 --- a/lib_enc/ivas_stereo_mdct_stereo_enc.c +++ b/lib_enc/ivas_stereo_mdct_stereo_enc.c @@ -37,9 +37,8 @@ #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot.h" -#include "prot_fx1.h" #include "prot_fx_enc.h" #include "ivas_rom_com.h" #include "ivas_rom_com_fx.h" diff --git a/lib_enc/lead_indexing_fx.c b/lib_enc/lead_indexing_fx.c index b3ceeda43..282bdf5fb 100644 --- a/lib_enc/lead_indexing_fx.c +++ b/lib_enc/lead_indexing_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index b35609ce1..73ae64a70 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -34,7 +34,7 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include #include @@ -481,11 +481,11 @@ ivas_error IVAS_ENC_FeedObjectMetadata( error = ivas_set_ism_metadata_fx( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], azimuth_fx, elevation_fx, radius_fx, yaw_fx, pitch_fx, metadata.non_diegetic_flag ); /*================fix-to-flt====================*/ - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->azimuth = fix_to_float( azimuth_fx, Q22 ); - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->elevation = fix_to_float( elevation_fx, Q22 ); - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->radius = fix_to_float( radius_fx, Q9 ); - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->yaw = fix_to_float( yaw_fx, Q22 ); - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->pitch = fix_to_float( pitch_fx, Q22 ); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->azimuth = fix_to_float(azimuth_fx, Q22); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->elevation = fix_to_float(elevation_fx, Q22); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->radius = fix_to_float(radius_fx, Q9); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->yaw = fix_to_float(yaw_fx, Q22); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->pitch = fix_to_float(pitch_fx, Q22); /*================fix-to-flt====================*/ #else error = ivas_set_ism_metadata( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth, metadata.elevation, metadata.radius, metadata.yaw, metadata.pitch, metadata.non_diegetic_flag ); diff --git a/lib_enc/long_enr_fx.c b/lib_enc/long_enr_fx.c index 05ea4ee26..3f0d5e792 100644 --- a/lib_enc/long_enr_fx.c +++ b/lib_enc/long_enr_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ @@ -18,14 +17,14 @@ *-------------------------------------------------------------------*/ #ifdef IVAS_FLOAT_FIXED void ivas_long_enr_fx( - Encoder_State *st_fx, /* i/o: state structure */ - const Word16 Etot, /* i : total channel E (see lib_enc\analy_sp.c) */ - const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */ - Word16 high_lpn_flag, /* i : sp/mus LPN flag */ - FRONT_VAD_ENC_HANDLE hFrontVad[], /* i/o: front-VAD handles */ - const Word16 n_chan, /* i : number of channels */ + Encoder_State *st_fx, /* i/o: state structure */ + const Word16 Etot, /* i : total channel E (see lib_enc\analy_sp.c) */ + const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */ + Word16 high_lpn_flag, /* i : sp/mus LPN flag */ + FRONT_VAD_ENC_HANDLE hFrontVad[], /* i/o: front-VAD handles */ + const Word16 n_chan, /* i : number of channels */ const Word16 localVAD_HE_SAD_LR[], /* i : HE-SAD flag without hangover LR channels */ - const Word16 Etot_LR[] /* i : total channel energy LR channels */ + const Word16 Etot_LR[] /* i : total channel energy LR channels */ ) { @@ -38,16 +37,16 @@ void ivas_long_enr_fx( * and total active speech energy *-----------------------------------------------------------------*/ Word16 n; - IF( hFrontVad != NULL ) + IF ( hFrontVad != NULL ) { - IF( LT_16( hFrontVad[0]->ini_frame, 4 ) ) + IF ( LT_16(hFrontVad[0]->ini_frame , 4) ) { - FOR( n = 0; n < n_chan; n++ ) + FOR ( n = 0; n < n_chan; n++ ) { hFrontVad[n]->lp_noise_fx = hFrontVad[n]->hNoiseEst->totalNoise_fx; tmp = add( hFrontVad[n]->lp_noise_fx, 2560 ); - IF( LT_16( hFrontVad[n]->lp_speech_fx, tmp ) ) + IF ( LT_16(hFrontVad[n]->lp_speech_fx , tmp )) { hFrontVad[n]->lp_speech_fx = tmp; move16(); @@ -58,7 +57,7 @@ void ivas_long_enr_fx( { Word16 smooth_prev, smooth_curr; - IF( LT_16( hFrontVad[0]->ini_frame, 150 ) ) + IF ( LT_16(hFrontVad[0]->ini_frame , 150) ) { smooth_prev = 31130; smooth_curr = 1638; @@ -69,24 +68,24 @@ void ivas_long_enr_fx( smooth_curr = 655; } - FOR( n = 0; n < n_chan; n++ ) + FOR ( n = 0; n < n_chan; n++ ) { - hFrontVad[n]->lp_noise_fx = add( mult_r( smooth_prev, hFrontVad[n]->lp_noise_fx ), mult_r( smooth_curr, hFrontVad[n]->hNoiseEst->totalNoise_fx ) ); + hFrontVad[n]->lp_noise_fx = add(mult_r(smooth_prev , hFrontVad[n]->lp_noise_fx) , mult_r(smooth_curr , hFrontVad[n]->hNoiseEst->totalNoise_fx)); - IF( localVAD_HE_SAD_LR[n] && !high_lpn_flag ) + IF ( localVAD_HE_SAD_LR[n] && !high_lpn_flag ) { - IF( LT_16( sub( hFrontVad[n]->lp_speech_fx, Etot_LR[n] ), 2560 ) ) + IF ( LT_16(sub( hFrontVad[n]->lp_speech_fx , Etot_LR[n] ) , 2560) ) { - hFrontVad[n]->lp_speech_fx = add( mult_r( 32113, hFrontVad[n]->lp_speech_fx ), mult_r( 655, Etot_LR[n] ) ); + hFrontVad[n]->lp_speech_fx = add(mult_r(32113 , hFrontVad[n]->lp_speech_fx) , mult_r(655 , Etot_LR[n])); } ELSE { - hFrontVad[n]->lp_speech_fx = sub( hFrontVad[n]->lp_speech_fx, 13 ); + hFrontVad[n]->lp_speech_fx = sub(hFrontVad[n]->lp_speech_fx , 13); } } } } - FOR( n = 0; n < n_chan; n++ ) + FOR ( n = 0; n < n_chan; n++ ) { hFrontVad[n]->hNoiseEst->Etot_last_fx = Etot_LR[n]; move16(); diff --git a/lib_enc/lp_exc_e_fx.c b/lib_enc/lp_exc_e_fx.c index a8a6abc33..206e7435c 100644 --- a/lib_enc/lp_exc_e_fx.c +++ b/lib_enc/lp_exc_e_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/lsf_enc.c b/lib_enc/lsf_enc.c index a9671520e..855f78667 100644 --- a/lib_enc/lsf_enc.c +++ b/lib_enc/lsf_enc.c @@ -40,7 +40,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_proto_func.h" #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_enc/lsf_enc_fx.c b/lib_enc/lsf_enc_fx.c index 1009c2bcc..97aef1cc7 100644 --- a/lib_enc/lsf_enc_fx.c +++ b/lib_enc/lsf_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "ivas_prot_fx.h" /* Function prototypes */ diff --git a/lib_enc/lsf_msvq_ma_enc_fx.c b/lib_enc/lsf_msvq_ma_enc_fx.c index bf58e5040..4d0cce641 100644 --- a/lib_enc/lsf_msvq_ma_enc_fx.c +++ b/lib_enc/lsf_msvq_ma_enc_fx.c @@ -11,8 +11,7 @@ #include "rom_com.h" #include "rom_enc.h" #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/ltd_stable_fx.c b/lib_enc/ltd_stable_fx.c index 797b21829..0da80653f 100644 --- a/lib_enc/ltd_stable_fx.c +++ b/lib_enc/ltd_stable_fx.c @@ -9,8 +9,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/mdct_classifier_fx.c b/lib_enc/mdct_classifier_fx.c index 63f9c78be..a34ff46b4 100644 --- a/lib_enc/mdct_classifier_fx.c +++ b/lib_enc/mdct_classifier_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_enc/mdct_selector_fx.c b/lib_enc/mdct_selector_fx.c index d2e0b980c..88b3d1f04 100644 --- a/lib_enc/mdct_selector_fx.c +++ b/lib_enc/mdct_selector_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/mslvq_enc_fx.c b/lib_enc/mslvq_enc_fx.c index ea953ebd5..c951eac70 100644 --- a/lib_enc/mslvq_enc_fx.c +++ b/lib_enc/mslvq_enc_fx.c @@ -9,8 +9,7 @@ #include "stl.h" #include "prot.h" /* Function prototypes */ #include "basop32.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/multi_harm_fx.c b/lib_enc/multi_harm_fx.c index cc3aef87c..084f81c8f 100644 --- a/lib_enc/multi_harm_fx.c +++ b/lib_enc/multi_harm_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/nelp_enc_fx.c b/lib_enc/nelp_enc_fx.c index a0b228c1e..6cd309d08 100644 --- a/lib_enc/nelp_enc_fx.c +++ b/lib_enc/nelp_enc_fx.c @@ -34,8 +34,7 @@ #include "control.h" #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com.h" diff --git a/lib_enc/nois_est_fx.c b/lib_enc/nois_est_fx.c index b8ce1a186..bc5f2790f 100644 --- a/lib_enc/nois_est_fx.c +++ b/lib_enc/nois_est_fx.c @@ -8,8 +8,7 @@ #include "cnst.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/noise_adjust_fx.c b/lib_enc/noise_adjust_fx.c index 1e149ad14..adfd407b7 100644 --- a/lib_enc/noise_adjust_fx.c +++ b/lib_enc/noise_adjust_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_enc/normalizecoefs_fx.c b/lib_enc/normalizecoefs_fx.c index 816f8531d..4fb461c65 100644 --- a/lib_enc/normalizecoefs_fx.c +++ b/lib_enc/normalizecoefs_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "basop_mpy.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/peak_vq_enc_fx.c b/lib_enc/peak_vq_enc_fx.c index 5b3848706..37090b922 100644 --- a/lib_enc/peak_vq_enc_fx.c +++ b/lib_enc/peak_vq_enc_fx.c @@ -10,8 +10,7 @@ #include "rom_enc.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------------- diff --git a/lib_enc/pit_enc_fx.c b/lib_enc/pit_enc_fx.c index 86343944b..9c1a80d6f 100644 --- a/lib_enc/pit_enc_fx.c +++ b/lib_enc/pit_enc_fx.c @@ -10,8 +10,7 @@ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define inv_T0_res InvIntTable diff --git a/lib_enc/pitch_ol2_fx.c b/lib_enc/pitch_ol2_fx.c index cdbdea791..73fdde952 100644 --- a/lib_enc/pitch_ol2_fx.c +++ b/lib_enc/pitch_ol2_fx.c @@ -9,8 +9,7 @@ #include "rom_com.h" /* Encoder static table prototypes */ #include "rom_dec.h" //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/pitch_ol_fx.c b/lib_enc/pitch_ol_fx.c index 692e06ad9..8a1a7c753 100644 --- a/lib_enc/pitch_ol_fx.c +++ b/lib_enc/pitch_ol_fx.c @@ -10,8 +10,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* @@ -1048,6 +1047,7 @@ void pitch_ol_fx( find_mult_fx( &fac, pitchX[i][NSECT + 0], pitchX[i][NSECT + 1], pit_max[4], &scaledX[i][NSECT + 0], old_pitch, old_corr, DELTA0, STEP ); /* Multiples in 2nd section */ } } + fac = THRES0; move16(); /* the look-ahead */ find_mult_fx( &fac, pitchX[i][2], pitchX[i][3], pit_max[7], &scaledX[i][2], old_pitch, old_corr, 2, 2 ); /* Multiples in 3rd section */ @@ -1267,6 +1267,7 @@ void pitch_ol_fx( /*--------------------------------------------------------------* * Update old pitch, upsample pitch, *--------------------------------------------------------------*/ + *old_pitch = pitch[1]; move16(); diff --git a/lib_enc/plc_enc_ext_fx.c b/lib_enc/plc_enc_ext_fx.c index 5c6af38f3..0a451f757 100644 --- a/lib_enc/plc_enc_ext_fx.c +++ b/lib_enc/plc_enc_ext_fx.c @@ -9,8 +9,7 @@ #include "stat_enc.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/ppp_enc_fx.c b/lib_enc/ppp_enc_fx.c index 8353659ee..82657654c 100644 --- a/lib_enc/ppp_enc_fx.c +++ b/lib_enc/ppp_enc_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/pre_proc_fx.c b/lib_enc/pre_proc_fx.c index 76a128110..3cc9a733a 100644 --- a/lib_enc/pre_proc_fx.c +++ b/lib_enc/pre_proc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/pvq_core_enc_fx.c b/lib_enc/pvq_core_enc_fx.c index 994a513a9..dce290b45 100644 --- a/lib_enc/pvq_core_enc_fx.c +++ b/lib_enc/pvq_core_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/pvq_encode_fx.c b/lib_enc/pvq_encode_fx.c index d5bd9ee48..9faaf9ed5 100644 --- a/lib_enc/pvq_encode_fx.c +++ b/lib_enc/pvq_encode_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com_fx.h" #include "rom_com.h" diff --git a/lib_enc/q_gain2p_fx.c b/lib_enc/q_gain2p_fx.c index 6c0110bc7..a2f2c93da 100644 --- a/lib_enc/q_gain2p_fx.c +++ b/lib_enc/q_gain2p_fx.c @@ -10,8 +10,7 @@ #include "basop_util.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/qlpc_avq_fx.c b/lib_enc/qlpc_avq_fx.c index 892a25eba..1c28210ad 100644 --- a/lib_enc/qlpc_avq_fx.c +++ b/lib_enc/qlpc_avq_fx.c @@ -9,8 +9,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/qlpc_stoch_fx.c b/lib_enc/qlpc_stoch_fx.c index 257693928..042a7f9f3 100644 --- a/lib_enc/qlpc_stoch_fx.c +++ b/lib_enc/qlpc_stoch_fx.c @@ -11,8 +11,7 @@ #include "rom_com_fx.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_enc/range_enc_fx.c b/lib_enc/range_enc_fx.c index 81fb76952..4f8c5c905 100644 --- a/lib_enc/range_enc_fx.c +++ b/lib_enc/range_enc_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/re8_cod_fx.c b/lib_enc/re8_cod_fx.c index 0b14385fe..e3c084c4b 100644 --- a/lib_enc/re8_cod_fx.c +++ b/lib_enc/re8_cod_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*------------------------------------------------------------------------ diff --git a/lib_enc/reordernorm_fx.c b/lib_enc/reordernorm_fx.c index df30c3084..ceb9d8d6f 100644 --- a/lib_enc/reordernorm_fx.c +++ b/lib_enc/reordernorm_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------*/ diff --git a/lib_enc/rst_enc_fx.c b/lib_enc/rst_enc_fx.c index 009ba531a..938efc631 100644 --- a/lib_enc/rst_enc_fx.c +++ b/lib_enc/rst_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_enc/scale_enc_fx.c b/lib_enc/scale_enc_fx.c index dd4f88b00..22e79e310 100644 --- a/lib_enc/scale_enc_fx.c +++ b/lib_enc/scale_enc_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_enc/set_impulse_fx.c b/lib_enc/set_impulse_fx.c index a145e42d6..7243d9a72 100644 --- a/lib_enc/set_impulse_fx.c +++ b/lib_enc/set_impulse_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/setmodeindex_fx.c b/lib_enc/setmodeindex_fx.c index 7920db3e2..2a2fcf7e9 100644 --- a/lib_enc/setmodeindex_fx.c +++ b/lib_enc/setmodeindex_fx.c @@ -8,8 +8,7 @@ #include "cnst.h" #include "rom_com_fx.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------- diff --git a/lib_enc/sig_clas_fx.c b/lib_enc/sig_clas_fx.c index 62f732939..a80f2865f 100644 --- a/lib_enc/sig_clas_fx.c +++ b/lib_enc/sig_clas_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_enc/spec_center_fx.c b/lib_enc/spec_center_fx.c index a3fb197cb..5c088ca97 100644 --- a/lib_enc/spec_center_fx.c +++ b/lib_enc/spec_center_fx.c @@ -8,8 +8,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/spec_flatness_fx.c b/lib_enc/spec_flatness_fx.c index 918faa5e6..33337bb7a 100644 --- a/lib_enc/spec_flatness_fx.c +++ b/lib_enc/spec_flatness_fx.c @@ -9,8 +9,7 @@ #include "basop_util.h" #include "vad_basop.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/speech_music_classif.c b/lib_enc/speech_music_classif.c index e41e50052..38fc00649 100644 --- a/lib_enc/speech_music_classif.c +++ b/lib_enc/speech_music_classif.c @@ -45,7 +45,7 @@ #include "rom_com.h" /* Common static table prototypes */ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif @@ -136,8 +136,8 @@ void speech_music_clas_init( { hSpMusClas->prev_FV[i] = 0.5f * hout_intervals[2 * i] + 0.5f * hout_intervals[2 * i + 1]; #ifdef IVAS_FLOAT_FIXED - hSpMusClas->prev_FV_fx[i] = (Word32) ( hSpMusClas->prev_FV[i] * ONE_IN_Q20 ); -#endif + hSpMusClas->prev_FV_fx[i] =( Word32)( hSpMusClas->prev_FV[i] * ONE_IN_Q20 ); + #endif } for ( i = 0; i < NB_BANDS_SPMUS; i++ ) diff --git a/lib_enc/speech_music_classif_fx.c b/lib_enc/speech_music_classif_fx.c index 26170c4d2..cfb9ac57c 100644 --- a/lib_enc/speech_music_classif_fx.c +++ b/lib_enc/speech_music_classif_fx.c @@ -11,8 +11,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include @@ -3022,7 +3021,7 @@ static void flux_fx( #ifdef BASOP_NOGLOB L_flux = L_add_sat( L_flux, abs_s( sub_sat( Bin_E[i], old_Bin_E[i] ) ) ); /*Q7 */ #else - L_flux = L_add( L_flux, abs_s( sub( Bin_E[i], old_Bin_E[i] ) ) ); /*Q7 */ + L_flux = L_add( L_flux, abs_s( sub( Bin_E[i], old_Bin_E[i] ) ) ); /*Q7 */ #endif } if ( p2v_map[i] != 0 ) diff --git a/lib_enc/stat_noise_uv_enc_fx.c b/lib_enc/stat_noise_uv_enc_fx.c index b72ddf02f..c5d2d15c6 100644 --- a/lib_enc/stat_noise_uv_enc_fx.c +++ b/lib_enc/stat_noise_uv_enc_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*======================================================================*/ diff --git a/lib_enc/subband_fft_fx.c b/lib_enc/subband_fft_fx.c index cee91f7ab..66c55d586 100644 --- a/lib_enc/subband_fft_fx.c +++ b/lib_enc/subband_fft_fx.c @@ -9,8 +9,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_enc/swb_bwe_enc_fx.c b/lib_enc/swb_bwe_enc_fx.c index 02e122321..5ee7f2313 100644 --- a/lib_enc/swb_bwe_enc_fx.c +++ b/lib_enc/swb_bwe_enc_fx.c @@ -10,8 +10,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_enc/swb_bwe_enc_hr_fx.c b/lib_enc/swb_bwe_enc_hr_fx.c index 006a6195b..60526314e 100644 --- a/lib_enc/swb_bwe_enc_hr_fx.c +++ b/lib_enc/swb_bwe_enc_hr_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/swb_bwe_enc_lr_fx.c b/lib_enc/swb_bwe_enc_lr_fx.c index 10df60015..3a8b23845 100644 --- a/lib_enc/swb_bwe_enc_lr_fx.c +++ b/lib_enc/swb_bwe_enc_lr_fx.c @@ -32,8 +32,7 @@ #include #include "options.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com.h" #include "enh32.h" diff --git a/lib_enc/swb_pre_proc_fx.c b/lib_enc/swb_pre_proc_fx.c index 1bcef7025..7650141b6 100644 --- a/lib_enc/swb_pre_proc_fx.c +++ b/lib_enc/swb_pre_proc_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/swb_tbe_enc_fx.c b/lib_enc/swb_tbe_enc_fx.c index b4e93c1d3..b34283381 100644 --- a/lib_enc/swb_tbe_enc_fx.c +++ b/lib_enc/swb_tbe_enc_fx.c @@ -9,8 +9,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_enc/tcq_core_enc_fx.c b/lib_enc/tcq_core_enc_fx.c index 6de4560d5..1855527d1 100644 --- a/lib_enc/tcq_core_enc_fx.c +++ b/lib_enc/tcq_core_enc_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" #include "rom_com.h" #include "ivas_error.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ ivas_error tcq_core_LR_enc_fx( diff --git a/lib_enc/tcx_ltp_enc_fx.c b/lib_enc/tcx_ltp_enc_fx.c index f44fcd203..7a791ef7e 100644 --- a/lib_enc/tcx_ltp_enc_fx.c +++ b/lib_enc/tcx_ltp_enc_fx.c @@ -10,8 +10,7 @@ #include "basop_util.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ static Word32 dot( const Word16 *X, const Word16 *Y, Word16 n ) diff --git a/lib_enc/tcx_utils_enc.c b/lib_enc/tcx_utils_enc.c index 609e03bf4..4f14866c8 100644 --- a/lib_enc/tcx_utils_enc.c +++ b/lib_enc/tcx_utils_enc.c @@ -39,7 +39,7 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "rom_com.h" #include "cnst.h" diff --git a/lib_enc/tcx_utils_enc_fx.c b/lib_enc/tcx_utils_enc_fx.c index bfcdd8fdf..8307c68d3 100644 --- a/lib_enc/tcx_utils_enc_fx.c +++ b/lib_enc/tcx_utils_enc_fx.c @@ -13,8 +13,7 @@ #include "rom_basop_util.h" #include "basop_util.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define inv_int InvIntTable diff --git a/lib_enc/tfa_enc_fx.c b/lib_enc/tfa_enc_fx.c index aa633912c..80b4cea6f 100644 --- a/lib_enc/tfa_enc_fx.c +++ b/lib_enc/tfa_enc_fx.c @@ -7,8 +7,7 @@ #include "basop_util.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/tns_base_enc_fx.c b/lib_enc/tns_base_enc_fx.c index 4cb7cefdd..f1de8f802 100644 --- a/lib_enc/tns_base_enc_fx.c +++ b/lib_enc/tns_base_enc_fx.c @@ -13,8 +13,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "prot.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define HLM_MIN_NRG ( 32768.0f * 2 * NORM_MDCT_FACTOR / ( 640 * 640 ) ) diff --git a/lib_enc/transient_detection_fx.c b/lib_enc/transient_detection_fx.c index 179e11506..5b40d7c1b 100644 --- a/lib_enc/transient_detection_fx.c +++ b/lib_enc/transient_detection_fx.c @@ -12,8 +12,7 @@ #include #include #include -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /* Exponent of attack threshold. Picked according to current threshold values. */ diff --git a/lib_enc/transition_enc.c b/lib_enc/transition_enc.c index 7afc32659..c88826947 100644 --- a/lib_enc/transition_enc.c +++ b/lib_enc/transition_enc.c @@ -41,7 +41,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/transition_enc_fx.c b/lib_enc/transition_enc_fx.c index 4e6b1f512..32a510946 100644 --- a/lib_enc/transition_enc_fx.c +++ b/lib_enc/transition_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/update_decision_fx.c b/lib_enc/update_decision_fx.c index 935165d37..91170ece1 100644 --- a/lib_enc/update_decision_fx.c +++ b/lib_enc/update_decision_fx.c @@ -8,8 +8,7 @@ #include "basop_util.h" #include "vad_basop.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* * bg_music_decision_fx() diff --git a/lib_enc/updt_enc_fx.c b/lib_enc/updt_enc_fx.c index daa7d5d01..97e704a5f 100644 --- a/lib_enc/updt_enc_fx.c +++ b/lib_enc/updt_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/updt_tar_fx.c b/lib_enc/updt_tar_fx.c index 19d9cbb70..b6c2a166c 100644 --- a/lib_enc/updt_tar_fx.c +++ b/lib_enc/updt_tar_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*----------------------------------------------------------------------------------* diff --git a/lib_enc/vad_basop_fx.c b/lib_enc/vad_basop_fx.c index 32f46ce16..9114554c7 100644 --- a/lib_enc/vad_basop_fx.c +++ b/lib_enc/vad_basop_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "vad_basop.h" #include "basop_util.h" diff --git a/lib_enc/vad_fx.c b/lib_enc/vad_fx.c index 56756588c..3a04fb947 100644 --- a/lib_enc/vad_fx.c +++ b/lib_enc/vad_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/vad_param_updt_fx.c b/lib_enc/vad_param_updt_fx.c index 3012600fa..0466916ac 100644 --- a/lib_enc/vad_param_updt_fx.c +++ b/lib_enc/vad_param_updt_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "ivas_stat_enc.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/vad_proc_fx.c b/lib_enc/vad_proc_fx.c index add224340..3592b12f6 100644 --- a/lib_enc/vad_proc_fx.c +++ b/lib_enc/vad_proc_fx.c @@ -12,8 +12,7 @@ #include "stat_enc.h" #include "rom_enc.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/vbr_average_rate_fx.c b/lib_enc/vbr_average_rate_fx.c index 659eec524..9eb3d12b2 100644 --- a/lib_enc/vbr_average_rate_fx.c +++ b/lib_enc/vbr_average_rate_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "stat_enc.h" /* Static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/vlpc_1st_cod_fx.c b/lib_enc/vlpc_1st_cod_fx.c index 561446aa5..120a927f5 100644 --- a/lib_enc/vlpc_1st_cod_fx.c +++ b/lib_enc/vlpc_1st_cod_fx.c @@ -9,8 +9,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define ISF_ONE 3 /*1.0f*1.28f Q1*/ /*=1.0f in 14Q1*1.28*/ diff --git a/lib_enc/vlpc_2st_cod_fx.c b/lib_enc/vlpc_2st_cod_fx.c index e0b2c427a..7553f8d1c 100644 --- a/lib_enc/vlpc_2st_cod_fx.c +++ b/lib_enc/vlpc_2st_cod_fx.c @@ -8,8 +8,7 @@ #include "options.h" //#include "prot_fx.h" #include "control.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/voiced_enc_fx.c b/lib_enc/voiced_enc_fx.c index 2e9035743..5cd8c3ef1 100644 --- a/lib_enc/voiced_enc_fx.c +++ b/lib_enc/voiced_enc_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/waveadjust_fec_cod_fx.c b/lib_enc/waveadjust_fec_cod_fx.c index a42994223..92056c0c3 100644 --- a/lib_enc/waveadjust_fec_cod_fx.c +++ b/lib_enc/waveadjust_fec_cod_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stat_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c index 2d737022c..f94e5a58a 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -44,8 +44,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "control.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) @@ -3143,7 +3142,7 @@ static ivas_error ivas_rend_crendConvolver( } } - offset = imult1616( hCrend->delay_line_rw_index, subframe_length ); /* subframe_length * ( pCrend->hHrtfCrend->max_num_iterations - 1 ); */ + offset = imult1616( hCrend->delay_line_rw_index, subframe_length ); /* subframe_length * ( pCrend->hHrtfCrend->max_num_iterations - 1 ); */ offset_diffuse = imult1616( hCrend->diffuse_delay_line_rw_index, subframe_length ); /* subframe_length *( pCrend->hHrtfCrend->num_iterations_diffuse[0] - 1 ); */ IF( pCrend->hHrtfCrend->num_iterations_diffuse[0] > 0 ) diff --git a/lib_rend/ivas_dirac_ana.c b/lib_rend/ivas_dirac_ana.c index 534f59551..f32414199 100644 --- a/lib_rend/ivas_dirac_ana.c +++ b/lib_rend/ivas_dirac_ana.c @@ -39,8 +39,7 @@ #include "ivas_stat_rend.h" #include "ivas_rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c index 4c52699c9..39640f699 100644 --- a/lib_rend/ivas_dirac_dec_binaural_functions.c +++ b/lib_rend/ivas_dirac_dec_binaural_functions.c @@ -35,8 +35,7 @@ #include #include #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_cnst.h" @@ -1412,7 +1411,7 @@ static void ivas_dirac_dec_binaural_internal_fx( q_cldfb[ch][slot] = q_input; move16(); cldfbAnalysis_ts_fx_fixed_q( - &( st_ivas->hTcBuffer->tc_fx[ch][add( imult1616( nBins, slot ), offsetSamples )] ), + &( st_ivas->hTcBuffer->tc_fx[ch][add(imult1616(nBins , slot) , offsetSamples)] ), Cldfb_RealBuffer_in_fx[ch][slot], Cldfb_ImagBuffer_in_fx[ch][slot], nBins, st_ivas->cldfbAnaDec[ch], &q_cldfb[ch][slot] ); @@ -2891,7 +2890,7 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric e = 0; move16(); hDiracDecBin->frameMeanDiffuseness_fx[bin] = BASOP_Util_Divide3232_Scale( hDiracDecBin->frameMeanDiffuseness_fx[bin], L_max( EPSILLON_FX, frameMeanDiffusenessEneWeight_fx[bin] ), &e ); - hDiracDecBin->frameMeanDiffuseness_fx[bin] = L_shl( hDiracDecBin->frameMeanDiffuseness_fx[bin], add( 14, e ) ); // Q29 + hDiracDecBin->frameMeanDiffuseness_fx[bin] = L_shl( hDiracDecBin->frameMeanDiffuseness_fx[bin], add(14 , e) ); // Q29 move32(); move32(); } @@ -5284,8 +5283,8 @@ static void eig2x2_fx( } } - IF( q_U_1 != 0 ) - *q_U = q_U_1; + IF ( q_U_1 != 0 ) + *q_U = q_U_1; ELSE *q_U = q_U_2; move16(); diff --git a/lib_rend/ivas_dirac_decorr_dec.c b/lib_rend/ivas_dirac_decorr_dec.c index de0253bb5..d37a961cf 100644 --- a/lib_rend/ivas_dirac_decorr_dec.c +++ b/lib_rend/ivas_dirac_decorr_dec.c @@ -41,8 +41,7 @@ #include "ivas_cnst.h" #include "ivas_rom_rend.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*------------------------------------------------------------------------- * Local constants @@ -954,19 +953,19 @@ void ivas_dirac_dec_decorr_process_fx( /* check handles */ test(); - if ( h_freq_domain_decorr_ap_params == NULL || h_freq_domain_decorr_ap_state == NULL ) + if( h_freq_domain_decorr_ap_params == NULL || h_freq_domain_decorr_ap_state == NULL ) { return; } /* check input data */ - if ( input_frame_fx == NULL ) + if( input_frame_fx == NULL ) { return; } /* check result arrays */ - if ( frame_dec_fx == NULL ) + if( frame_dec_fx == NULL ) { return; } @@ -1046,7 +1045,7 @@ void ivas_dirac_dec_decorr_process_fx( IF( NE_16( q_temp, q_onset_dec ) ) { - FOR( Word16 i = 0; i < imult1616( num_protos_diff, max_band_decorr_temp ); i++ ) + FOR( Word16 i = 0; i < imult1616(num_protos_diff , max_band_decorr_temp); i++ ) { h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx[i] = L_shr( h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx[i], sub( q_onset_dec, q_temp ) ); h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx[i] = L_shr( h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx[i], sub( q_onset_dec, q_temp ) ); @@ -1056,7 +1055,7 @@ void ivas_dirac_dec_decorr_process_fx( } IF( NE_16( q_temp, q_aux_buffer ) ) { - FOR( Word16 i = 0; i < shl( imult1616( num_protos_diff, max_band_decorr_temp ), 1 ); i++ ) + FOR( Word16 i = 0; i < shl( imult1616(num_protos_diff , max_band_decorr_temp),1); i++ ) { aux_buffer_fx[i] = L_shr( aux_buffer_fx[i], sub( q_aux_buffer, q_temp ) ); move32(); @@ -1133,7 +1132,7 @@ void ivas_dirac_dec_decorr_process_fx( q_shift = getScaleFactor32( aux_buffer_fx, imult1616( imult1616( 2, num_protos_dir ), max_band_decorr_temp ) ); - FOR( Word16 j = 0; j < shl( imult1616( num_protos_dir, max_band_decorr_temp ), 1 ); j++ ) + FOR( Word16 j = 0; j < shl( imult1616(num_protos_dir , max_band_decorr_temp),1); j++ ) { aux_buffer_fx[j] = L_shl( aux_buffer_fx[j], q_shift ); move32(); @@ -1293,7 +1292,7 @@ void ivas_dirac_dec_decorr_process_fx( } } - FOR( Word16 i = 0; i < shl( imult1616( num_channels, max_band_decorr ), 1 ); i++ ) + FOR( Word16 i = 0; i < shl(imult1616(num_channels , max_band_decorr),1); i++ ) { aux_buffer_fx[i] = W_extract_h( W_shl( aux_64[i], sub( norm, find_guarded_bits_fx( 2 ) ) ) ); move32(); @@ -1492,13 +1491,13 @@ void ivas_dirac_dec_decorr_close_fx( *-----------------------------------------------------------------*/ test(); - if ( ph_freq_domain_decorr_ap_params == NULL || ph_freq_domain_decorr_ap_state == NULL ) + if( ph_freq_domain_decorr_ap_params == NULL || ph_freq_domain_decorr_ap_state == NULL ) { return; } test(); - if ( *ph_freq_domain_decorr_ap_params == NULL || *ph_freq_domain_decorr_ap_state == NULL ) + if( *ph_freq_domain_decorr_ap_params == NULL || *ph_freq_domain_decorr_ap_state == NULL ) { return; } diff --git a/lib_rend/ivas_dirac_onsets_dec.c b/lib_rend/ivas_dirac_onsets_dec.c index 7e2a59591..c7e4a6ff6 100644 --- a/lib_rend/ivas_dirac_onsets_dec.c +++ b/lib_rend/ivas_dirac_onsets_dec.c @@ -41,8 +41,7 @@ #include "ivas_rom_com.h" #include "ivas_rom_dec.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED static Word16 BASOP_Util_Cmp_Mant32Exp_sat( Word32 a_m, Word16 a_e, Word32 b_m, Word16 b_e ); diff --git a/lib_rend/ivas_dirac_output_synthesis_dec.c b/lib_rend/ivas_dirac_output_synthesis_dec.c index 78ebf3009..36b13ed58 100644 --- a/lib_rend/ivas_dirac_output_synthesis_dec.c +++ b/lib_rend/ivas_dirac_output_synthesis_dec.c @@ -44,8 +44,7 @@ #include "ivas_rom_dec.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #endif #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_rend/ivas_dirac_rend.c b/lib_rend/ivas_dirac_rend.c index e96aec922..cc3f78a2d 100644 --- a/lib_rend/ivas_dirac_rend.c +++ b/lib_rend/ivas_dirac_rend.c @@ -41,8 +41,7 @@ #include "ivas_cnst.h" #include "ivas_rom_rend.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "ivas_rom_binaural_crend_head.h" diff --git a/lib_rend/ivas_efap.c b/lib_rend/ivas_efap.c index fb6abd941..5229164dd 100644 --- a/lib_rend/ivas_efap.c +++ b/lib_rend/ivas_efap.c @@ -36,7 +36,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_stat_dec.h" diff --git a/lib_rend/ivas_masa_merge.c b/lib_rend/ivas_masa_merge.c index f1e93e224..8652e2c71 100644 --- a/lib_rend/ivas_masa_merge.c +++ b/lib_rend/ivas_masa_merge.c @@ -39,7 +39,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_rend/ivas_mcmasa_ana.c b/lib_rend/ivas_mcmasa_ana.c index 531ab686e..8149ee639 100644 --- a/lib_rend/ivas_mcmasa_ana.c +++ b/lib_rend/ivas_mcmasa_ana.c @@ -43,8 +43,7 @@ #include "wmc_auto.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer.c index b2ebebb87..0a12e65b3 100644 --- a/lib_rend/ivas_objectRenderer.c +++ b/lib_rend/ivas_objectRenderer.c @@ -41,8 +41,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #include "ivas_rom_com_fx.h" #define float_to_fixed( n, factor ) ( round( n * ( 1 << factor ) ) ) diff --git a/lib_rend/ivas_objectRenderer_hrFilt.c b/lib_rend/ivas_objectRenderer_hrFilt.c index c2fe6a262..8568da9eb 100644 --- a/lib_rend/ivas_objectRenderer_hrFilt.c +++ b/lib_rend/ivas_objectRenderer_hrFilt.c @@ -39,8 +39,7 @@ #include "ivas_rom_rend.h" #include "ivas_cnst.h" #include "wmc_auto.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_rend/ivas_objectRenderer_mix.c b/lib_rend/ivas_objectRenderer_mix.c index 06a645622..997477c5d 100644 --- a/lib_rend/ivas_objectRenderer_mix.c +++ b/lib_rend/ivas_objectRenderer_mix.c @@ -41,7 +41,7 @@ #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #define IVAS_FLOAT_FIXED_TO_BE_REMOVED diff --git a/lib_rend/ivas_objectRenderer_sfx.c b/lib_rend/ivas_objectRenderer_sfx.c index 6bb4b0c44..382632999 100644 --- a/lib_rend/ivas_objectRenderer_sfx.c +++ b/lib_rend/ivas_objectRenderer_sfx.c @@ -38,7 +38,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_rend/ivas_objectRenderer_sources.c b/lib_rend/ivas_objectRenderer_sources.c index 15159cacf..6fa37e77f 100644 --- a/lib_rend/ivas_objectRenderer_sources.c +++ b/lib_rend/ivas_objectRenderer_sources.c @@ -38,8 +38,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_rend/ivas_objectRenderer_vec.c b/lib_rend/ivas_objectRenderer_vec.c index 714fdb299..f24edf8bd 100644 --- a/lib_rend/ivas_objectRenderer_vec.c +++ b/lib_rend/ivas_objectRenderer_vec.c @@ -36,8 +36,7 @@ #include "prot.h" #include "ivas_prot_rend.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" diff --git a/lib_rend/ivas_omasa_ana.c b/lib_rend/ivas_omasa_ana.c index cbf60f70f..476cbbe3e 100644 --- a/lib_rend/ivas_omasa_ana.c +++ b/lib_rend/ivas_omasa_ana.c @@ -41,7 +41,7 @@ #include "ivas_stat_rend.h" #include "ivas_rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk.c index edea2f049..6f308742c 100644 --- a/lib_rend/ivas_orient_trk.c +++ b/lib_rend/ivas_orient_trk.c @@ -40,8 +40,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*------------------------------------------------------------------------------------------* diff --git a/lib_rend/ivas_reflections.c b/lib_rend/ivas_reflections.c index ea4b11418..c684c29c4 100644 --- a/lib_rend/ivas_reflections.c +++ b/lib_rend/ivas_reflections.c @@ -43,8 +43,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config.c index 65525868c..c7161061b 100644 --- a/lib_rend/ivas_render_config.c +++ b/lib_rend/ivas_render_config.c @@ -37,7 +37,7 @@ #include "ivas_rom_rend.h" #include "ivas_rom_TdBinauralRenderer.h" #include "wmc_auto.h" -#include "prot_fx1.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------* * Local constants diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c index 127dd8326..4d8b2e9bc 100644 --- a/lib_rend/ivas_reverb.c +++ b/lib_rend/ivas_reverb.c @@ -40,8 +40,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define float_to_fixQ31( n ) ( round( n * 0x7fffffff ) ) @@ -2452,7 +2451,7 @@ ivas_error ivas_reverb_open_fx( return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Reverberator " ); } - IF( NE_32( ( error = set_base_config_fx( ¶ms, output_Fs ) ), IVAS_ERR_OK ) ) + IF( NE_32(( error = set_base_config_fx( ¶ms, output_Fs ) ) , IVAS_ERR_OK) ) { return error; } @@ -2543,7 +2542,7 @@ ivas_error ivas_reverb_open_fx( /* set up jot reverb 60 filters - must be set up after set_reverb_acoustic_data() */ - IF( NE_32( ( error = compute_t60_coeffs_fx( ¶ms, nr_fc_fft_filter, output_Fs ) ), IVAS_ERR_OK ) ) + IF( NE_32(( error = compute_t60_coeffs_fx( ¶ms, nr_fc_fft_filter, output_Fs ) ) , IVAS_ERR_OK) ) { return error; } @@ -2591,7 +2590,7 @@ ivas_error ivas_reverb_open_fx( move16(); /* clear & init jot reverb fft filters */ - IF( NE_32( ( error = initialize_reverb_filters_fx( pState ) ), IVAS_ERR_OK ) ) + IF( NE_32(( error = initialize_reverb_filters_fx( pState ) ) , IVAS_ERR_OK) ) { return error; } diff --git a/lib_rend/ivas_reverb_delay_line.c b/lib_rend/ivas_reverb_delay_line.c index d24bbe1ec..0de9e386c 100644 --- a/lib_rend/ivas_reverb_delay_line.c +++ b/lib_rend/ivas_reverb_delay_line.c @@ -37,8 +37,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_rend/ivas_reverb_fft_filter.c b/lib_rend/ivas_reverb_fft_filter.c index 62ab464da..1889974cd 100644 --- a/lib_rend/ivas_reverb_fft_filter.c +++ b/lib_rend/ivas_reverb_fft_filter.c @@ -37,8 +37,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_rend/ivas_reverb_filter_design.c b/lib_rend/ivas_reverb_filter_design.c index b293d6e22..ba6c43a09 100644 --- a/lib_rend/ivas_reverb_filter_design.c +++ b/lib_rend/ivas_reverb_filter_design.c @@ -33,7 +33,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_rend.h" #include #include diff --git a/lib_rend/ivas_reverb_iir_filter.c b/lib_rend/ivas_reverb_iir_filter.c index 1f1508b5e..51404ad5a 100644 --- a/lib_rend/ivas_reverb_iir_filter.c +++ b/lib_rend/ivas_reverb_iir_filter.c @@ -36,8 +36,7 @@ #include "ivas_prot_rend.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_rend/ivas_reverb_utils.c b/lib_rend/ivas_reverb_utils.c index 7f4af7703..c382c034a 100644 --- a/lib_rend/ivas_reverb_utils.c +++ b/lib_rend/ivas_reverb_utils.c @@ -37,7 +37,7 @@ #include "ivas_rom_rend.h" #include #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------------------------* * Local constants diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation.c index 5290f0abb..3e9261af1 100644 --- a/lib_rend/ivas_rotation.c +++ b/lib_rend/ivas_rotation.c @@ -42,8 +42,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "debug.h" #include "ivas_rom_binaural_crend_head.h" diff --git a/lib_rend/ivas_sba_rendering.c b/lib_rend/ivas_sba_rendering.c index c2aeaef5d..9c95a2d8c 100644 --- a/lib_rend/ivas_sba_rendering.c +++ b/lib_rend/ivas_sba_rendering.c @@ -33,8 +33,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_stat_dec.h" diff --git a/lib_rend/ivas_td_decorr.c b/lib_rend/ivas_td_decorr.c index 2e14388f8..e3e224c9a 100644 --- a/lib_rend/ivas_td_decorr.c +++ b/lib_rend/ivas_td_decorr.c @@ -34,8 +34,7 @@ #include "options.h" #include "prot.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_rend/ivas_vbap.c b/lib_rend/ivas_vbap.c index bc8090c7a..c6524aeed 100644 --- a/lib_rend/ivas_vbap.c +++ b/lib_rend/ivas_vbap.c @@ -35,13 +35,11 @@ #include #include #include "prot.h" -#include "prot_fx2.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_stat_dec.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------* * Local constants diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index bd7ebe21d..3db18bcf1 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -47,8 +47,7 @@ #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index a4994e544..e8bbe3653 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -34,7 +34,7 @@ #include #include "prot.h" #include "ivas_prot_rend.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" /*---------------------------------------------------------------------* diff --git a/lib_util/ism_file_reader.c b/lib_util/ism_file_reader.c index 9127fe847..ae35e6d46 100644 --- a/lib_util/ism_file_reader.c +++ b/lib_util/ism_file_reader.c @@ -35,7 +35,7 @@ #include #include #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */ diff --git a/lib_util/rotation_file_reader.c b/lib_util/rotation_file_reader.c index f5a815377..47ba31fb8 100644 --- a/lib_util/rotation_file_reader.c +++ b/lib_util/rotation_file_reader.c @@ -36,7 +36,7 @@ #include #include "prot.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_util/vector3_pair_file_reader.c b/lib_util/vector3_pair_file_reader.c index 00c23a497..aa828b0ee 100644 --- a/lib_util/vector3_pair_file_reader.c +++ b/lib_util/vector3_pair_file_reader.c @@ -38,8 +38,7 @@ #include "prot.h" #include "options.h" /* only included to get access to the feature-defines */ #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif -- GitLab From c184a7b350cfbf69c7e0a540f40f620fbdd78c45 Mon Sep 17 00:00:00 2001 From: Sandesh Venkatesh Date: Thu, 18 Jul 2024 12:35:44 +0530 Subject: [PATCH 2/2] Clang formatting changes --- lib_com/bitalloc_fx.c | 6 +- lib_com/bitallocsum_fx.c | 4 +- lib_com/bitstream_fx.c | 2 +- lib_com/cb_shape_fx.c | 6 +- lib_com/cldfb_evs.c | 2 +- lib_com/cng_exc_fx.c | 4 +- lib_com/edct_fx.c | 6 +- lib_com/enhancer_fx.c | 22 +-- lib_com/est_tilt_fx.c | 4 +- lib_com/fft_fx_evs.c | 6 +- lib_com/fft_rel_fx.c | 4 +- lib_com/fine_gain_bits_fx.c | 4 +- lib_com/gs_bitallocation_fx.c | 8 +- lib_com/gs_bitallocation_ivas_fx.c | 2 +- lib_com/gs_inact_switching_fx.c | 6 +- lib_com/hq_bit_allocation_fx.c | 6 +- lib_com/hq_conf_fx.c | 4 +- lib_com/hvq_pvq_bitalloc_fx.c | 2 +- lib_com/isf_dec_amr_wb_fx.c | 6 +- lib_com/limit_t0_fx.c | 4 +- lib_com/logqnorm_fx.c | 6 +- lib_com/lpc_tools_fx.c | 2 +- lib_com/pred_lt4_fx.c | 6 +- lib_com/prot_fx.h | 2 +- lib_com/pvq_com_fx.c | 4 +- lib_com/re8_ppv_fx.c | 4 +- lib_com/re8_util_fx.c | 6 +- lib_com/recovernorm_fx.c | 6 +- lib_com/reordvct_fx.c | 2 +- lib_com/scale_mem_fx.c | 2 +- lib_com/stab_est_fx.c | 4 +- lib_com/stat_noise_uv_mod_fx.c | 6 +- lib_com/swb_tbe_com.c | 29 ++- lib_com/swb_tbe_com_fx.c | 16 +- lib_com/syn_12k8_fx.c | 4 +- lib_com/syn_filt_fx.c | 4 +- lib_com/tcq_position_arith_fx.c | 18 +- lib_com/tcx_ltp_fx.c | 54 +++--- lib_com/tcx_mdct_fx.c | 34 ++-- lib_com/tcx_mdct_window.c | 14 +- lib_com/tcx_utils_fx.c | 4 +- lib_com/tec_com.c | 4 +- lib_com/trans_direct_fx.c | 6 +- lib_com/trans_inv_fx.c | 4 +- lib_com/weight_fx.c | 6 +- lib_com/window_ola_fx.c | 4 +- lib_com/wtda_fx.c | 6 +- lib_dec/FEC_HQ_core.c | 24 +-- lib_dec/FEC_HQ_core_fx.c | 4 +- lib_dec/FEC_HQ_phase_ecu_fx.c | 176 +++++++++---------- lib_dec/FEC_adapt_codebook_fx.c | 6 +- lib_dec/FEC_clas_estim_fx.c | 6 +- lib_dec/FEC_fx.c | 8 +- lib_dec/FEC_lsf_estim_fx.c | 6 +- lib_dec/FEC_pitch_estim_fx.c | 8 +- lib_dec/FEC_scale_syn_fx.c | 8 +- lib_dec/LD_music_post_filter_fx.c | 6 +- lib_dec/acelp_core_dec_fx.c | 4 +- lib_dec/acelp_core_switch_dec_fx.c | 8 +- lib_dec/avq_dec_fx.c | 8 +- lib_dec/bass_psfilter_fx.c | 8 +- lib_dec/core_switching_dec_fx.c | 2 +- lib_dec/dec2t32_fx.c | 4 +- lib_dec/dec4t64_fx.c | 14 +- lib_dec/dec_amr_wb_fx.c | 6 +- lib_dec/dec_gen_voic_fx.c | 6 +- lib_dec/dec_higher_acelp_fx.c | 4 +- lib_dec/dec_nelp_fx.c | 4 +- lib_dec/dec_pit_exc_fx.c | 8 +- lib_dec/dec_ppp_fx.c | 4 +- lib_dec/dec_prm.c | 2 +- lib_dec/dec_prm_fx.c | 22 +-- lib_dec/dec_tran_fx.c | 4 +- lib_dec/dec_uv_fx.c | 4 +- lib_dec/evs_dec_fx.c | 2 +- lib_dec/gain_dec_fx.c | 6 +- lib_dec/gaus_dec_fx.c | 6 +- lib_dec/gs_dec_amr_wb_fx.c | 22 +-- lib_dec/gs_dec_fx.c | 26 +-- lib_dec/hf_synth_fx.c | 20 +-- lib_dec/hq_classifier_dec_fx.c | 6 +- lib_dec/hq_core_dec_fx.c | 6 +- lib_dec/hq_env_dec_fx.c | 4 +- lib_dec/hq_hr_dec_fx.c | 4 +- lib_dec/inov_dec_fx.c | 6 +- lib_dec/ivas_stereo_dft_dec_dmx.c | 10 +- lib_dec/ivas_stereo_dft_plc_fx.c | 18 +- lib_dec/ivas_stereo_ica_dec.c | 4 +- lib_dec/ivas_stereo_mdct_core_dec_fx.c | 8 +- lib_dec/ivas_tcx_core_dec.c | 2 +- lib_dec/lp_exc_d_fx.c | 4 +- lib_dec/lsf_dec_fx.c | 6 +- lib_dec/nelp_dec_fx.c | 2 +- lib_dec/pvq_core_dec_fx.c | 6 +- lib_dec/range_dec_fx.c | 6 +- lib_dec/re8_dec_fx.c | 2 +- lib_dec/rst_dec_fx.c | 4 +- lib_dec/stat_noise_uv_dec_fx.c | 2 +- lib_dec/swb_bwe_dec_hr_fx.c | 8 +- lib_dec/syn_outp_fx.c | 4 +- lib_dec/tonalMDCTconcealment_fx.c | 2 +- lib_dec/transition_dec_fx.c | 6 +- lib_dec/updt_dec_fx.c | 4 +- lib_enc/FEC_enc_fx.c | 2 +- lib_enc/SNR_calc_fx.c | 2 +- lib_enc/acelp_core_switch_enc_fx.c | 2 +- lib_enc/acelp_enc_util_fx.c | 2 +- lib_enc/amr_wb_enc_fx.c | 2 +- lib_enc/analy_lp_fx.c | 2 +- lib_enc/analy_sp_fx.c | 2 +- lib_enc/ari_enc_fx.c | 2 +- lib_enc/ari_hm_enc_fx.c | 2 +- lib_enc/arith_coder_enc_fx.c | 2 +- lib_enc/avq_cod_fx.c | 2 +- lib_enc/bass_psfilter_enc_fx.c | 2 +- lib_enc/bw_detect_fx.c | 2 +- lib_enc/cng_enc_fx.c | 2 +- lib_enc/cod2t32_fx.c | 2 +- lib_enc/cod4t64_fx.c | 2 +- lib_enc/cod_ace_fx.c | 2 +- lib_enc/cod_uv_fx.c | 2 +- lib_enc/comvad_decision_fx.c | 2 +- lib_enc/cor_shif_fx.c | 2 +- lib_enc/core_enc_2div_fx.c | 2 +- lib_enc/core_enc_init_fx.c | 2 +- lib_enc/core_enc_ol_fx.c | 2 +- lib_enc/core_enc_reconf_fx.c | 2 +- lib_enc/core_enc_switch_fx.c | 2 +- lib_enc/core_enc_updt_fx.c | 2 +- lib_enc/core_switching_enc_fx.c | 2 +- lib_enc/corr_xh_fx.c | 2 +- lib_enc/decision_matrix_enc_fx.c | 2 +- lib_enc/detect_transient_fx.c | 2 +- lib_enc/diffcod_fx.c | 2 +- lib_enc/dtx_fx.c | 8 +- lib_enc/enc_acelp_fx.c | 2 +- lib_enc/enc_acelp_tcx_main_fx.c | 2 +- lib_enc/enc_acelpx_fx.c | 2 +- lib_enc/enc_amr_wb_fx.c | 2 +- lib_enc/enc_gain_fx.c | 2 +- lib_enc/enc_gen_voic_fx.c | 2 +- lib_enc/enc_gen_voic_rf_fx.c | 2 +- lib_enc/enc_nelp_fx.c | 2 +- lib_enc/enc_pit_exc_fx.c | 2 +- lib_enc/enc_ppp_fx.c | 2 +- lib_enc/enc_prm_fx.c | 2 +- lib_enc/enc_tran_fx.c | 2 +- lib_enc/enc_uv_fx.c | 2 +- lib_enc/energy_fx.c | 2 +- lib_enc/eval_pit_contr_fx.c | 2 +- lib_enc/evs_enc_fx.c | 2 +- lib_enc/ext_sig_ana_fx.c | 2 +- lib_enc/find_tar_fx.c | 2 +- lib_enc/find_tilt_fx.c | 2 +- lib_enc/find_uv_fx.c | 2 +- lib_enc/find_wsp.c | 24 +-- lib_enc/find_wsp_fx.c | 2 +- lib_enc/frame_spec_dif_cor_rate_fx.c | 2 +- lib_enc/gain_enc_fx.c | 2 +- lib_enc/gaus_enc_fx.c | 2 +- lib_enc/gp_clip_fx.c | 2 +- lib_enc/gs_enc_fx.c | 2 +- lib_enc/guided_plc_enc_fx.c | 2 +- lib_enc/hf_cod_amrwb_fx.c | 2 +- lib_enc/hq_classifier_enc_fx.c | 2 +- lib_enc/hq_core_enc_fx.c | 2 +- lib_enc/hq_env_enc_fx.c | 2 +- lib_enc/hq_hr_enc_fx.c | 2 +- lib_enc/hq_lr_enc_fx.c | 2 +- lib_enc/hvq_enc_fx.c | 2 +- lib_enc/igf_enc_fx.c | 2 +- lib_enc/igf_scf_enc_fx.c | 2 +- lib_enc/init_enc_fx.c | 2 +- lib_enc/inov_enc_fx.c | 2 +- lib_enc/isf_enc_amr_wb_fx.c | 2 +- lib_enc/ivas_core_pre_proc_front.c | 10 +- lib_enc/ivas_ism_dtx_enc.c | 26 +-- lib_enc/ivas_ism_enc.c | 12 +- lib_enc/ivas_ism_metadata_enc.c | 12 +- lib_enc/ivas_ism_param_enc.c | 10 +- lib_enc/ivas_mcmasa_enc.c | 16 +- lib_enc/ivas_stereo_classifier.c | 2 +- lib_enc/ivas_stereo_mdct_core_enc.c | 14 +- lib_enc/lead_indexing_fx.c | 2 +- lib_enc/lib_enc.c | 10 +- lib_enc/long_enr_fx.c | 40 ++--- lib_enc/lp_exc_e_fx.c | 2 +- lib_enc/lsf_enc_fx.c | 2 +- lib_enc/lsf_msvq_ma_enc_fx.c | 2 +- lib_enc/ltd_stable_fx.c | 2 +- lib_enc/mdct_classifier_fx.c | 2 +- lib_enc/mdct_selector_fx.c | 2 +- lib_enc/mslvq_enc_fx.c | 2 +- lib_enc/multi_harm_fx.c | 2 +- lib_enc/nelp_enc_fx.c | 6 +- lib_enc/nois_est_fx.c | 2 +- lib_enc/noise_adjust_fx.c | 2 +- lib_enc/normalizecoefs_fx.c | 2 +- lib_enc/peak_vq_enc_fx.c | 2 +- lib_enc/pit_enc_fx.c | 2 +- lib_enc/pitch_ol2_fx.c | 2 +- lib_enc/pitch_ol_fx.c | 2 +- lib_enc/plc_enc_ext_fx.c | 2 +- lib_enc/ppp_enc_fx.c | 2 +- lib_enc/pre_proc_fx.c | 2 +- lib_enc/pvq_core_enc_fx.c | 2 +- lib_enc/pvq_encode_fx.c | 2 +- lib_enc/q_gain2p_fx.c | 2 +- lib_enc/qlpc_avq_fx.c | 2 +- lib_enc/qlpc_stoch_fx.c | 2 +- lib_enc/range_enc_fx.c | 2 +- lib_enc/re8_cod_fx.c | 2 +- lib_enc/reordernorm_fx.c | 2 +- lib_enc/rst_enc_fx.c | 2 +- lib_enc/scale_enc_fx.c | 2 +- lib_enc/set_impulse_fx.c | 2 +- lib_enc/setmodeindex_fx.c | 2 +- lib_enc/sig_clas_fx.c | 2 +- lib_enc/spec_center_fx.c | 2 +- lib_enc/spec_flatness_fx.c | 2 +- lib_enc/speech_music_classif.c | 4 +- lib_enc/speech_music_classif_fx.c | 4 +- lib_enc/stat_noise_uv_enc_fx.c | 2 +- lib_enc/subband_fft_fx.c | 2 +- lib_enc/swb_bwe_enc_fx.c | 2 +- lib_enc/swb_bwe_enc_hr_fx.c | 2 +- lib_enc/swb_bwe_enc_lr_fx.c | 2 +- lib_enc/swb_pre_proc_fx.c | 2 +- lib_enc/swb_tbe_enc_fx.c | 2 +- lib_enc/tcq_core_enc_fx.c | 2 +- lib_enc/tcx_ltp_enc_fx.c | 2 +- lib_enc/tcx_utils_enc_fx.c | 2 +- lib_enc/tfa_enc_fx.c | 2 +- lib_enc/tns_base_enc_fx.c | 2 +- lib_enc/transient_detection_fx.c | 2 +- lib_enc/transition_enc_fx.c | 2 +- lib_enc/update_decision_fx.c | 2 +- lib_enc/updt_enc_fx.c | 2 +- lib_enc/updt_tar_fx.c | 2 +- lib_enc/vad_basop_fx.c | 2 +- lib_enc/vad_fx.c | 2 +- lib_enc/vad_param_updt_fx.c | 2 +- lib_enc/vad_proc_fx.c | 2 +- lib_enc/vbr_average_rate_fx.c | 2 +- lib_enc/vlpc_1st_cod_fx.c | 2 +- lib_enc/vlpc_2st_cod_fx.c | 2 +- lib_enc/voiced_enc_fx.c | 2 +- lib_enc/waveadjust_fec_cod_fx.c | 2 +- lib_rend/ivas_crend.c | 2 +- lib_rend/ivas_dirac_dec_binaural_functions.c | 8 +- lib_rend/ivas_dirac_decorr_dec.c | 18 +- lib_rend/ivas_reverb.c | 6 +- 252 files changed, 713 insertions(+), 714 deletions(-) diff --git a/lib_com/bitalloc_fx.c b/lib_com/bitalloc_fx.c index 491c9bb95..c20235e39 100644 --- a/lib_com/bitalloc_fx.c +++ b/lib_com/bitalloc_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ void bitalloc_fx( diff --git a/lib_com/bitallocsum_fx.c b/lib_com/bitallocsum_fx.c index 2a077b1de..c3803eb94 100644 --- a/lib_com/bitallocsum_fx.c +++ b/lib_com/bitallocsum_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------------- diff --git a/lib_com/bitstream_fx.c b/lib_com/bitstream_fx.c index d910b657a..f10493eea 100644 --- a/lib_com/bitstream_fx.c +++ b/lib_com/bitstream_fx.c @@ -39,7 +39,7 @@ #include #include "options.h" #include "ivas_cnst.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/cb_shape_fx.c b/lib_com/cb_shape_fx.c index 6a27fd395..880b60205 100644 --- a/lib_com/cb_shape_fx.c +++ b/lib_com/cb_shape_fx.c @@ -2,10 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* */ +#include "rom_com.h" /* */ /* * E_GAIN_f_pitch_sharpening diff --git a/lib_com/cldfb_evs.c b/lib_com/cldfb_evs.c index 317ff899f..2a27fbb24 100644 --- a/lib_com/cldfb_evs.c +++ b/lib_com/cldfb_evs.c @@ -1285,7 +1285,7 @@ void GetEnergyCldfb( Word32 *energyLookahead, /*!< o: Q(*sf_energyLookahead) } } - IF( GE_16( numberBands, freqTable[1] ) && hTecEnc != NULL) + IF( GE_16( numberBands, freqTable[1] ) && hTecEnc != NULL ) { Word32 *tempEnergyValuesArry[CLDFB_NO_COL_MAX]; Word16 ScaleX2; diff --git a/lib_com/cng_exc_fx.c b/lib_com/cng_exc_fx.c index c25ed489a..e2475bbad 100644 --- a/lib_com/cng_exc_fx.c +++ b/lib_com/cng_exc_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" #include "ivas_rom_com_fx.h" diff --git a/lib_com/edct_fx.c b/lib_com/edct_fx.c index e3cf39fcd..bd27d2137 100644 --- a/lib_com/edct_fx.c +++ b/lib_com/edct_fx.c @@ -4,9 +4,9 @@ #include #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_com/enhancer_fx.c b/lib_com/enhancer_fx.c index a3d569edc..7f529ec12 100644 --- a/lib_com/enhancer_fx.c +++ b/lib_com/enhancer_fx.c @@ -2,10 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #include "basop_util.h" /*---------------------------------------------------------------------* @@ -100,7 +100,7 @@ void enhancer_fx( i = 0; move16(); /* high dispersion */ } - ELSE if( LE_32( core_brate, ACELP_8k85 ) ) + ELSE if ( LE_32( core_brate, ACELP_8k85 ) ) { i = 1; move16(); /* low dispersion */ @@ -118,7 +118,7 @@ void enhancer_fx( i = 0; move16(); /* high dispersion */ } - ELSE if( ( EQ_16( coder_type, GENERIC ) || EQ_16( coder_type, TRANSITION ) || EQ_16( coder_type, AUDIO ) || coder_type == INACTIVE ) && LE_32( core_brate, ACELP_9k60 ) ) + ELSE if ( ( EQ_16( coder_type, GENERIC ) || EQ_16( coder_type, TRANSITION ) || EQ_16( coder_type, AUDIO ) || coder_type == INACTIVE ) && LE_32( core_brate, ACELP_9k60 ) ) { i = 1; move16(); /* low dispersion */ @@ -379,7 +379,7 @@ void enhancer_ivas_fx( i = 0; move16(); /* high dispersion */ } - ELSE if( LE_32( core_brate, ACELP_8k85 ) ) + ELSE if ( LE_32( core_brate, ACELP_8k85 ) ) { i = 1; move16(); /* low dispersion */ @@ -717,7 +717,7 @@ Word16 E_UTIL_enhancer( gain = add( sub( code_exp, exc2_exp ), 1 ); tmp = mac_r( 268435456l /*0.125f Q31*/, 4096 /*0.125f Q15*/, voice_fac ); /* 0.25=voiced, 0=unvoiced */ - IF ( EQ_16( L_frame, L_FRAME16k ) ) + IF( EQ_16( L_frame, L_FRAME16k ) ) { tmp = mac_r( 322122560l /*0.150f Q31*/, 4915 /*0.150f Q15*/, voice_fac ); /* 0.30=voiced, 0=unvoiced */ } @@ -725,7 +725,7 @@ Word16 E_UTIL_enhancer( /* exc2[0] = exc2[0] + code[0] - tmp*code[1]; */ L_tmp = L_mult( code[0], 16384 ); L_tmp = L_msu0( L_tmp, tmp, code[1] ); - IF ( gain ) + IF( gain ) { #ifdef BASOP_NOGLOB L_tmp = L_shl_sat( L_tmp, gain ); @@ -740,14 +740,14 @@ Word16 E_UTIL_enhancer( #endif move16(); - FOR( i = 1; i < sub(L_subfr , 1); i++ ) + FOR( i = 1; i < sub( L_subfr, 1 ); i++ ) { /* exc2[i] = exc2[i] + code[i] - tmp*(code[i+1]+code[i-1]); */ L_tmp = L_mult( code[i], 16384 ); #ifdef BASOP_NOGLOB L_tmp = L_msu0_sat( L_tmp, tmp, code[i - 1] ); L_tmp = L_msu0_sat( L_tmp, tmp, code[i + 1] ); - IF ( gain ) + IF( gain ) { L_tmp = L_shl_sat( L_tmp, gain ); } @@ -767,7 +767,7 @@ Word16 E_UTIL_enhancer( L_tmp = L_mult( code[i], 16384 ); #ifdef BASOP_NOGLOB L_tmp = L_msu0_sat( L_tmp, tmp, code[i - 1] ); - IF ( gain ) + IF( gain ) { L_tmp = L_shl_sat( L_tmp, gain ); } diff --git a/lib_com/est_tilt_fx.c b/lib_com/est_tilt_fx.c index 0b9c39b38..6f541c11f 100644 --- a/lib_com/est_tilt_fx.c +++ b/lib_com/est_tilt_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #include "stl.h" #include "basop_util.h" diff --git a/lib_com/fft_fx_evs.c b/lib_com/fft_fx_evs.c index ddcbae49a..c17de3643 100644 --- a/lib_com/fft_fx_evs.c +++ b/lib_com/fft_fx_evs.c @@ -2,10 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #include "stl.h" #include diff --git a/lib_com/fft_rel_fx.c b/lib_com/fft_rel_fx.c index 42cf4deff..b07cb3acb 100644 --- a/lib_com/fft_rel_fx.c +++ b/lib_com/fft_rel_fx.c @@ -2,9 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #include "stl.h" #include "stdint.h" diff --git a/lib_com/fine_gain_bits_fx.c b/lib_com/fine_gain_bits_fx.c index 339e11096..627eda6e0 100644 --- a/lib_com/fine_gain_bits_fx.c +++ b/lib_com/fine_gain_bits_fx.c @@ -3,8 +3,8 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_com/gs_bitallocation_fx.c b/lib_com/gs_bitallocation_fx.c index 004cdb3d3..943291cec 100644 --- a/lib_com/gs_bitallocation_fx.c +++ b/lib_com/gs_bitallocation_fx.c @@ -2,11 +2,11 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ -#include "assert.h" /* Debug prototypes */ +#include "assert.h" /* Debug prototypes */ #include "stl.h" /*==================================================================================*/ diff --git a/lib_com/gs_bitallocation_ivas_fx.c b/lib_com/gs_bitallocation_ivas_fx.c index 510506147..6bc6eac23 100644 --- a/lib_com/gs_bitallocation_ivas_fx.c +++ b/lib_com/gs_bitallocation_ivas_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ #include "prot.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_prot.h" /* Function prototypes */ #include "assert.h" /* Debug prototypes */ #include "stl.h" diff --git a/lib_com/gs_inact_switching_fx.c b/lib_com/gs_inact_switching_fx.c index 27b1efb08..01a055620 100644 --- a/lib_com/gs_inact_switching_fx.c +++ b/lib_com/gs_inact_switching_fx.c @@ -2,9 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_com/hq_bit_allocation_fx.c b/lib_com/hq_bit_allocation_fx.c index 79d6bb1a4..4ac2252f8 100644 --- a/lib_com/hq_bit_allocation_fx.c +++ b/lib_com/hq_bit_allocation_fx.c @@ -2,10 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "stl.h" /* required for wmc_tool */ +#include "options.h" /* Compilation switches */ +#include "stl.h" /* required for wmc_tool */ #include "prot_fx.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ +#include "cnst.h" /* Common constants */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/hq_conf_fx.c b/lib_com/hq_conf_fx.c index 21f70e1a0..eb675986b 100644 --- a/lib_com/hq_conf_fx.c +++ b/lib_com/hq_conf_fx.c @@ -4,8 +4,8 @@ #include #include "options.h" -#include "cnst.h" /* Audio core constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "cnst.h" /* Audio core constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_com/hvq_pvq_bitalloc_fx.c b/lib_com/hvq_pvq_bitalloc_fx.c index 2066ea993..4775f1b78 100644 --- a/lib_com/hvq_pvq_bitalloc_fx.c +++ b/lib_com/hvq_pvq_bitalloc_fx.c @@ -6,7 +6,7 @@ #include "rom_com.h" #include "prot_fx.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ +#include "cnst.h" /* Common constants */ /*--------------------------------------------------------------------------*/ /* Function hvq_pvq_bitalloc */ diff --git a/lib_com/isf_dec_amr_wb_fx.c b/lib_com/isf_dec_amr_wb_fx.c index e0b891273..586dea535 100644 --- a/lib_com/isf_dec_amr_wb_fx.c +++ b/lib_com/isf_dec_amr_wb_fx.c @@ -31,9 +31,9 @@ *******************************************************************************************************/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #ifdef _MSC_VER diff --git a/lib_com/limit_t0_fx.c b/lib_com/limit_t0_fx.c index 07557fe72..6573a7925 100644 --- a/lib_com/limit_t0_fx.c +++ b/lib_com/limit_t0_fx.c @@ -3,8 +3,8 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" diff --git a/lib_com/logqnorm_fx.c b/lib_com/logqnorm_fx.c index a4196a1b3..fbbf2a464 100644 --- a/lib_com/logqnorm_fx.c +++ b/lib_com/logqnorm_fx.c @@ -31,10 +31,10 @@ *******************************************************************************************************/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ -#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "cnst.h" /* Common constants */ /*--------------------------------------------------------------------------* * Local constants diff --git a/lib_com/lpc_tools_fx.c b/lib_com/lpc_tools_fx.c index f723a2725..d4c01f46c 100644 --- a/lib_com/lpc_tools_fx.c +++ b/lib_com/lpc_tools_fx.c @@ -38,7 +38,7 @@ #include #include "options.h" /* Compilation switches */ #include "ivas_cnst.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" #include "basop_util.h" diff --git a/lib_com/pred_lt4_fx.c b/lib_com/pred_lt4_fx.c index 6cc06f28e..21bd9f541 100644 --- a/lib_com/pred_lt4_fx.c +++ b/lib_com/pred_lt4_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_com/prot_fx.h b/lib_com/prot_fx.h index 19da14d72..524cf7b73 100644 --- a/lib_com/prot_fx.h +++ b/lib_com/prot_fx.h @@ -10068,4 +10068,4 @@ Word16 sr2fscale( const Word32 sr_core /* i : internal sampling rate */ ); -#endif \ No newline at end of file +#endif diff --git a/lib_com/pvq_com_fx.c b/lib_com/pvq_com_fx.c index 97690114f..23c42119b 100644 --- a/lib_com/pvq_com_fx.c +++ b/lib_com/pvq_com_fx.c @@ -4,8 +4,8 @@ #include #include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ /*! r: Approximate integer division for positive input using lookup table */ UWord32 intLimCDivPos_fx( diff --git a/lib_com/re8_ppv_fx.c b/lib_com/re8_ppv_fx.c index 32c69f6e5..f330f22c2 100644 --- a/lib_com/re8_ppv_fx.c +++ b/lib_com/re8_ppv_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_com/re8_util_fx.c b/lib_com/re8_util_fx.c index aa6075245..00909e2f5 100644 --- a/lib_com/re8_util_fx.c +++ b/lib_com/re8_util_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_com/recovernorm_fx.c b/lib_com/recovernorm_fx.c index d6659b77a..a61e1f183 100644 --- a/lib_com/recovernorm_fx.c +++ b/lib_com/recovernorm_fx.c @@ -2,10 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ /*--------------------------------------------------------------------------* * recovernorm_fx() diff --git a/lib_com/reordvct_fx.c b/lib_com/reordvct_fx.c index 45c2ffbba..07bc21bc8 100644 --- a/lib_com/reordvct_fx.c +++ b/lib_com/reordvct_fx.c @@ -31,7 +31,7 @@ *******************************************************************************************************/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_com/scale_mem_fx.c b/lib_com/scale_mem_fx.c index b3eda3954..2e61cb938 100644 --- a/lib_com/scale_mem_fx.c +++ b/lib_com/scale_mem_fx.c @@ -34,7 +34,7 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Common prototypes */ +#include "options.h" /* Common prototypes */ #include "prot_fx.h" /* Common prototypes */ #include "ivas_cnst.h" #include "stl.h" diff --git a/lib_com/stab_est_fx.c b/lib_com/stab_est_fx.c index 2d6a6b141..e0c75e563 100644 --- a/lib_com/stab_est_fx.c +++ b/lib_com/stab_est_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_com/stat_noise_uv_mod_fx.c b/lib_com/stat_noise_uv_mod_fx.c index 957bae8a3..9869019fa 100644 --- a/lib_com/stat_noise_uv_mod_fx.c +++ b/lib_com/stat_noise_uv_mod_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "cnst.h" /* Function prototypes */ +#include "cnst.h" /* Function prototypes */ /*---------------------------------------------------------------------* * Local function prototypes @@ -303,7 +303,7 @@ void stat_noise_uv_mod_fx( Exc2_local[i] = extract_h( L_tmp ); /*Q_local */ move16(); } - *Q_stat_noise = Q_local; /* update for next call, routine can only be called once every frame */ + *Q_stat_noise = Q_local; /* update for next call, routine can only be called once every frame */ move16(); Qdiff = sub( Q_exc, Q_local ); /* local excitation and incoming excitation */ Scale_sig( Exc2_local, L_FRAME, Qdiff ); diff --git a/lib_com/swb_tbe_com.c b/lib_com/swb_tbe_com.c index 7f9ce0c18..aec2805a0 100644 --- a/lib_com/swb_tbe_com.c +++ b/lib_com/swb_tbe_com.c @@ -1217,7 +1217,7 @@ void GenSHBSynth_fx_32( Word32 *shb_syn_speech_32k, /* o : output highband component Qx*/ Word32 Hilbert_Mem[], /* i/o: memory Qx*/ Word32 state_lsyn_filt_shb_local[], /* i/o: memory Qx*/ - const Word16 L_frame, /* i : ACELP frame length */ + const Word16 L_frame, /* i : ACELP frame length */ Word16 *syn_dm_phase ) { Word32 speech_buf_32k[L_FRAME32k]; @@ -1236,7 +1236,7 @@ void GenSHBSynth_fx_32( // shb_syn_speech_32k[i] = ( ( i % 2 ) == 0 ) ? ( -speech_buf_32k[i] ) : ( speech_buf_32k[i] ); IF( i % 2 == 0 ) { - shb_syn_speech_32k[i] = L_negate(speech_buf_32k[i]); + shb_syn_speech_32k[i] = L_negate( speech_buf_32k[i] ); } ELSE { @@ -1364,7 +1364,7 @@ void ScaleShapedSHB( } #ifdef IVAS_FLOAT_FIXED void ScaleShapedSHB_32( - const Word16 length, /* i : SHB overlap length */ + const Word16 length, /* i : SHB overlap length */ Word32 *synSHB_fx, /* i/o: synthesized shb signal Q_inp/Q_new */ Word32 *overlap_fx, /* i/o: buffer for overlap-add Q_inp/Q_new */ const Word16 *subgain_fx, /* i : subframe gain Q15 */ @@ -1406,7 +1406,7 @@ void ScaleShapedSHB_32( FOR( k = 0; k < shr( length, 1 ); k++ ) { sum_gain_fx = mult_r( subwin_fx[2 * k + 2], subgain_fx[0] ); - mod_syn_fx[add(skip[0] , k)] = Mpy_32_16_1( synSHB_fx[add(skip[0] , k)], sum_gain_fx ); + mod_syn_fx[add( skip[0], k )] = Mpy_32_16_1( synSHB_fx[add( skip[0], k )], sum_gain_fx ); move32(); // Qx mod_syn_fx[add( add( skip[0], k ), shr( length, 1 ) )] = Mpy_32_16_1( synSHB_fx[add( add( skip[0], k ), shr( length, 1 ) )], subgain_fx[0] ); // Qx move32(); @@ -1417,14 +1417,14 @@ void ScaleShapedSHB_32( { L_tmp = L_mult0( subwin_fx[k + 1], subgain_fx[i] ); sum_gain_fx = round_fx( L_mac0( L_tmp, subwin_fx[length - k - 1], subgain_fx[i - 1] ) ); - mod_syn_fx[add(skip[i] , k)] = L_shl( Mpy_32_16_1( synSHB_fx[add(skip[i] , k)], sum_gain_fx ), 1 ); // Qx + mod_syn_fx[add( skip[i], k )] = L_shl( Mpy_32_16_1( synSHB_fx[add( skip[i], k )], sum_gain_fx ), 1 ); // Qx move32(); } } FOR( k = 0; k < shr( length, 1 ); k++ ) { sum_gain_fx = mult_r( subwin_fx[sub( sub( length, shl( k, 1 ) ), 2 )], subgain_fx[i - 1] ); - mod_syn_fx[add(skip[i] , k)] = Mpy_32_16_1( synSHB_fx[add(skip[i] , k)], sum_gain_fx ); // Qx + mod_syn_fx[add( skip[i], k )] = Mpy_32_16_1( synSHB_fx[add( skip[i], k )], sum_gain_fx ); // Qx move32(); } } @@ -1439,21 +1439,21 @@ void ScaleShapedSHB_32( { mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[k + 1], subgain_fx[0] ) ); // Qx move32(); - j = add(j,1); + j = add( j, 1 ); } FOR( i = 0; i < NUM_SHB_SUBGAINS - 1; i++ ) { FOR( k = 0; k < join_length - length; k++ ) { - mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], subgain_fx[i_mult(i , num_join)] ); // Qx + mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], subgain_fx[i_mult( i, num_join )] ); // Qx move32(); j = add( j, 1 ); } FOR( k = 0; k < length; k++ ) { - L_tmp = L_mult0( subwin_fx[length - k - 1], subgain_fx[i_mult(i , num_join)] ); - mod_syn_fx[j] = L_shl( Mpy_32_16_1( synSHB_fx[j], round_fx( L_mac0( L_tmp, subwin_fx[k + 1], subgain_fx[i_mult(( i + 1 ) , num_join)] ) ) ), 1 ); // Qx + L_tmp = L_mult0( subwin_fx[length - k - 1], subgain_fx[i_mult( i, num_join )] ); + mod_syn_fx[j] = L_shl( Mpy_32_16_1( synSHB_fx[j], round_fx( L_mac0( L_tmp, subwin_fx[k + 1], subgain_fx[i_mult( ( i + 1 ), num_join )] ) ) ), 1 ); // Qx move32(); j = add( j, 1 ); } @@ -1466,14 +1466,14 @@ void ScaleShapedSHB_32( } FOR( k = 0; k < length; k++ ) { - mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[sub(sub(length , k) , 1)], subgain_fx[( NUM_SHB_SUBGAINS - 1 ) * num_join] ) ); // Qx + mod_syn_fx[j] = Mpy_32_16_1( synSHB_fx[j], mult_r( subwin_fx[sub( sub( length, k ), 1 )], subgain_fx[( NUM_SHB_SUBGAINS - 1 ) * num_join] ) ); // Qx move32(); j = add( j, 1 ); } } Word16 norm_shift = norm_l( frame_gain_fx ); - if( frame_gain_fx == 0 ) + if ( frame_gain_fx == 0 ) { norm_shift = 31; move16(); @@ -1486,7 +1486,7 @@ void ScaleShapedSHB_32( move16(); FOR( i = 0; i < L_SHB_LAHEAD; i++ ) { - overlap_fx[i] = L_shl( overlap_fx[i],sub( *Q_new , *Q_inp) ); + overlap_fx[i] = L_shl( overlap_fx[i], sub( *Q_new, *Q_inp ) ); move32(); } @@ -1498,7 +1498,6 @@ void ScaleShapedSHB_32( move32(); move32(); move32(); - } FOR( ; i < l_frame; i++ ) @@ -1509,7 +1508,7 @@ void ScaleShapedSHB_32( FOR( ; i < l_frame + l_shb_lahead; i++ ) { - synSHB_fx[i] = L_shl( synSHB_fx[i],sub( *Q_new , *Q_inp) ); + synSHB_fx[i] = L_shl( synSHB_fx[i], sub( *Q_new, *Q_inp ) ); overlap_fx[i - l_frame] = Mpy_32_32( mod_syn_fx[i], Mpy_32_16_1( L_shl( frame_gain_fx, norm_shift ), win_fx[l_frame + l_shb_lahead - 1 - i] ) ); // Q_new move32(); move32(); diff --git a/lib_com/swb_tbe_com_fx.c b/lib_com/swb_tbe_com_fx.c index 93ffd08a0..55ca77c35 100644 --- a/lib_com/swb_tbe_com_fx.c +++ b/lib_com/swb_tbe_com_fx.c @@ -2997,7 +2997,7 @@ void GenShapedSHBExcitation_ivas_fx( varEnvShape = 32604; move16(); csfilt_num2[0] = 32768 - varEnvShape; - //csfilt_num2[0] = sub( 32767, varEnvShape ); + // csfilt_num2[0] = sub( 32767, varEnvShape ); move16(); neg_csfilt_den2[1] = varEnvShape; move16(); @@ -6372,8 +6372,8 @@ void prep_tbe_exc_ivas_fx( Ltemp2 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /*Q2 * Q10 -> Q12 */ #ifdef BASOP_NOGLOB - Ltemp1 = L_shl_o( Ltemp1,add( Q_exc , 6 )/*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */ - Ltemp2 = L_shl_o( Ltemp2,add( Q_exc , 4 )/*Q_exc+16-13*/, &Overflow ); /*Q_exc+16 */ + Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */ + Ltemp2 = L_shl_o( Ltemp2, add( Q_exc, 4 ) /*Q_exc+16-13*/, &Overflow ); /*Q_exc+16 */ tmp_code_preInt_fx[i] = round_fx_o( L_add_o( Ltemp1, Ltemp2, &Overflow ), &Overflow ); /* Q_exc */ #else /* BASOP_NOGLOB */ @@ -6392,8 +6392,8 @@ void prep_tbe_exc_ivas_fx( /*code in the encoder is Q9 and there is no <<1 with Mult_32_16 Q16 * Q9 -> Q9 */ Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] ); /* Q16 + Q9 + 1 - 16 = Q10 */ #ifdef BASOP_NOGLOB - Ltemp1 = L_shl_o( Ltemp1, add(Q_exc , 6) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */ - tmp_code_preInt_fx[i] = round_fx_o( Ltemp1, &Overflow ); /* Q_exc */ + Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */ + tmp_code_preInt_fx[i] = round_fx_o( Ltemp1, &Overflow ); /* Q_exc */ #else Ltemp1 = L_shl( Ltemp1, Q_exc + 6 /*Q_exc+16-19*/ ); /*Q_exc+16 */ tmp_code_preInt_fx[i] = round_fx( Ltemp1 ); /* Q_exc */ @@ -6403,12 +6403,12 @@ void prep_tbe_exc_ivas_fx( } interp_code_4over2_fx( tmp_code_preInt_fx, tmp_code_fx, L_subfr ); /* o: tmp_code in Q_exc */ - FOR( i = 0; i < shl(L_subfr , 1); i++ ) + FOR( i = 0; i < shl( L_subfr, 1 ); i++ ) { - L_tmp = L_mult( gain_pit_fx, bwe_exc_fx[i + shl(i_subfr_fx , 1)] ); /*Q14+Q_exc+1 */ + L_tmp = L_mult( gain_pit_fx, bwe_exc_fx[i + shl( i_subfr_fx, 1 )] ); /*Q14+Q_exc+1 */ #ifdef BASOP_NOGLOB tmp = round_fx_o( L_shl_o( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/, &Overflow ), &Overflow ); /* tmp in Q_exc */ - bwe_exc_fx[i + shl(i_subfr_fx , 1)] = add_o( tmp, tmp_code_fx[i], &Overflow ); /*Q_exc */ + bwe_exc_fx[i + shl( i_subfr_fx, 1 )] = add_o( tmp, tmp_code_fx[i], &Overflow ); /*Q_exc */ move16(); #else /* BASOP_NOGLOB */ tmp = round_fx( L_shl( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/ ) ); /* tmp in Q_exc */ diff --git a/lib_com/syn_12k8_fx.c b/lib_com/syn_12k8_fx.c index 4907e8676..86d4c6ef7 100644 --- a/lib_com/syn_12k8_fx.c +++ b/lib_com/syn_12k8_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_com/syn_filt_fx.c b/lib_com/syn_filt_fx.c index c30ad59ee..e3a3024ba 100644 --- a/lib_com/syn_filt_fx.c +++ b/lib_com/syn_filt_fx.c @@ -459,12 +459,12 @@ void ivas_synth_mem_updt2_fx( } ELSE { - en1_e = sub(30 ,shl(Q,1)); + en1_e = sub( 30, shl( Q, 1 ) ); en2_e = sub( 30, shl( Q, 1 ) ); tmp1 = Sqrt32( en1, &en1_e ); tmp2 = Sqrt32( en2, &en2_e ); tmp = BASOP_Util_Divide3232_Scale( tmp1, tmp2, &tmp_e ); - loc_rat_e = add(sub(en1_e , en2_e) , tmp_e); + loc_rat_e = add( sub( en1_e, en2_e ), tmp_e ); loc_rat = shl_sat( tmp, loc_rat_e ); // Q15 } diff --git a/lib_com/tcq_position_arith_fx.c b/lib_com/tcq_position_arith_fx.c index 2c13d89d4..8c4b9a582 100644 --- a/lib_com/tcq_position_arith_fx.c +++ b/lib_com/tcq_position_arith_fx.c @@ -106,8 +106,8 @@ static UWord32 bitstream_load_bit( } curPos = &pBS->curPos; - bit = UL_and( UL_lshr( pBS->buf[pBS->numByte] , ( *curPos ) ) , 0x00000001 ); - *curPos = sub(*curPos, 1); + bit = UL_and( UL_lshr( pBS->buf[pBS->numByte], ( *curPos ) ), 0x00000001 ); + *curPos = sub( *curPos, 1 ); IF( *curPos < 0 ) { @@ -405,7 +405,7 @@ static Word16 ar_decode_fx( arInst->value = value; move32(); - return ( sub(symbol , 1) ); + return ( sub( symbol, 1 ) ); } void ar_decoder_done_fx( @@ -667,7 +667,7 @@ static void TCQnew_fx( move16(); if ( v_fx[i - 1] <= 0 ) { - vout_fx[i - 1] = negate(quant_fx[position][i]); + vout_fx[i - 1] = negate( quant_fx[position][i] ); move16(); } position = path_fx[position][i]; @@ -1738,7 +1738,7 @@ Word32 encode_position_ari_fx( btcq_fx = GetBitsFromPulses_fx( pulses, size ); /* Estimate TCQ bits */ bits_fx = L_sub( table_logcum_fx[size + 1], L_add( table_logcum_fx[nz + 1], table_logcum_fx[add( sub( size, nz ), 1 )] ) ); - bits_fx = L_add( bits_fx, L_sub( btcq_fx, L_sub( table_logcum_fx[size + 1], L_add( table_logcum_fx[nz + 1], table_logcum_fx[add(sub( size, nz ) , 1)] ) ) ) ); + bits_fx = L_add( bits_fx, L_sub( btcq_fx, L_sub( table_logcum_fx[size + 1], L_add( table_logcum_fx[nz + 1], table_logcum_fx[add( sub( size, nz ), 1 )] ) ) ) ); bits_fx = L_sub( bits_fx, L_sub( table_logcum_fx[pulses], L_add( table_logcum_fx[nz], table_logcum_fx[add( pulses, sub( nz, 1 ) )] ) ) ); bits_fx = L_sub( bits_fx, nz ); *est_bits_frame_fx = L_add( *est_bits_frame_fx, bits_fx ); @@ -2216,7 +2216,7 @@ void decode_position_ari_fx( test(); test(); - IF( ( mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] == 0 && scp > 0 ) || EQ_16( mode_num_nz[sub( sub( i, storepos ), stpos )] , mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] ) ) + IF( ( mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] == 0 && scp > 0 ) || EQ_16( mode_num_nz[sub( sub( i, storepos ), stpos )], mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] ) ) { mode_num_nz[sub( sub( add( i, 1 ), storepos ), stpos )] = 0; move16(); @@ -2404,7 +2404,7 @@ void decode_magnitude_usq_fx( } magnp = sub( magnp, out[magncout] ); magnzp = sub( magnzp, 1 ); - magncout = add(magncout, 1 ); + magncout = add( magncout, 1 ); IF( magnzp == 0 ) /* last magnitude generation */ { @@ -2527,7 +2527,7 @@ void decode_mangitude_tcq_fx( exp1 = sub( norm_s( num ), 1 ); exp2 = norm_s( denum ); prob1_fx = div_s( shl( num, exp1 ), shl( denum, exp2 ) ); /*15 + exp1 - exp2 */ - exp = add(15 , sub(exp1 , exp2)); + exp = add( 15, sub( exp1, exp2 ) ); prob1_fx = shl( prob1_fx, sub( 15, exp ) ); prob0_fx = sub( MAX_16, prob1_fx ); } @@ -2657,7 +2657,7 @@ Word16 GetScale_fx( Word16 pulses = MAX_PULSES, p_est, exp, exp1, exp2, magicnum; move16(); Word32 t, a, b, ab, estbits_fx = 0; - move32(); + move32(); magicnum = 24773; move16(); /*Q17: 0.188992013101951f; */ diff --git a/lib_com/tcx_ltp_fx.c b/lib_com/tcx_ltp_fx.c index 59ab1d55e..9d18d4841 100644 --- a/lib_com/tcx_ltp_fx.c +++ b/lib_com/tcx_ltp_fx.c @@ -664,7 +664,7 @@ static void tcx_ltp_synth_filter32( L_tmp2 = Mpy_32_16_r( L_tmp2, alpha ); #ifdef BASOP_NOGLOB L_tmp2 = L_add_sat( synth[j], L_tmp2 ); - if( zir != NULL ) + if ( zir != NULL ) { L_tmp2 = L_sub_sat( L_tmp2, zir[j] ); } @@ -727,7 +727,7 @@ static void tcx_ltp_synth_filter_10( assert( GE_16( filtIdx, 0 ) ); w0 = &tcxLtpFilters[filtIdx].filt[pitch_fr]; - w1 = &tcxLtpFilters[filtIdx].filt[sub(pitch_res , pitch_fr)]; + w1 = &tcxLtpFilters[filtIdx].filt[sub( pitch_res, pitch_fr )]; v0 = &tcxLtpFilters[filtIdx].filt[0]; v1 = &tcxLtpFilters[filtIdx].filt[pitch_res]; L = tcxLtpFilters[filtIdx].length; @@ -796,7 +796,7 @@ static void tcx_ltp_synth_filter_10_fx( curr_gain = gain; move16(); - gain_step = idiv1616(negate( gain ) , length); // TODO + gain_step = idiv1616( negate( gain ), length ); // TODO for ( j = 0; j < length; j++ ) { @@ -860,8 +860,8 @@ static void tcx_ltp_synth_filter_01( curr_gain = 0; move16(); - //gain_step = gain / length; // TODO - gain_step = idiv1616(gain , length); // TODO + // gain_step = gain / length; // TODO + gain_step = idiv1616( gain, length ); // TODO for ( j = 0; j < length; j++ ) { @@ -926,8 +926,8 @@ static void tcx_ltp_synth_filter_01_fx( curr_gain = 0; move16(); - //gain_step = gain / length; // TODO - gain_step = idiv1616(gain , length); // TODO + // gain_step = gain / length; // TODO + gain_step = idiv1616( gain, length ); // TODO for ( j = 0; j < length; j++ ) { @@ -1026,8 +1026,8 @@ static void tcx_ltp_synth_filter_11_unequal_pitch( /* 1. decreasing gain filter. The first filter unit with the parameters associated to the previous interval and scaling towards 0 */ gain = prev_gain; move16(); - //gain_step = negate( prev_gain ) / length; // TODO - gain_step = idiv1616(negate( prev_gain ) , length); // TODO + // gain_step = negate( prev_gain ) / length; // TODO + gain_step = idiv1616( negate( prev_gain ), length ); // TODO for ( j = 0; j < length; j++ ) { @@ -1155,7 +1155,7 @@ static void tcx_ltp_synth_filter_11_unequal_pitch_fx( /* 1. decreasing gain filter. The first filter unit with the parameters associated to the previous interval and scaling towards 0 */ gain = prev_gain; move16(); - gain_step = idiv1616(negate( prev_gain ) , length); // TODOD + gain_step = idiv1616( negate( prev_gain ), length ); // TODOD for ( j = 0; j < length; j++ ) { @@ -1358,7 +1358,7 @@ void tcx_ltp_post( move16(); } - IF( core == ACELP_CORE ) + IF( core == ACELP_CORE ) { bfi = 0; move16(); @@ -1420,7 +1420,7 @@ void tcx_ltp_post( ELSE IF( bfi == 0 ) { /* LTP and good frame */ - test(); + test(); IF( EQ_16( st->element_mode, EVS_MONO ) ) /* hard tunings for EVS_MONO, HQ_48k is TCX only */ { IF( NE_16( output_frame, L_frame_core ) ) @@ -1579,20 +1579,20 @@ void tcx_ltp_post( test(); // #ifdef IVAS_CODE_TCX_LTP if ( st->element_mode != EVS_MONO ) - { - test(); - test(); - test(); - test(); - test(); - test(); - test(); - IF ( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev == 0 ) + { + test(); + test(); + test(); + test(); + test(); + test(); + test(); + IF( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev == 0 ) { /* The filtering is deactivated, just copy input to the output */ Copy( sig_in + delay, sig_out + delay, L_transition ); } - ELSE IF ( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev != 0 ) + ELSE IF( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev != 0 ) { /* Filtering with the first filter unit */ tcx_ltp_synth_filter_10( sig_out + delay, sig_in + delay, L_transition, hTcxLtpDec->tcxltp_pitch_int_post_prev, hTcxLtpDec->tcxltp_pitch_fr_post_prev, hTcxLtpDec->tcxltp_gain_post_prev, st->pit_res_max_past, hTcxLtpDec->tcxltp_filt_idx_prev ); @@ -1602,7 +1602,7 @@ void tcx_ltp_post( /* Filtering with the second filter unit */ tcx_ltp_synth_filter_01( sig_out + delay, sig_in + delay, L_transition, pitch_int, pitch_fr, gain, st->pit_res_max, filtIdx ); } - ELSE IF( EQ_16(gain ,hTcxLtpDec->tcxltp_gain_post_prev )&& EQ_16(pitch_int , hTcxLtpDec->tcxltp_pitch_int_post_prev) && EQ_16(pitch_fr, hTcxLtpDec->tcxltp_pitch_fr_post_prev )&& EQ_16(st->pit_res_max , st->pit_res_max_past )&& EQ_16(filtIdx , hTcxLtpDec->tcxltp_filt_idx_prev )) + ELSE IF( EQ_16( gain, hTcxLtpDec->tcxltp_gain_post_prev ) && EQ_16( pitch_int, hTcxLtpDec->tcxltp_pitch_int_post_prev ) && EQ_16( pitch_fr, hTcxLtpDec->tcxltp_pitch_fr_post_prev ) && EQ_16( st->pit_res_max, st->pit_res_max_past ) && EQ_16( filtIdx, hTcxLtpDec->tcxltp_filt_idx_prev ) ) { tcx_ltp_synth_filter( sig_out + delay, sig_in + delay, L_transition, pitch_int, pitch_fr, gain, st->pit_res_max, NULL, 0, filtIdx ); } @@ -1616,10 +1616,10 @@ void tcx_ltp_post( ELSE // #endif { - test(); - test(); - test(); - test(); + test(); + test(); + test(); + test(); IF( gain == 0 && hTcxLtpDec->tcxltp_gain_post_prev == 0 ) { Copy( sig_in + delay, sig_out + delay, L_transition ); diff --git a/lib_com/tcx_mdct_fx.c b/lib_com/tcx_mdct_fx.c index f2f93d9ec..474f8779b 100644 --- a/lib_com/tcx_mdct_fx.c +++ b/lib_com/tcx_mdct_fx.c @@ -125,7 +125,7 @@ void TCX_MDCT( FOR( i = 0; i < l / 2; i++ ) { #ifdef BASOP_NOGLOB - y[add( add( add( shr( m, 1 ), shr( r, 1 ) ), shr( m, 1 ) ), i )] = L_msu_o( L_mult( x[i], factor ), x[sub(sub(l , 1) , i)], factor, &Overflow ); + y[add( add( add( shr( m, 1 ), shr( r, 1 ) ), shr( m, 1 ) ), i )] = L_msu_o( L_mult( x[i], factor ), x[sub( sub( l, 1 ), i )], factor, &Overflow ); #else /* BASOP_NOGLOB */ y[m / 2 + r / 2 + m / 2 + i] = L_msu( L_mult( x[i], factor ), x[l - 1 - i], factor ); #endif /* BASOP_NOGLOB */ @@ -133,13 +133,13 @@ void TCX_MDCT( } FOR( i = 0; i < m / 2; i++ ) { - y[sub( sub( add( shr( m, 1 ), shr( r, 1 ) ), 1 ), i )] = L_mult( x[add(add(l , shr(m ,1)) , i)], neg_factor ); + y[sub( sub( add( shr( m, 1 ), shr( r, 1 ) ), 1 ), i )] = L_mult( x[add( add( l, shr( m, 1 ) ), i )], neg_factor ); move32(); } FOR( i = 0; i < r / 2; i++ ) { #ifdef BASOP_NOGLOB - y[sub( sub( sub( add( shr( m, 1 ), shr( r, 1 ) ), 1 ), shr( m, 1 ) ), i )] = L_mac_o( L_mult( x[add( add( l, m ), i )], neg_factor ), x[sub(sub(add(add(l , m) , r) , 1) , i)], neg_factor, &Overflow ); + y[sub( sub( sub( add( shr( m, 1 ), shr( r, 1 ) ), 1 ), shr( m, 1 ) ), i )] = L_mac_o( L_mult( x[add( add( l, m ), i )], neg_factor ), x[sub( sub( add( add( l, m ), r ), 1 ), i )], neg_factor, &Overflow ); #else /* BASOP_NOGLOB */ y[m / 2 + r / 2 - 1 - m / 2 - i] = L_mac( L_mult( x[l + m + i], neg_factor ), x[l + m + r - 1 - i], neg_factor ); #endif /* BASOP_NOGLOB */ @@ -188,7 +188,7 @@ void TCX_MDST( FOR( i = 0; i < l / 2; i++ ) { #ifdef BASOP_NOGLOB - y[add( add( add( shr(m ,1), shr(r ,1) ), shr(m ,1) ), i )] = L_msu_o( L_mult( x[i], neg_factor ), x[sub(sub(l , 1) , i)], factor, &Overflow ); + y[add( add( add( shr( m, 1 ), shr( r, 1 ) ), shr( m, 1 ) ), i )] = L_msu_o( L_mult( x[i], neg_factor ), x[sub( sub( l, 1 ), i )], factor, &Overflow ); #else /* BASOP_NOGLOB */ y[m / 2 + r / 2 + m / 2 + i] = L_msu( L_mult( x[i], neg_factor ), x[l - 1 - i], factor ); #endif @@ -250,7 +250,7 @@ void TCX_MDCT_Inverse( FOR( i = 0; i < R2; i++ ) { #ifdef BASOP_NOGLOB - y[add(add(add(l , m) , R2) , i)] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[add(L2 , i)], negfac ), s ) ); /* fold out right end of DCT */ + y[add( add( add( l, m ), R2 ), i )] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[add( L2, i )], negfac ), s ) ); /* fold out right end of DCT */ #else y[l + m + R2 + i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[L2 + i], negfac ), s ) ); /* fold out right end of DCT */ #endif @@ -261,7 +261,7 @@ void TCX_MDCT_Inverse( FOR( i = 0; i < L2; i++ ) { #ifdef BASOP_NOGLOB - y[i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[add(add(add(L2 , m) , R2) , i)], fac ), s ) ); /* negate, fold out left end of DCT */ + y[i] = round_fx_sat( L_shl_sat( Mpy_32_16_1( tmp_buf[add( add( add( L2, m ), R2 ), i )], fac ), s ) ); /* negate, fold out left end of DCT */ #else y[i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[L2 + m + R2 + i], fac ), s ) ); /* negate, fold out left end of DCT */ #endif @@ -319,7 +319,7 @@ void TCX_MDST_Inverse_fx( FOR( i = 0; i < R2; i++ ) { - y[add(add(add(l , m) , R2) , i)] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add(L2 , i)], fac ), s ) ); /* fold out right end of DCT */ + y[add( add( add( l, m ), R2 ), i )] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( L2, i )], fac ), s ) ); /* fold out right end of DCT */ move16(); } @@ -334,7 +334,7 @@ void TCX_MDST_Inverse_fx( Word16 f; f = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( L2, i )], fac ), s ) ); - y[add(L2 , i)] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[sub( sub( add( add( l, m ), R2 ), 1 ), i )], negfac ), s ) ); /* time-reverse mid of DCT */ + y[add( L2, i )] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[sub( sub( add( add( l, m ), R2 ), 1 ), i )], negfac ), s ) ); /* time-reverse mid of DCT */ move16(); y[sub( sub( add( add( l, m ), R2 ), 1 ), i )] = negate( f ); @@ -366,7 +366,7 @@ void TCX_MDXT_Inverse_fx( set32_fx( tmp_buf, 0, N_MAX + L_MDCT_OVLP_MAX / 2 ); - edxt_fx( x, tmp_buf + L2, add(add(L2 , m) , R2), kernel_type, TRUE ); + edxt_fx( x, tmp_buf + L2, add( add( L2, m ), R2 ), kernel_type, TRUE ); fac = TCX_MDCT_Inverse_GetScaleFactor( add( add( shr( l, 1 ), m ), shr( r, 1 ) ), &fac_e ); x_e = add( x_e, fac_e ); @@ -380,8 +380,8 @@ void TCX_MDXT_Inverse_fx( { signLeft = fac; } - //signRight = ( kernel_type & 1 ? fac : negfac ); - IF ( L_and( kernel_type, 1 ) ) + // signRight = ( kernel_type & 1 ? fac : negfac ); + IF( L_and( kernel_type, 1 ) ) { signRight = fac; } @@ -395,24 +395,24 @@ void TCX_MDXT_Inverse_fx( FOR( i = 0; i < L2; i++ ) { - y[i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add(add(add(L2 , m) , R2) , i)], signLeft ), s ) ); /* fold out the left end */ + y[i] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( add( add( L2, m ), R2 ), i )], signLeft ), s ) ); /* fold out the left end */ } FOR( i = 0; i < R2; i++ ) { - y[add(add(add(l , m) , R2) , i)] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add(L2 , i)], signRight ), s ) ); /* ...and right end */ + y[add( add( add( l, m ), R2 ), i )] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( L2, i )], signRight ), s ) ); /* ...and right end */ move16(); } - FOR( i = 0; i < ( ( add(add(L2 , m) , R2) ) >> 1 ); i++ ) + FOR( i = 0; i < ( ( add( add( L2, m ), R2 ) ) >> 1 ); i++ ) { - f = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add(L2 , i)], negfac ), s ) ); + f = round_fx( L_shl( Mpy_32_16_1( tmp_buf[add( L2, i )], negfac ), s ) ); - y[add(L2 , i)] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[sub(sub(add(add(l , m) , R2) , 1) , i)], negfac ), s ) ); /* time-reverse mid of DCT */ + y[add( L2, i )] = round_fx( L_shl( Mpy_32_16_1( tmp_buf[sub( sub( add( add( l, m ), R2 ), 1 ), i )], negfac ), s ) ); /* time-reverse mid of DCT */ move16(); - y[sub(sub(add(add(l , m) , R2) , 1) , i)] = f; + y[sub( sub( add( add( l, m ), R2 ), 1 ), i )] = f; move16(); } diff --git a/lib_com/tcx_mdct_window.c b/lib_com/tcx_mdct_window.c index de929cff7..65fb6a1a0 100644 --- a/lib_com/tcx_mdct_window.c +++ b/lib_com/tcx_mdct_window.c @@ -115,11 +115,11 @@ void mdct_window_sine_IVAS_updated( const Word16 window_type, const Word16 element_mode ) { - IF (EQ_16( element_mode , EVS_MONO )) + IF( EQ_16( element_mode, EVS_MONO ) ) { const PWord16 *table; table = getSineWindowTable( n ); - FOR ( Word32 i = 0; i < shr( n, 1 ); i++ ) + FOR( Word32 i = 0; i < shr( n, 1 ); i++ ) { window[i].v.re = table[i].v.re; move16(); @@ -134,8 +134,8 @@ void mdct_window_sine_IVAS_updated( Word16 buf_in_size = 0; move16(); Word16 temp[420]; - set16_fx(temp, 0, 420); - SWITCH ( window_type ) + set16_fx( temp, 0, 420 ); + SWITCH( window_type ) { case FULL_OVERLAP: window_table = tcx_mdct_window_48_fx; @@ -158,7 +158,7 @@ void mdct_window_sine_IVAS_updated( BREAK; } - IF( EQ_32( Fs , 48000 )) + IF( EQ_32( Fs, 48000 ) ) { Copy( window_table, temp, n ); } @@ -167,7 +167,7 @@ void mdct_window_sine_IVAS_updated( lerp( window_table, temp, n, buf_in_size ); } - FOR ( Word32 i = 0; i < shr(n, 1); i++ ) + FOR( Word32 i = 0; i < shr( n, 1 ); i++ ) { window[i].v.re = temp[n - 1 - i]; move16(); @@ -186,7 +186,7 @@ void mdct_window_sine( PWord16 *window, Word16 n ) { const PWord16 *table; table = getSineWindowTable( n ); - FOR ( Word32 i = 0; i < shr(n, 1); i++ ) + FOR( Word32 i = 0; i < shr( n, 1 ); i++ ) { window[i].v.re = table[i].v.re; move16(); diff --git a/lib_com/tcx_utils_fx.c b/lib_com/tcx_utils_fx.c index ed8ea7013..e7987d0ce 100644 --- a/lib_com/tcx_utils_fx.c +++ b/lib_com/tcx_utils_fx.c @@ -888,7 +888,7 @@ void lpc2mdct_2( BASOP_cfft_ivas( RealData_fx, ImagData_fx, 1, &scale ); /*Get amplitude*/ - j = sub(FDNS_NPTS , 1); + j = sub( FDNS_NPTS, 1 ); move16(); k = 0; move16(); @@ -1972,7 +1972,7 @@ void tcx_noise_filling_with_shift( } Q[i] = L_shl( Q[i], nrm ); move32(); - new_Q_e[i] = sub(31 , nrm); + new_Q_e[i] = sub( 31, nrm ); tmp1 = shr( seed, 4 ); nrg = L_mac0( nrg, tmp1, tmp1 ); /* sum up energy of current noise segment */ diff --git a/lib_com/tec_com.c b/lib_com/tec_com.c index 380fc0c09..32c6e9fef 100644 --- a/lib_com/tec_com.c +++ b/lib_com/tec_com.c @@ -654,7 +654,7 @@ void calcGainTemp_TBE_Fx( startPos, stopPos, bandOffset, - sub(15 , cldfb_exp) ); + sub( 15, cldfb_exp ) ); IF( code > 0 ) { @@ -1030,7 +1030,7 @@ static Word16 procTec_Fx( s = norm_s( hb_synth_Fx[k] ); hb_synth_Fx[k] = mult_r( gain_m[i], shl( hb_synth_Fx[k], s ) ); move16(); - shift[k] = sub(s , gain_e[i]); + shift[k] = sub( s, gain_e[i] ); if ( GT_16( min_shift, shift[k] ) ) { diff --git a/lib_com/trans_direct_fx.c b/lib_com/trans_direct_fx.c index 5752de723..82e2c981c 100644 --- a/lib_com/trans_direct_fx.c +++ b/lib_com/trans_direct_fx.c @@ -2,10 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common FX constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common FX constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Function prototypes */ +#include "rom_com.h" /* Function prototypes */ /*------------------------------------------------------------------- * direct_transform() diff --git a/lib_com/trans_inv_fx.c b/lib_com/trans_inv_fx.c index 5f712b1b5..f79443862 100644 --- a/lib_com/trans_inv_fx.c +++ b/lib_com/trans_inv_fx.c @@ -2,9 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Function prototypes */ +#include "rom_com.h" /* Function prototypes */ #include "rom_dec.h" diff --git a/lib_com/weight_fx.c b/lib_com/weight_fx.c index 2d9999736..6c123cbf2 100644 --- a/lib_com/weight_fx.c +++ b/lib_com/weight_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_com/window_ola_fx.c b/lib_com/window_ola_fx.c index 20051c051..40c31f8fd 100644 --- a/lib_com/window_ola_fx.c +++ b/lib_com/window_ola_fx.c @@ -2,9 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Function prototypes */ +#include "rom_com.h" /* Function prototypes */ #include "stl.h" void sinq_fx( diff --git a/lib_com/wtda_fx.c b/lib_com/wtda_fx.c index f6a2c5acd..b20771f8c 100644 --- a/lib_com/wtda_fx.c +++ b/lib_com/wtda_fx.c @@ -2,9 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* required by wmc_tool */ #include "stat_com.h" /*--------------------------------------------------------------------------* diff --git a/lib_dec/FEC_HQ_core.c b/lib_dec/FEC_HQ_core.c index 68f7d72de..5dd3351aa 100644 --- a/lib_dec/FEC_HQ_core.c +++ b/lib_dec/FEC_HQ_core.c @@ -1557,7 +1557,7 @@ void save_synthesis_hq_fec_fx( move16(); BREAK; case IVAS_CPE_DFT: - IF( EQ_16(hCPE->nchan_out , 1) && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) + IF( EQ_16( hCPE->nchan_out, 1 ) && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) { post_hq_delay = NS2SA( st->output_Fs, DELAY_CLDFB_NS ); move16(); @@ -1581,10 +1581,10 @@ void save_synthesis_hq_fec_fx( test(); IF( ( EQ_16( st->codec_mode, MODE1 ) && st->hTcxDec != NULL ) && ( ( EQ_16( st->core, ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) ) || EQ_16( st->core, HQ_CORE ) ) ) { - Copy( st->hTcxDec->synth_history_fx + output_frame, st->hTcxDec->synth_history_fx, add(sub(output_frame , post_hq_delay) , NS2SA( st->output_Fs, PH_ECU_MEM_NS )) ); + Copy( st->hTcxDec->synth_history_fx + output_frame, st->hTcxDec->synth_history_fx, add( sub( output_frame, post_hq_delay ), NS2SA( st->output_Fs, PH_ECU_MEM_NS ) ) ); FOR( Word16 i = 0; i < output_frame; i++ ) { - st->hTcxDec->old_synthFB_fx[sub(add(i , output_frame) , post_hq_delay)] = extract_h( output_fx[i] ); + st->hTcxDec->old_synthFB_fx[sub( add( i, output_frame ), post_hq_delay )] = extract_h( output_fx[i] ); move16(); } @@ -1593,27 +1593,27 @@ void save_synthesis_hq_fec_fx( /* reset the remaining buffer, which is read in TCX concealment the necessary samples to fill this buffer are not available for all cases, the impact on the output is limited */ - set16_fx( st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , post_hq_delay), 0, post_hq_delay ); + set16_fx( st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), 0, post_hq_delay ); IF( GE_16( output_frame, L_FRAME16k ) ) { - Copy( st->prev_synth_buffer_fx, st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS )), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ); + Copy( st->prev_synth_buffer_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ); } ELSE { - Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl(output_frame, 1), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); + Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); } IF( st->core != ACELP_CORE ) { IF( GE_16( output_frame, L_FRAME16k ) ) { - Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , NS2SA( st->output_Fs, DELAY_CLDFB_NS )), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ); - Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl(output_frame, 1), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); + Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ); + Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); } ELSE { - Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS )), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ); - Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS )), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); + Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA( st->output_Fs, DELAY_CLDFB_NS ) ); + Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); } } } @@ -1621,8 +1621,8 @@ void save_synthesis_hq_fec_fx( { IF( st->core != ACELP_CORE ) { - Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub(shl(output_frame, 1) , post_hq_delay), post_hq_delay ); - Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl(output_frame, 1), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); + Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), post_hq_delay ); + Copy( st->hHQ_core->old_out_fx + NS2SA( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) ); } } } diff --git a/lib_dec/FEC_HQ_core_fx.c b/lib_dec/FEC_HQ_core_fx.c index 9c9991330..3a5b71cff 100644 --- a/lib_dec/FEC_HQ_core_fx.c +++ b/lib_dec/FEC_HQ_core_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/FEC_HQ_phase_ecu_fx.c b/lib_dec/FEC_HQ_phase_ecu_fx.c index 921f4e09f..972e7f4f8 100644 --- a/lib_dec/FEC_HQ_phase_ecu_fx.c +++ b/lib_dec/FEC_HQ_phase_ecu_fx.c @@ -609,9 +609,9 @@ static void trans_ana_fx( #endif att_val = 32767; move16(); - IF ( *pGrPowRight > 0 ) + IF( *pGrPowRight > 0 ) { - IF ( LT_32( *pGrPowRight, *pGrPowLeft ) ) /* i.e., (gr_pow_right/gr_pow_left) < 1.0 */ + IF( LT_32( *pGrPowRight, *pGrPowLeft ) ) /* i.e., (gr_pow_right/gr_pow_left) < 1.0 */ { /* Compute sqrt(grp_pow_chg), where grp_pow_chg = gr_pow_right/gr_pow_left. */ tmp16 = ratio( *pGrPowRight, *pGrPowLeft, &expo ); /* tmp16 in Q14 */ @@ -665,7 +665,7 @@ static void trans_ana_fx( mag_chg[k] = mult_r( mag_chg_1st[k], att_val ); /* Q15 */ move16(); - IF ( GT_16( burst_len, BETA_MUTE_THR ) ) + IF( GT_16( burst_len, BETA_MUTE_THR ) ) { *beta_mute = shr( *beta_mute, 1 ); move16(); @@ -752,7 +752,7 @@ static void ivas_peakfinder_fx( pDx0 = pDx01 + 1; len = 0; move16(); - IF ( endpoints ) + IF( endpoints ) { *pX++ = *pX0++; move16(); @@ -768,7 +768,7 @@ static void ivas_peakfinder_fx( FOR( i = 0; i < len0Minus2; i++ ) { - IF ( s_xor( *pDx01++, *pDx0++ ) < 0 ) /* Detect sign change. */ + IF( s_xor( *pDx01++, *pDx0++ ) < 0 ) /* Detect sign change. */ { *pInd++ = add( i, 1 ); move16(); @@ -778,7 +778,7 @@ static void ivas_peakfinder_fx( } pX0++; } - IF ( endpoints ) + IF( endpoints ) { *pInd = len0Minus1; move16(); @@ -802,7 +802,7 @@ static void ivas_peakfinder_fx( move16(); threshold = add( leftMin, sel ); - IF ( len > 0 ) + IF( len > 0 ) { /* Deal with first point a little differently since tacked it on Calculate the sign of the derivative since we took the first point @@ -820,7 +820,7 @@ static void ivas_peakfinder_fx( { ii = -1; move16(); - IF ( GE_16( xAt1, xAt2 ) ) /* x[1] is not extremum -> overwrite with x[0] */ + IF( GE_16( xAt1, xAt2 ) ) /* x[1] is not extremum -> overwrite with x[0] */ { *pX = xAt0; /* x[1] = x[0] */ move16(); @@ -854,7 +854,7 @@ static void ivas_peakfinder_fx( // PMTE () ii = -1; /* First point is a peak */ move16(); - IF ( GE_16( len, 2 ) ) + IF( GE_16( len, 2 ) ) { if ( GE_16( x[1], x[0] ) ) { @@ -872,14 +872,14 @@ static void ivas_peakfinder_fx( ii = add( ii, 1 ); /* This is a peak */ /* Make sure we don't iterate past the length of our vector */ - IF ( GE_16( ii, lenMinus1 ) ) + IF( GE_16( ii, lenMinus1 ) ) { BREAK; } /*Reset peak finding if we had a peak and the next peak is bigger than the last or the left min was small enough to reset.*/ - IF ( foundPeak > 0 ) + IF( foundPeak > 0 ) { tempMag = minMag; move16(); @@ -889,9 +889,9 @@ static void ivas_peakfinder_fx( /* Found new peak that was larger than temp mag and selectivity larger than the minimum to its left. */ - IF ( GT_16( *( ++pX ), tempMag ) ) + IF( GT_16( *( ++pX ), tempMag ) ) { - IF ( GT_16( *pX, threshold ) ) /* threshold = leftMin + sel */ + IF( GT_16( *pX, threshold ) ) /* threshold = leftMin + sel */ { tempLoc = ii; move16(); @@ -904,9 +904,9 @@ static void ivas_peakfinder_fx( pX++; /* Come down at least sel from peak */ - IF ( foundPeak == 0 ) + IF( foundPeak == 0 ) { - IF ( GT_16( tempMag, add( sel, *pX ) ) ) + IF( GT_16( tempMag, add( sel, *pX ) ) ) { foundPeak = 1; /* We have found a peak */ move16(); @@ -921,9 +921,9 @@ static void ivas_peakfinder_fx( move16(); } } - IF ( foundPeak == 0 ) /* The above IF-block has not found the peak yet. */ + IF( foundPeak == 0 ) /* The above IF-block has not found the peak yet. */ { - IF ( LT_16( *pX, leftMin ) ) /* New left minimum */ + IF( LT_16( *pX, leftMin ) ) /* New left minimum */ { leftMin = *pX; move16(); @@ -933,9 +933,9 @@ static void ivas_peakfinder_fx( } /* Check end point */ - IF ( GT_16( x[lenMinus1], tempMag ) ) + IF( GT_16( x[lenMinus1], tempMag ) ) { - IF ( GT_16( x[lenMinus1], threshold ) ) /* threshold = leftMin + sel */ + IF( GT_16( x[lenMinus1], threshold ) ) /* threshold = leftMin + sel */ { peakLoc[*cInd] = lenMinus1; move16(); @@ -947,9 +947,9 @@ static void ivas_peakfinder_fx( move16(); } } - IF ( foundPeak == 0 ) /* Check if we still need to add the last point */ + IF( foundPeak == 0 ) /* Check if we still need to add the last point */ { - IF ( GT_16( tempMag, minMag ) ) + IF( GT_16( tempMag, minMag ) ) { peakLoc[*cInd] = tempLoc; move16(); @@ -1068,7 +1068,7 @@ static void peakfinder_fx( FOR( i = 0; i < len0Minus2; i++ ) { - IF ( s_xor( *pDx01++, *pDx0++ ) < 0 ) /* Detect sign change. */ + IF( s_xor( *pDx01++, *pDx0++ ) < 0 ) /* Detect sign change. */ { *pInd++ = add( i, 1 ); move16(); @@ -1187,7 +1187,7 @@ static void peakfinder_fx( /*Reset peak finding if we had a peak and the next peak is bigger than the last or the left min was small enough to reset.*/ - IF ( foundPeak > 0 ) + IF( foundPeak > 0 ) { tempMag = minMag; move16(); @@ -1197,9 +1197,9 @@ static void peakfinder_fx( /* Found new peak that was larger than temp mag and selectivity larger than the minimum to its left. */ - IF ( GT_16( *( ++pX ), tempMag ) ) + IF( GT_16( *( ++pX ), tempMag ) ) { - IF ( GT_16( *pX, threshold ) ) /* threshold = leftMin + sel */ + IF( GT_16( *pX, threshold ) ) /* threshold = leftMin + sel */ { tempLoc = ii; move16(); @@ -1212,9 +1212,9 @@ static void peakfinder_fx( pX++; /* Come down at least sel from peak */ - IF ( foundPeak == 0 ) + IF( foundPeak == 0 ) { - IF ( GT_16( tempMag, add( sel, *pX ) ) ) + IF( GT_16( tempMag, add( sel, *pX ) ) ) { foundPeak = 1; /* We have found a peak */ move16(); @@ -1229,9 +1229,9 @@ static void peakfinder_fx( move16(); } } - IF ( foundPeak == 0 ) /* The above IF-block has not found the peak yet. */ + IF( foundPeak == 0 ) /* The above IF-block has not found the peak yet. */ { - IF ( LT_16( *pX, leftMin ) ) /* New left minimum */ + IF( LT_16( *pX, leftMin ) ) /* New left minimum */ { leftMin = *pX; move16(); @@ -1241,9 +1241,9 @@ static void peakfinder_fx( } /* Check end point */ - IF ( GT_16( x[lenMinus1], tempMag ) ) + IF( GT_16( x[lenMinus1], tempMag ) ) { - IF ( GT_16( x[lenMinus1], threshold ) ) /* threshold = leftMin + sel */ + IF( GT_16( x[lenMinus1], threshold ) ) /* threshold = leftMin + sel */ { peakLoc[*cInd] = lenMinus1; move16(); @@ -1254,9 +1254,9 @@ static void peakfinder_fx( move16(); } } - IF ( foundPeak == 0 ) /* Check if we still need to add the last point */ + IF( foundPeak == 0 ) /* Check if we still need to add the last point */ { - IF ( GT_16( tempMag, minMag ) ) + IF( GT_16( tempMag, minMag ) ) { peakLoc[*cInd] = tempLoc; move16(); @@ -1353,11 +1353,11 @@ static Word16 imax_fx( /* o: The location, relative to the sign = L_xor( y3_y1, denom ); /* Preserve the sign since div_s() only takes positive arguments. */ numer = L_abs( y3_y1 ); denom = L_abs( denom ); - IF ( numer == 0 ) + IF( numer == 0 ) { return 0; } - IF ( denom == 0 ) + IF( denom == 0 ) { return 0; } @@ -1376,7 +1376,7 @@ static Word16 imax_fx( /* o: The location, relative to the /* For both edges (left and right), the extremum found above may be minimum. * It needs to reject the minimum. */ - IF ( special != 0 ) /* Either edge specical case. */ + IF( special != 0 ) /* Either edge specical case. */ { edge = 0x7fff; /* 1 in Q15 for the right edge special case */ move16(); @@ -1520,7 +1520,7 @@ static void ivas_spec_ana_fx( // PMTE() window_corr = w_hamm[0]; move16(); - window_corr_step = idiv1616(w_hamm[0] , hamm_len2); + window_corr_step = idiv1616( w_hamm[0], hamm_len2 ); FOR( i = 0; i < hamm_len2; i++ ) { xfp[i] = mult_r( shl( prevsynth[i], *Q ), sub( w_hamm[i], window_corr ) ); @@ -1545,12 +1545,12 @@ static void ivas_spec_ana_fx( // PMTE() window_corr = w_hamm[0]; move16(); - window_corr_step = idiv1616(w_hamm[0] , hamm_len2); + window_corr_step = idiv1616( w_hamm[0], hamm_len2 ); FOR( i = 0; i < hamm_len2; i++ ) { xfp[i] = mult_r( shl( prevsynth[i], *Q ), sub( w_hamm[i], window_corr ) ); move16(); - xfp[sub(sub(Lprot , i) , 1)] = mult_r( shl( prevsynth[sub(sub(Lprot , i) , 1)], *Q ), sub( w_hamm[i], window_corr ) ); + xfp[sub( sub( Lprot, i ), 1 )] = mult_r( shl( prevsynth[sub( sub( Lprot, i ), 1 )], *Q ), sub( w_hamm[i], window_corr ) ); move16(); window_corr = sub( window_corr, window_corr_step ); } @@ -1595,8 +1595,8 @@ static void ivas_spec_ana_fx( expo = norm_l( *pMagSq ); /* exponent */ man = extract_h( L_shl( *pMagSq++, expo ) ); /* mantissa */ man = sqrt2ndOrder( man ); - expoBy2 = shr( expo, 1 ); /* Divided by 2-- square root operation. */ - IF ( s_and( expo, 1 ) == 0 ) /* Check even or odd. */ + expoBy2 = shr( expo, 1 ); /* Divided by 2-- square root operation. */ + IF( s_and( expo, 1 ) == 0 ) /* Check even or odd. */ { man = mult_r( man, FEC_HQ_ECU_ROOT2 ); /* FEC_HQ_ECU_ROOT2 is sqrt(2) in Q14 */ expoBy2 = sub( expoBy2, 1 ); @@ -1635,7 +1635,7 @@ static void ivas_spec_ana_fx( pPlocs = plocs; n = sub( *num_plocs, 1 ); /* -1 so as to exclude the very last peak. */ /* Special case-- The very 1st peak if it is at 0 index position */ - IF ( *pPlocs == 0 ) /* Only the very 1st peak is possible the peak at 0 index position. */ + IF( *pPlocs == 0 ) /* Only the very 1st peak is possible the peak at 0 index position. */ { fraction = imax_fx( xfp, -1 ); /* -1 signifies special left edge case. */ acc = L_deposit_h( *pPlocs++ ); /* N.B., (*pPlocs) must be zero here. */ @@ -1653,7 +1653,7 @@ static void ivas_spec_ana_fx( *pPlocsi++ = L_mac( acc, fraction, 1 ); move32(); /* in Q16. Append the fractional part to the integral part. */ } - IF ( n >= 0 ) + IF( n >= 0 ) { /* Special case-- The very last peak */ pXfp = pXfp1 + *pPlocs; @@ -1717,7 +1717,7 @@ static void ivas_spec_ana_fx( endPlocs = sub( Lprot2_1, DELTA_CORR_F0_INT ); /* last *pPlocs position for Jacobsen */ /* precompute number of turns based on endpoint integer location and make into a proper for loop */ - IF ( n > 0 ) + IF( n > 0 ) { nJacob = n; move16(); @@ -1740,13 +1740,13 @@ static void ivas_spec_ana_fx( /* At this point there should at most two plocs left to process */ /* the position before fs/2 and fs/2 both use the same magnitude points */ - IF ( n > 0 ) + IF( n > 0 ) { /* [ . . . . . . . ] Lprot/2+1 positions */ /* | | | */ /* 0 (Lprot/2-2) (Lprot/2) */ - IF ( EQ_16( currPlocs, ( sub( Lprot2_1, DELTA_CORR_F0_INT ) ) ) ) /* Also 2nd last peak position uses fs/2 which makes jacobsen less suitable. */ + IF( EQ_16( currPlocs, ( sub( Lprot2_1, DELTA_CORR_F0_INT ) ) ) ) /* Also 2nd last peak position uses fs/2 which makes jacobsen less suitable. */ { fraction = imax_fx( &xfp[currPlocs - 1], 0 ); /* in Q15 */ acc = L_deposit_h( sub( currPlocs, 1 ) ); @@ -1760,7 +1760,7 @@ static void ivas_spec_ana_fx( /* Here the only remaining point would be a fs/2 plocs */ /* pXfp = xfp + sub(Lprot2,1); already set just a reminder where it * whould point */ - IF ( n > 0 ) /* fs/2 which makes special case . */ + IF( n > 0 ) /* fs/2 which makes special case . */ { fraction = imax_fx( &xfp[currPlocs - 2], 0 ); /* in Q15 */ acc = L_deposit_h( sub( currPlocs, 2 ) ); @@ -1783,7 +1783,7 @@ static void ivas_spec_ana_fx( { st_point = s_max( 0, sub( plocs[i], DELTA_CORR ) ); end_point = s_min( sub( Lprot2_1, 1 ), add( plocs[i], DELTA_CORR ) ); - set16_fx( &xfp[st_point], 0, extract_l(L_add( L_sub( end_point, st_point ), 1 )) ); + set16_fx( &xfp[st_point], 0, extract_l( L_add( L_sub( end_point, st_point ), 1 ) ) ); } noise = L_add( sum16_32_fx( xfp, Lprot2_1 ), 1 ); @@ -1933,7 +1933,7 @@ static void spec_ana_fx( } /* Apply zeroing of non-coded FFT spectrum */ - IF ( GT_16( output_frame, inner_frame_tbl[bwidth_fx] ) ) + IF( GT_16( output_frame, inner_frame_tbl[bwidth_fx] ) ) { stop_band_start = shl( 128, bwidth_fx ); stop_band_length = sub( Lprot, shl( stop_band_start, 1 ) ); @@ -1966,8 +1966,8 @@ static void spec_ana_fx( expo = norm_l( *pMagSq ); /* exponent */ man = extract_h( L_shl( *pMagSq++, expo ) ); /* mantissa */ man = sqrt2ndOrder( man ); - expoBy2 = shr( expo, 1 ); /* Divided by 2-- square root operation. */ - IF ( s_and( expo, 1 ) == 0 ) /* Check even or odd. */ + expoBy2 = shr( expo, 1 ); /* Divided by 2-- square root operation. */ + IF( s_and( expo, 1 ) == 0 ) /* Check even or odd. */ { man = mult_r( man, FEC_HQ_ECU_ROOT2 ); /* FEC_HQ_ECU_ROOT2 is sqrt(2) in Q14 */ expoBy2 = sub( expoBy2, 1 ); @@ -2020,7 +2020,7 @@ static void spec_ana_fx( pPlocs = plocs; n = sub( *num_plocs, 1 ); /* -1 so as to exclude the very last peak. */ /* Special case-- The very 1st peak if it is at 0 index position */ - IF ( *pPlocs == 0 ) /* Only the very 1st peak is possible the peak at 0 index position. */ + IF( *pPlocs == 0 ) /* Only the very 1st peak is possible the peak at 0 index position. */ { fraction = imax_fx( xfp, -1 ); /* -1 signifies special left edge case. */ acc = L_deposit_h( *pPlocs++ ); /* N.B., (*pPlocs) must be zero here. */ @@ -2038,7 +2038,7 @@ static void spec_ana_fx( *pPlocsi++ = L_mac( acc, fraction, 1 ); move32(); /* in Q16. Append the fractional part to the integral part. */ } - IF ( n >= 0 ) + IF( n >= 0 ) { /* Special case-- The very last peak */ pXfp = pXfp1 + *pPlocs; @@ -2265,7 +2265,7 @@ static void ivas_subst_spec_fx( } one_peak_flag_mask = 32767 /* 1.0f in Q15 */; /* all ones mask -> keep */ move16(); - IF ( element_mode != EVS_MONO ) + IF( element_mode != EVS_MONO ) { test(); if ( ( *num_plocs > 0 ) && ( sub( *num_plocs, 3 ) < 0 ) ) @@ -2273,7 +2273,7 @@ static void ivas_subst_spec_fx( one_peak_flag_mask = noise_fac; /* all zeroes mask -> zero */ move16(); } - IF ( *num_plocs == 0 ) + IF( *num_plocs == 0 ) { X[0] = 0; /* reset DC if there are no peaks */ move16(); @@ -2310,7 +2310,7 @@ static void ivas_subst_spec_fx( move16(); pkLocation1 = *pPlocs++; /* plocs[m + 1] */ move16(); - IF ( m > 0 ) + IF( m > 0 ) { delta_tmp = shr( sub( sub( pkLocation, pkLocation_1 ), 1 ), 1 ); if ( LT_16( delta_tmp, DELTA_CORR ) ) @@ -2320,7 +2320,7 @@ static void ivas_subst_spec_fx( } } - IF ( LT_16( m, lastPeak ) ) + IF( LT_16( m, lastPeak ) ) { delta_tmp = shr( sub( sub( pkLocation1, pkLocation ), 1 ), 1 ); if ( LT_16( delta_tmp, DELTA_CORR ) ) @@ -2419,7 +2419,7 @@ static void ivas_subst_spec_fx( { mag_chg_local = mag_chg[k]; move16(); - IF ( ph_dith != 0 ) + IF( ph_dith != 0 ) { Xph = *pCorrPhase; /* in Q16. 2*PI is not included. */ move32(); @@ -2428,7 +2428,7 @@ static void ivas_subst_spec_fx( acc = L_shr( acc, PHASE_DITH_SCALE_SHIFT ); Xph = L_add( Xph, acc ); /* in Q16. */ - IF ( ph_dith > 0 ) /* up to 6 dB additional att of peaks in non_transient longer bursts, (when peak phase is randomized ) */ + IF( ph_dith > 0 ) /* up to 6 dB additional att of peaks in non_transient longer bursts, (when peak phase is randomized ) */ { /* mag_chg_local *= 0.5 + (1.0 - ph_dith[i])/2 where 0.5~= sqrt((float)pow(10.0,-6/10.0)) and ph_dith=0..1.0--> scale=1.0 ...5 */ mag_chg_local = mult_r( mag_chg_local, sub( 32767, shr( ph_dith, 1 ) ) ); @@ -2484,7 +2484,7 @@ static void ivas_subst_spec_fx( expo = shr( expo, 1 ); beta_local = mult_r( beta_mute, round_fx( L_shl( acc, sub( 31, expo ) ) ) ); - IF ( GE_16( k, LGW32K - 1 ) ) + IF( GE_16( k, LGW32K - 1 ) ) { beta_local = mult_r( beta_local, 3277 ); /* 0.1 in Q15 */ } @@ -2712,7 +2712,7 @@ static void subst_spec_fx( move16(); pkLocation1 = *pPlocs++; /* plocs[m + 1] */ move16(); - IF ( m > 0 ) + IF( m > 0 ) { delta_tmp = shr( sub( sub( pkLocation, pkLocation_1 ), 1 ), 1 ); if ( LT_16( delta_tmp, DELTA_CORR ) ) @@ -2722,7 +2722,7 @@ static void subst_spec_fx( } } - IF ( LT_16( m, lastPeak ) ) + IF( LT_16( m, lastPeak ) ) { delta_tmp = shr( sub( sub( pkLocation1, pkLocation ), 1 ), 1 ); if ( LT_16( delta_tmp, DELTA_CORR ) ) @@ -2826,7 +2826,7 @@ static void subst_spec_fx( { mag_chg_local = mag_chg[k]; move16(); - IF ( ph_dith != 0 ) + IF( ph_dith != 0 ) { Xph = *pCorrPhase; /* in Q16. 2*PI is not included. */ move32(); @@ -2835,7 +2835,7 @@ static void subst_spec_fx( acc = L_shr( acc, PHASE_DITH_SCALE_SHIFT ); Xph = L_add( Xph, acc ); /* in Q16. */ - IF ( ph_dith > 0 ) /* up to 6 dB additional att of peaks in non_transient longer bursts, (when peak phase is randomized ) */ + IF( ph_dith > 0 ) /* up to 6 dB additional att of peaks in non_transient longer bursts, (when peak phase is randomized ) */ { /* mag_chg_local *= 0.5 + (1.0 - ph_dith[i])/2 where 0.5~= sqrt((float)pow(10.0,-6/10.0)) and ph_dith=0..1.0--> scale=1.0 ...5 */ mag_chg_local = mult_r( mag_chg_local, sub( 32767, shr( ph_dith, 1 ) ) ); @@ -3018,7 +3018,7 @@ static void ivas_rec_wtda_fx( Word16 copy_len; Word16 ola_len; - copy_len = NS2SA( output_frame * FRAMES_PER_SEC, ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* prototype fill on each side of xsubst to fill MDCT Frame */ + copy_len = NS2SA( output_frame * FRAMES_PER_SEC, ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* prototype fill on each side of xsubst to fill MDCT Frame */ move16(); ola_len = NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS - ( 2 * FRAME_SIZE_NS - L_PROT_NS ) / 2 ); /* remaining lengt of LA_ZEROS to overlap add decoded with xsubst */ move16(); @@ -3076,22 +3076,22 @@ static void ivas_rec_wtda_fx( } /* extract reconstructed frame with aldo window */ - timesh = sub(NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) , shr(sub( shl(output_frame, 1) , Lprot ) , 1)); + timesh = sub( NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ), shr( sub( shl( output_frame, 1 ), Lprot ), 1 ) ); - set16_fx( xsubst_, 0, add(sub(shl(output_frame, 1) , Lprot) , timesh) ); - Copy( X, xsubst_ + add(sub(shl(output_frame, 1) , Lprot) , timesh), sub(Lprot , timesh) ); + set16_fx( xsubst_, 0, add( sub( shl( output_frame, 1 ), Lprot ), timesh ) ); + Copy( X, xsubst_ + add( sub( shl( output_frame, 1 ), Lprot ), timesh ), sub( Lprot, timesh ) ); /* Copy and OLA look ahead zero part of MDCT window from decoded signal */ IF( element_mode != EVS_MONO ) { Copy( old_dec, xsubst_ + NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ), copy_len ); /* also need to scale to Q0 ?? */ pOld = old_dec + copy_len; - pNew = xsubst_ + add(copy_len , NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS )); + pNew = xsubst_ + add( copy_len, NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) ); tmp = div_s( 1, shl( ola_len, 1 ) ); // Q15 tmp = round_fx( L_shl( L_mult( tmp, EVS_PI_FX ), 2 ) ); // Q15 sinq_fx( tmp, 0, ola_len, xfwin ); v_mult16_fixed( xfwin, xfwin, xfwin, ola_len ); /* xfwin = sin^2 of 0..pi/4 */ - pOldW = xfwin + sub(ola_len , 1); + pOldW = xfwin + sub( ola_len, 1 ); pNewW = xfwin; FOR( i = 0; i < ola_len; i++ ) { @@ -3106,7 +3106,7 @@ static void ivas_rec_wtda_fx( ELSE { /* Smoothen onset of ECU frame */ - p_ecu = xsubst_ + add( sub( shl(output_frame, 1), Lprot ), timesh ); + p_ecu = xsubst_ + add( sub( shl( output_frame, 1 ), Lprot ), timesh ); FOR( i = 0; i < xf_len; ( i++, p_ecu++ ) ) { idx = extract_l( L_shr( L_mult0( i, tbl_delta ), 12 ) ); @@ -3267,7 +3267,7 @@ static void rec_wtda_fx( set16_fx( xsubst_ + add( output_frame, Lprot2 ), 0, l ); /* Smoothen onset of ECU frame */ - p_ecu = xsubst_ + sub( output_frame , Lprot2 ); + p_ecu = xsubst_ + sub( output_frame, Lprot2 ); FOR( i = 0; i < xf_len; i++ ) { idx = extract_l( L_shr( L_mult0( i, tbl_delta ), 12 ) ); @@ -3417,7 +3417,7 @@ static Word32 mult_32_32_q( const Word32 a, const Word32 b, const Word16 q ) Mpy_32_32_ss( a, b, &hi, &lo ); #ifdef BASOP_NOGLOB - return L_or( L_shl_o( hi, sub(32 - 1 , q ), &Overflow ), L_lshr( lo, add(q , 1) ) ); + return L_or( L_shl_o( hi, sub( 32 - 1, q ), &Overflow ), L_lshr( lo, add( q, 1 ) ) ); #else return L_or( L_shl( hi, 32 - q - 1 ), L_lshr( lo, q + 1 ) ); #endif @@ -3450,7 +3450,7 @@ static void fir_dwn_fx( { s = L_deposit_l( 0 ); ptr_h = h + 1; - ptr_x = x + sub(i , 1); + ptr_x = x + sub( i, 1 ); FOR( j = 1; j <= i; j++ ) { @@ -3472,7 +3472,7 @@ static void fir_dwn_fx( { s = L_deposit_l( 0 ); ptr_h = h + 1; - ptr_x = x + sub(i , 1); + ptr_x = x + sub( i, 1 ); move16(); FOR( j = 1; j <= K; j++ ) @@ -3652,7 +3652,7 @@ static void fec_ecu_pitch_fx( } - IF( EQ_16(HqVoicing , 1) ) + IF( EQ_16( HqVoicing, 1 ) ) { cb_start = 0; move16(); @@ -3676,7 +3676,7 @@ static void fec_ecu_pitch_fx( { accA = 0; move16(); - IF( EQ_16(i , cb_start) ) + IF( EQ_16( i, cb_start ) ) { accB = 0; move16(); @@ -3716,9 +3716,9 @@ static void fec_ecu_pitch_fx( accCisqrt = Isqrt( accC ); /* Q31 - 3 + tmpQLP*/ - Ryytmp = mult_32_32_q( accA, accCisqrt, sub(16 + 3 , tmpQLP) ); /*Q 6 -2*tmpQLP + Q31 - 3 + tmpQLP -16 -3 +tmpQLP = Q15*/ - Ryytmp = mult_32_32_q( Ryytmp, accBisqrt, add(15 - 3 , tmpQLP) ); /*Q15 + Q31 - 3 + tmpQLP -15 + 3- tmpQLP = Q31*/ - Ryy = extract_h( Ryytmp ); /* Q15 */ + Ryytmp = mult_32_32_q( accA, accCisqrt, sub( 16 + 3, tmpQLP ) ); /*Q 6 -2*tmpQLP + Q31 - 3 + tmpQLP -16 -3 +tmpQLP = Q15*/ + Ryytmp = mult_32_32_q( Ryytmp, accBisqrt, add( 15 - 3, tmpQLP ) ); /*Q15 + Q31 - 3 + tmpQLP -15 + 3- tmpQLP = Q31*/ + Ryy = extract_h( Ryytmp ); /* Q15 */ IF( GT_16( Ryy, *min_corr_fx ) ) @@ -4027,7 +4027,7 @@ static void fec_ecu_dft_fx( IF( EQ_16( *Nfft, N ) ) { - Copy( &target[1], &Tfr16[1], sub(*Nfft , 2) ); + Copy( &target[1], &Tfr16[1], sub( *Nfft, 2 ) ); } ELSE { @@ -4549,7 +4549,7 @@ static void ivas_fec_noise_filling_fx( Copy( synthesis_fx, synthesis_fx + kk, sub( 2 * L, kk ) ); Copy( synthesis_fx + L, gapsynth_fx, L ); - Copy( prevsynth_fx + sub(alignment_point , kk), synthesis_fx, kk ); + Copy( prevsynth_fx + sub( alignment_point, kk ), synthesis_fx, kk ); } #endif @@ -4917,7 +4917,7 @@ static void ivas_hq_phase_ecu_fx( lprot = L_PROT32k; /* 1024 */ move16(); } - ELSE IF( EQ_16(output_frame , L_FRAME16k) ) + ELSE IF( EQ_16( output_frame, L_FRAME16k ) ) { lprot = 512; move16(); @@ -4969,16 +4969,16 @@ static void ivas_hq_phase_ecu_fx( /* seed for own_rand2 */ seed = *time_offs; move16(); - IF ( *num_p > 0 ) + IF( *num_p > 0 ) { - seed = add( seed, plocs[sub(*num_p , 1)] ); + seed = add( seed, plocs[sub( *num_p, 1 )] ); } ivas_subst_spec_fx( plocs, plocsi, num_p, *time_offs, X, mag_chg, ph_dith, old_is_transient, output_frame, &seed, alpha, beta, *beta_mute, Xavg, element_mode, ph_ecu_lookahead, noise_fac ); /* reconstructed frame in tda domain */ - old_dec = prevsynth + sub( shl(output_frame, 1), NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) ); + old_dec = prevsynth + sub( shl( output_frame, 1 ), NS2SA( output_frame * FRAMES_PER_SEC, N_ZERO_MDCT_NS ) ); ivas_rec_frame_fx( X, ecu_rec, output_frame, *Q_spec, old_dec, element_mode, num_p, plocs ); *last_fec = 0; @@ -5110,9 +5110,9 @@ static void hq_phase_ecu_fx( /* seed for own_rand2 */ seed = *time_offs; move16(); - IF ( *num_p > 0 ) + IF( *num_p > 0 ) { - seed = add( seed, plocs[sub(*num_p , 1)] ); + seed = add( seed, plocs[sub( *num_p, 1 )] ); } subst_spec_fx( plocs, plocsi, num_p, *time_offs, X, mag_chg, ph_dith, old_is_transient, output_frame, &seed, diff --git a/lib_dec/FEC_adapt_codebook_fx.c b/lib_dec/FEC_adapt_codebook_fx.c index cf159210b..71717bd41 100644 --- a/lib_dec/FEC_adapt_codebook_fx.c +++ b/lib_dec/FEC_adapt_codebook_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_dec.h" /* Decoder static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_dec.h" /* Decoder static table prototypes */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_dec/FEC_clas_estim_fx.c b/lib_dec/FEC_clas_estim_fx.c index 18cf6b5a8..0c668df55 100644 --- a/lib_dec/FEC_clas_estim_fx.c +++ b/lib_dec/FEC_clas_estim_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_dec/FEC_fx.c b/lib_dec/FEC_fx.c index 09efc3b5a..7353f8f83 100644 --- a/lib_dec/FEC_fx.c +++ b/lib_dec/FEC_fx.c @@ -3,10 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Common static table prototypes */ -#include "rom_dec.h" /* Decoder static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Common static table prototypes */ +#include "rom_dec.h" /* Decoder static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/FEC_lsf_estim_fx.c b/lib_dec/FEC_lsf_estim_fx.c index 36c0f0535..d79d90c85 100644 --- a/lib_dec/FEC_lsf_estim_fx.c +++ b/lib_dec/FEC_lsf_estim_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_dec/FEC_pitch_estim_fx.c b/lib_dec/FEC_pitch_estim_fx.c index ff0732f03..d12c4b30a 100644 --- a/lib_dec/FEC_pitch_estim_fx.c +++ b/lib_dec/FEC_pitch_estim_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #include "stl.h" @@ -73,7 +73,7 @@ void FEC_pitch_estim_fx( test(); IF( ( ( element_mode == EVS_MONO ) && EQ_16( last_core, HQ_CORE ) ) || ( element_mode != EVS_MONO && ( EQ_16( last_core, HQ_CORE ) || EQ_16( last_core, TCX_20_CORE ) || EQ_16( last_core, TCX_10_CORE ) ) ) ) { - *bfi_pitch = pitch_buf[sub(shr( L_frame, 6 ) , 1)]; + *bfi_pitch = pitch_buf[sub( shr( L_frame, 6 ), 1 )]; move16(); *bfi_pitch_frame = L_frame; move16(); @@ -104,7 +104,7 @@ void FEC_pitch_estim_fx( ( EQ_16( L_frame, L_FRAME16k ) ) ) || ( EQ_16( coder_type, TRANSITION ) ) ) { - *bfi_pitch = pitch_buf[sub(shr( L_frame, 6 ) , 1)]; + *bfi_pitch = pitch_buf[sub( shr( L_frame, 6 ), 1 )]; move16(); *bfi_pitch_frame = L_frame; move16(); diff --git a/lib_dec/FEC_scale_syn_fx.c b/lib_dec/FEC_scale_syn_fx.c index c4fe1bfd7..8448695c1 100644 --- a/lib_dec/FEC_scale_syn_fx.c +++ b/lib_dec/FEC_scale_syn_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* @@ -224,7 +224,7 @@ void FEC_scale_syn_fx( h1[0] = 1024; move16(); /*syn_filt( Aq+(3*(M+1)), M, h1, h1, L_FRAME/2, h1+(M+1), 0 );*/ - E_UTIL_synthesis( 1, Aq + (3 * ( M + 1 ) ), h1, h1, L_FRAME / 2, h1 + ( M + 1 ), 0, M ); + E_UTIL_synthesis( 1, Aq + ( 3 * ( M + 1 ) ), h1, h1, L_FRAME / 2, h1 + ( M + 1 ), 0, M ); /*Compute tilt */ /*rr0 = dotp( h1, h1, L_FRAME/2-1 ) + 0.1f;*/ @@ -271,7 +271,7 @@ void FEC_scale_syn_fx( ener_max = *lp_ener_FEC_max; move32(); test(); - if( EQ_16( clas, VOICED_TRANSITION ) || ( GE_16( clas, INACTIVE_CLAS ) ) ) + if ( EQ_16( clas, VOICED_TRANSITION ) || ( GE_16( clas, INACTIVE_CLAS ) ) ) { ener_max = *lp_ener_FEC_av; move32(); diff --git a/lib_dec/LD_music_post_filter_fx.c b/lib_dec/LD_music_post_filter_fx.c index d1d4d1807..02f629317 100644 --- a/lib_dec/LD_music_post_filter_fx.c +++ b/lib_dec/LD_music_post_filter_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_dec/acelp_core_dec_fx.c b/lib_dec/acelp_core_dec_fx.c index 0b1bd4142..4f21a81a8 100644 --- a/lib_dec/acelp_core_dec_fx.c +++ b/lib_dec/acelp_core_dec_fx.c @@ -4,8 +4,8 @@ #include #include -#include "options.h" /* Compilation switches */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "ivas_prot_fx.h" #include "ivas_cnst.h" /* Common constants */ diff --git a/lib_dec/acelp_core_switch_dec_fx.c b/lib_dec/acelp_core_switch_dec_fx.c index 8252de5a1..d2a81d11b 100644 --- a/lib_dec/acelp_core_switch_dec_fx.c +++ b/lib_dec/acelp_core_switch_dec_fx.c @@ -3,11 +3,11 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ -#include "prot.h" /* Function prototypes */ +#include "prot.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/avq_dec_fx.c b/lib_dec/avq_dec_fx.c index 594030258..e739484b6 100644 --- a/lib_dec/avq_dec_fx.c +++ b/lib_dec/avq_dec_fx.c @@ -4,10 +4,10 @@ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot.h" /* Function prototypes */ #include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_dec/bass_psfilter_fx.c b/lib_dec/bass_psfilter_fx.c index 0e46a6aed..3620495a8 100644 --- a/lib_dec/bass_psfilter_fx.c +++ b/lib_dec/bass_psfilter_fx.c @@ -4,11 +4,11 @@ #include #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "rom_dec.h" /* Static table prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "rom_dec.h" /* Static table prototypes */ #include "basop_util.h" /*---------------------------------------------------------------------* diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c index 8fec002bb..b6f6f7276 100644 --- a/lib_dec/core_switching_dec_fx.c +++ b/lib_dec/core_switching_dec_fx.c @@ -6,7 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_dec/dec2t32_fx.c b/lib_dec/dec2t32_fx.c index c285cf331..b6e1c2053 100644 --- a/lib_dec/dec2t32_fx.c +++ b/lib_dec/dec2t32_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_dec/dec4t64_fx.c b/lib_dec/dec4t64_fx.c index 452775200..47c481dc4 100644 --- a/lib_dec/dec4t64_fx.c +++ b/lib_dec/dec4t64_fx.c @@ -2,11 +2,11 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ -#include "assert.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ +#include "assert.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* * Local functions @@ -298,7 +298,7 @@ void dec_1p_N1_fx( /* i = ((index >> N) & 1); */ i = L_shr( index, N ) & 1L; - IF ( i != 0 ) + IF( i != 0 ) { pos1 = add( pos1, NB_POS_FCB_4T ); } @@ -696,7 +696,7 @@ static void fcb_decode_position_fx( FOR( ; PI_select_table[L_sub( 16, l )][temp] >= k; l += 2 ); - IF ( GT_32( k, PI_select_table[L_sub( 17, l )][temp] ) ) + IF( GT_32( k, PI_select_table[L_sub( 17, l )][temp] ) ) { l = L_sub( l, 1 ); } @@ -778,7 +778,7 @@ void D_ACELP_decode_43bit_fx( UWord16 idxs[], Word16 code[], Word16 *pulsestrack move32(); joint_index = L_shr( L_add( L_shl( (Word32) idxs[2], 16 ), (Word32) idxs[1] ), 2 ); - IF ( GE_32( joint_index, joint_offset ) ) + IF( GE_32( joint_index, joint_offset ) ) { joint_index = L_sub( joint_index, joint_offset ); } diff --git a/lib_dec/dec_amr_wb_fx.c b/lib_dec/dec_amr_wb_fx.c index c9c180aad..03ae965aa 100644 --- a/lib_dec/dec_amr_wb_fx.c +++ b/lib_dec/dec_amr_wb_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/dec_gen_voic_fx.c b/lib_dec/dec_gen_voic_fx.c index 623b7a823..597cfea19 100644 --- a/lib_dec/dec_gen_voic_fx.c +++ b/lib_dec/dec_gen_voic_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "stl.h" #include "basop_util.h" diff --git a/lib_dec/dec_higher_acelp_fx.c b/lib_dec/dec_higher_acelp_fx.c index a01d8287c..eea2c8a62 100644 --- a/lib_dec/dec_higher_acelp_fx.c +++ b/lib_dec/dec_higher_acelp_fx.c @@ -4,9 +4,9 @@ #include #include "options.h" /* Compilation switches */ #include -#include "cnst.h" /* Common constants */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #define IVAS_CODE #define IVAS_CODE_AVQ diff --git a/lib_dec/dec_nelp_fx.c b/lib_dec/dec_nelp_fx.c index 4ea42d182..7083919c4 100644 --- a/lib_dec/dec_nelp_fx.c +++ b/lib_dec/dec_nelp_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*======================================================================*/ diff --git a/lib_dec/dec_pit_exc_fx.c b/lib_dec/dec_pit_exc_fx.c index 7ecdb9cdb..27abc3ddf 100644 --- a/lib_dec/dec_pit_exc_fx.c +++ b/lib_dec/dec_pit_exc_fx.c @@ -2,9 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED @@ -149,7 +149,7 @@ void dec_pit_exc_fx( test(); test(); test(); - IF ( ( ( GE_32( st_fx->core_brate, MIN_RATE_FCB ) || ( EQ_16( st_fx->GSC_noisy_speech, 1 ) && ( ( EQ_16( st_fx->L_frame, L_FRAME ) && GE_32( st_fx->core_brate, ACELP_13k20 ) ) || ( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, GSC_H_RATE_STG ) ) || st_fx->GSC_IVAS_mode == 0 ) ) ) && EQ_16( L_subfr_fx, L_SUBFR ) ) ) + IF( ( ( GE_32( st_fx->core_brate, MIN_RATE_FCB ) || ( EQ_16( st_fx->GSC_noisy_speech, 1 ) && ( ( EQ_16( st_fx->L_frame, L_FRAME ) && GE_32( st_fx->core_brate, ACELP_13k20 ) ) || ( EQ_16( st_fx->L_frame, L_FRAME16k ) && GE_32( st_fx->core_brate, GSC_H_RATE_STG ) ) || st_fx->GSC_IVAS_mode == 0 ) ) ) && EQ_16( L_subfr_fx, L_SUBFR ) ) ) { use_fcb = 1; move16(); diff --git a/lib_dec/dec_ppp_fx.c b/lib_dec/dec_ppp_fx.c index 19642686d..d37efa4c7 100644 --- a/lib_dec/dec_ppp_fx.c +++ b/lib_dec/dec_ppp_fx.c @@ -4,7 +4,7 @@ #include #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*===================================================================*/ @@ -77,7 +77,7 @@ ivas_error decod_ppp_fx( deemph_lpc_fx( p_Aq_curr_fx, p_Aq_old_fx, LPC_de_curr_fx, LPC_de_old_fx, 0 ); /*LPC in Q12 */ - IF ( ( error = ppp_voiced_decoder_fx( st_fx, excQ_ppp_fx, LPC_de_curr_fx, exc_fx, pitch_fx, bfi ) ) != IVAS_ERR_OK ) + IF( ( error = ppp_voiced_decoder_fx( st_fx, excQ_ppp_fx, LPC_de_curr_fx, exc_fx, pitch_fx, bfi ) ) != IVAS_ERR_OK ) { return error; } diff --git a/lib_dec/dec_prm.c b/lib_dec/dec_prm.c index fc3f4c511..b6a2b7d82 100644 --- a/lib_dec/dec_prm.c +++ b/lib_dec/dec_prm.c @@ -217,7 +217,7 @@ void getTCXMode_ivas_fx( /*Core extended mode mapping for correct PLC classification*/ st->core_ext_mode = st->coder_type; move16(); - if( EQ_16( st->coder_type, INACTIVE ) ) + if ( EQ_16( st->coder_type, INACTIVE ) ) { st->core_ext_mode = UNVOICED; move16(); diff --git a/lib_dec/dec_prm_fx.c b/lib_dec/dec_prm_fx.c index 795cb07cb..22b0c7047 100644 --- a/lib_dec/dec_prm_fx.c +++ b/lib_dec/dec_prm_fx.c @@ -134,7 +134,7 @@ void dec_prm_hm_fx( { tmp = 0; move16(); - if( GE_16( L_frame, 256 ) ) + if ( GE_16( L_frame, 256 ) ) { tmp = 1; move16(); @@ -224,7 +224,7 @@ void getTCXparam_fx( nSubframes = 1; move16(); - if( EQ_16( core, TCX_10_CORE ) ) + if ( EQ_16( core, TCX_10_CORE ) ) { nSubframes = 2; move16(); @@ -352,7 +352,7 @@ void getTCXparam_fx( lg = add( lg, st->hTcxCfg->tcx_offset ); lgFB = add( lgFB, shr( lgFB, sub( 3, nSubframes ) ) ); - if( st->hTcxCfg->lfacNext < 0 ) + if ( st->hTcxCfg->lfacNext < 0 ) { lg = sub( lg, st->hTcxCfg->lfacNext ); } @@ -599,7 +599,7 @@ void dec_prm_fx( Mpy_32_16_ss( st->total_brate, 5243, &L_tmp, &lsb ); /* 5243 is 1/50 in Q18. (0+18-15=3) */ num_bits = extract_l( L_shr( L_tmp, 3 ) ); /* Q0 */ assert( num_bits == st->total_brate / 50 ); - if( EQ_16( FrameSizeConfig[n].frame_bits, num_bits ) ) + if ( EQ_16( FrameSizeConfig[n].frame_bits, num_bits ) ) { st->bits_frame_core = add( st->bits_frame_core, FrameSizeConfig[n].bandwidth_bits ); BREAK; @@ -649,7 +649,7 @@ void dec_prm_fx( ind = get_next_indice( st, 2 ); st->clas_dec = ONSET; move16(); - if( ind == 0 ) + if ( ind == 0 ) { st->clas_dec = UNVOICED_CLAS; move16(); @@ -658,7 +658,7 @@ void dec_prm_fx( { st->clas_dec = UNVOICED_TRANSITION; move16(); - if( GE_16( st->last_good, VOICED_TRANSITION ) ) + if ( GE_16( st->last_good, VOICED_TRANSITION ) ) { st->clas_dec = VOICED_TRANSITION; move16(); @@ -850,7 +850,7 @@ void dec_prm_fx( st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode; move16(); test(); - if( ( NE_16( st->core, TCX_10_CORE ) ) && ( EQ_16( st->hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) ) ) + if ( ( NE_16( st->core, TCX_10_CORE ) ) && ( EQ_16( st->hTcxCfg->tcx_curr_overlap_mode, FULL_OVERLAP ) ) ) { st->hTcxCfg->tcx_last_overlap_mode = ALDO_WINDOW; move16(); @@ -1077,7 +1077,7 @@ void dec_prm_fx( n = ACELP_LTP_BITS_SFR[st->acelp_cfg.ltp_mode][sfr]; move16(); - IF ( n != 0 ) + IF( n != 0 ) { prm[j] = get_next_indice( st, n ); j = add( j, 1 ); @@ -1085,7 +1085,7 @@ void dec_prm_fx( } /* Adaptive codebook filtering (1 bit) */ - IF ( EQ_16( st->acelp_cfg.ltf_mode, 2 ) ) + IF( EQ_16( st->acelp_cfg.ltf_mode, 2 ) ) { prm[j] = get_next_indice( st, 1 ); j = add( j, 1 ); @@ -1187,7 +1187,7 @@ void dec_prm_fx( /* Pitch lag (5, or 8 bits) */ n = ACELP_LTP_BITS_SFR[ltp_mode][sfr]; move16(); - IF ( n != 0 ) + IF( n != 0 ) { prm[j] = get_next_indice( st, n ); j = add( j, 1 ); @@ -1319,7 +1319,7 @@ void dec_prm_fx( IF( st->hTcxCfg->fIsTNSAllowed ) { - SetTnsConfig( st->hTcxCfg, 1, (Word16)EQ_16(st->last_core_from_bs , ACELP_CORE) ); + SetTnsConfig( st->hTcxCfg, 1, (Word16) EQ_16( st->last_core_from_bs, ACELP_CORE ) ); ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); j = add( j, nTnsParams ); diff --git a/lib_dec/dec_tran_fx.c b/lib_dec/dec_tran_fx.c index 2ba42b675..9d2e808a7 100644 --- a/lib_dec/dec_tran_fx.c +++ b/lib_dec/dec_tran_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*======================================================================*/ diff --git a/lib_dec/dec_uv_fx.c b/lib_dec/dec_uv_fx.c index 63be30656..182c89ef7 100644 --- a/lib_dec/dec_uv_fx.c +++ b/lib_dec/dec_uv_fx.c @@ -2,8 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED static void gain_dec_gacelp_uv_fx( diff --git a/lib_dec/evs_dec_fx.c b/lib_dec/evs_dec_fx.c index 690e59b05..ee9bc103c 100644 --- a/lib_dec/evs_dec_fx.c +++ b/lib_dec/evs_dec_fx.c @@ -6,7 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/gain_dec_fx.c b/lib_dec/gain_dec_fx.c index d793092e9..ab561a354 100644 --- a/lib_dec/gain_dec_fx.c +++ b/lib_dec/gain_dec_fx.c @@ -2,9 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_dec/gaus_dec_fx.c b/lib_dec/gaus_dec_fx.c index ea5ab985c..9cd2214bc 100644 --- a/lib_dec/gaus_dec_fx.c +++ b/lib_dec/gaus_dec_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_dec/gs_dec_amr_wb_fx.c b/lib_dec/gs_dec_amr_wb_fx.c index 1ada34c63..5864c697c 100644 --- a/lib_dec/gs_dec_amr_wb_fx.c +++ b/lib_dec/gs_dec_amr_wb_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ @@ -440,7 +440,7 @@ void improv_amr_wb_gs_fx( IF( ( locattack == 0 && LE_32( core_brate, ACELP_12k65 ) ) && ( ( LT_32( core_brate, ACELP_8k85 ) && NE_16( clas, AUDIO_CLAS ) && ( clas == UNVOICED_CLAS || EQ_16( clas, VOICED_TRANSITION ) ) ) || - ( coder_type == INACTIVE ) ) ) + ( coder_type == INACTIVE ) ) ) #endif { /*------------------------------------------------------------* @@ -462,18 +462,18 @@ void improv_amr_wb_gs_fx( { Copy( Aq_fx, Aq_orig, NB_SUBFR * ( M + 1 ) ); - exp_a = norm_s( Aq_fx[imult1616(i , ( M + 1 ))] ); - exp_b = norm_s( old_Aq_fx[imult1616(i , ( M + 1 ))] ); + exp_a = norm_s( Aq_fx[imult1616( i, ( M + 1 ) )] ); + exp_b = norm_s( old_Aq_fx[imult1616( i, ( M + 1 ) )] ); exp_diff = sub( exp_a, exp_b ); IF( exp_diff > 0 ) { - Scale_sig( &old_Aq_fx[imult1616(i , ( M + 1 ))], ( M + 1 ), negate( exp_diff ) ); + Scale_sig( &old_Aq_fx[imult1616( i, ( M + 1 ) )], ( M + 1 ), negate( exp_diff ) ); } ELSE { - Scale_sig( &Aq_fx[imult1616(i , ( M + 1 ))], ( M + 1 ), exp_diff ); + Scale_sig( &Aq_fx[imult1616( i, ( M + 1 ) )], ( M + 1 ), exp_diff ); } - FOR( j = imult1616(i , ( M + 1 )); j < imult1616(add( i , 1 ) , ( M + 1 )); j++ ) + FOR( j = imult1616( i, ( M + 1 ) ); j < imult1616( add( i, 1 ), ( M + 1 ) ); j++ ) { Aq_fx[j] = round_fx( L_mac( L_mult( ALP_FX, old_Aq_fx[j] ), MALP_FX, Aq_fx[j] ) ); @@ -489,12 +489,12 @@ void improv_amr_wb_gs_fx( FOR( i = 0; i < NB_SUBFR; i++ ) { #ifdef BASOP_NOGLOB - enr_LP_new = Enr_1_Az_fx_o( Aq_fx + imult1616(i , ( M + 1 )), L_SUBFR, &Overflow ); + enr_LP_new = Enr_1_Az_fx_o( Aq_fx + imult1616( i, ( M + 1 ) ), L_SUBFR, &Overflow ); #else enr_LP_new = Enr_1_Az_fx( Aq_fx + i * ( M + 1 ), L_SUBFR ); #endif test(); - IF( GT_16( shr( enr_LP_new, 7 ) , enr_LP_old ) || Overflow ) + IF( GT_16( shr( enr_LP_new, 7 ), enr_LP_old ) || Overflow ) { /* filter is unstable, do not modify the excitation */ Copy( Aq_orig, Aq_fx, NB_SUBFR * ( M + 1 ) ); diff --git a/lib_dec/gs_dec_fx.c b/lib_dec/gs_dec_fx.c index 9310ee442..9bd541bc9 100644 --- a/lib_dec/gs_dec_fx.c +++ b/lib_dec/gs_dec_fx.c @@ -483,7 +483,7 @@ void decod_audio_fx( * Update BWE excitation *--------------------------------------------------------------------------------------*/ - IF ( st_fx->hBWE_TD != NULL ) + IF( st_fx->hBWE_TD != NULL ) { set16_fx( voice_factors, 0, NB_SUBFR16k ); IF( EQ_16( st_fx->L_frame, L_FRAME16k ) ) @@ -567,7 +567,7 @@ void decod_audio_ivas_fx( GSC_DEC_HANDLE hGSCDec; hGSCDec = st_fx->hGSCDec; - move16(); //Es_pred + move16(); // Es_pred /*---------------------------------------------------------------* * Initialization @@ -631,7 +631,7 @@ void decod_audio_ivas_fx( hGSCDec->noise_lev = NOISE_LEVEL_SP3; move16(); #if 1 // def ADD_LRTD - IF ( GE_16( st_fx->GSC_IVAS_mode, 1 ) ) + IF( GE_16( st_fx->GSC_IVAS_mode, 1 ) ) { test(); if ( LT_32( st_fx->core_brate, GSC_L_RATE_STG ) && LT_32( st_fx->GSC_IVAS_mode, 3 ) ) @@ -689,7 +689,7 @@ void decod_audio_ivas_fx( nb_subfr = SWNB_SUBFR; move16(); - IF ( GE_32( st_fx->core_brate, ACELP_9k60 ) ) + IF( GE_32( st_fx->core_brate, ACELP_9k60 ) ) { nbits = 1; move16(); @@ -720,7 +720,7 @@ void decod_audio_ivas_fx( if ( EQ_16( shr( nb_frame_flg, 1 ), 1 ) ) { - nb_subfr = shl(nb_subfr, 1); + nb_subfr = shl( nb_subfr, 1 ); } #endif } @@ -765,7 +765,7 @@ void decod_audio_ivas_fx( pit_band_idx = (Word16) get_next_indice( st_fx, nbits ); } - IF ( pit_band_idx != 0 ) + IF( pit_band_idx != 0 ) { IF( LT_32( st_fx->core_brate, ACELP_9k60 ) ) { @@ -778,7 +778,7 @@ void decod_audio_ivas_fx( } /* detect bit errors in the bitstream */ - IF ( GT_16( pit_band_idx, 13 ) ) /* The maximum decodable index is 10 + BAND1k2 (3) = 13 */ + IF( GT_16( pit_band_idx, 13 ) ) /* The maximum decodable index is 10 + BAND1k2 (3) = 13 */ { pit_band_idx = 13; move16(); @@ -835,7 +835,7 @@ void decod_audio_ivas_fx( #else dec_pit_exc_fx( st_fx, Aq, st_fx->coder_type, Es_pred, pitch_buf, code, exc, bwe_exc, nb_subfr, gain_buf ); #endif - IF ( LT_32( st_fx->core_brate, ACELP_9k60 ) ) + IF( LT_32( st_fx->core_brate, ACELP_9k60 ) ) { minimum_fx( pitch_buf, shr( st_fx->L_frame, 6 ), &low_pit ); low_pit = shr( low_pit, 6 ); /*Q6 -> Q0 */ @@ -989,7 +989,7 @@ void decod_audio_ivas_fx( } #if 1 // ydef ADD_LRTD - IF ( EQ_16( st_fx->idchan, 1 ) ) + IF( EQ_16( st_fx->idchan, 1 ) ) { tmp_nb_bits_tot = add( tmp_nb_bits_tot, TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS ); if ( EQ_16( st_fx->tdm_LRTD_flag, 1 ) ) @@ -1016,7 +1016,7 @@ void decod_audio_ivas_fx( * Update BWE excitation *--------------------------------------------------------------------------------------*/ - IF ( st_fx->hBWE_TD != NULL ) + IF( st_fx->hBWE_TD != NULL ) { set16_fx( voice_factors, 0, NB_SUBFR16k ); IF( EQ_16( st_fx->L_frame, L_FRAME16k ) ) @@ -1287,7 +1287,7 @@ void gsc_dec_fx( { FOR( j = 0; j < shl( nb_subbands, 4 ); j++ ) { - IF ( concat_out[j] > 0 ) + IF( concat_out[j] > 0 ) { seed_init = extract_l( L_shl( seed_init, 3 ) ); } @@ -1489,7 +1489,7 @@ void gsc_dec_ivas_fx( move16(); WHILE( LT_16( i, SIZE_BRATE_INTERMED_TBL ) ) { - IF ( LE_32( st_fx->core_brate, brate_intermed_tbl[i] ) ) + IF( LE_32( st_fx->core_brate, brate_intermed_tbl[i] ) ) { break; } @@ -1569,7 +1569,7 @@ void gsc_dec_ivas_fx( st_fx->L_frame, st_fx->element_mode, st_fx->GSC_IVAS_mode ); #if 1 // def ADD_LRTD - IF ( bit == 0 ) + IF( bit == 0 ) { set16_fx( concat_out, 0, L_FRAME16k ); } diff --git a/lib_dec/hf_synth_fx.c b/lib_dec/hf_synth_fx.c index 4c1e2f66a..cee42b0ca 100644 --- a/lib_dec/hf_synth_fx.c +++ b/lib_dec/hf_synth_fx.c @@ -2,10 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #include "basop32.h" #include "prot.h" @@ -115,7 +115,7 @@ void hf_synth_fx( p_Aq = Aq; FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR ) { - hf_synthesis_fx( hBWE_zero, core_brate, output_subfr, p_Aq, &exc[i_subfr], Q_exc, &synth[i_subfr], &synth16k[imult3216((Word32)i_subfr , output_subfr) / L_SUBFR], + hf_synthesis_fx( hBWE_zero, core_brate, output_subfr, p_Aq, &exc[i_subfr], Q_exc, &synth[i_subfr], &synth16k[imult3216( (Word32) i_subfr, output_subfr ) / L_SUBFR], Q_syn2, delay_syn_hf, memExp1, mem_hp_interp, extl, CNG_mode ); p_Aq += ( M + 1 ); @@ -346,8 +346,8 @@ static void hf_synthesis_fx( /* delay by 5 samples @16kHz to compensate CLDFB resampling delay (20samples) and HP filtering delay (roughly 15 samples) */ delay = NS2SA( 16000, DELAY_CLDFB_NS ) - 15; - Copy( HF_syn + sub(L_SUBFR16k , delay), temp_buffer, delay ); - Copy( HF_syn, HF_syn + delay, sub(L_SUBFR16k , delay) ); + Copy( HF_syn + sub( L_SUBFR16k, delay ), temp_buffer, delay ); + Copy( HF_syn, HF_syn + delay, sub( L_SUBFR16k, delay ) ); Copy( delay_syn_hf, HF_syn, delay ); Copy( temp_buffer, delay_syn_hf, delay ); @@ -655,7 +655,7 @@ static void filt_6k_7k_scale_fx( Word16 j; L_tmp = 0; move32(); - FOR ( j = 0; j < 31; j++ ) + FOR( j = 0; j < 31; j++ ) { #ifdef BASOP_NOGLOB L_tmp = L_mac_o( L_tmp, x[i + j], fir_6k_7k_fx[j], &Overflow ); @@ -1149,7 +1149,7 @@ void hf_synth_amr_wb_fx( pt4 = signum; FOR( i = 0; i < L_SUBFR16k; i++ ) { - IF ( *pt1 > 0 ) + IF( *pt1 > 0 ) { *pt1 = mult_r( *pt1, g ); /*qdct */ move16(); @@ -1263,7 +1263,7 @@ void hf_synth_amr_wb_fx( FOR( i = 240; i < L_FRAME16k; i++ ) { *pt1 = mult_r( *pt1, scale ); /*qdct */ - IF ( GT_16( i, 255 ) ) + IF( GT_16( i, 255 ) ) { *pt1 = mult_r( 19505, *pt1 ); move16(); @@ -1673,7 +1673,7 @@ static void envelope_fx( } /* LPC envelope level estimate */ - L_tmp = 0 ; + L_tmp = 0; move32(); pt1 = Ap; pt2 = exp_tab_p_fx; diff --git a/lib_dec/hq_classifier_dec_fx.c b/lib_dec/hq_classifier_dec_fx.c index 8b49892ee..430c27cd7 100644 --- a/lib_dec/hq_classifier_dec_fx.c +++ b/lib_dec/hq_classifier_dec_fx.c @@ -2,7 +2,7 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" @@ -38,7 +38,7 @@ Word16 ivas_hq_classifier_dec_fx( /* o : Consumed bits test(); IF( ( EQ_16( length, L_SPEC32k ) || EQ_16( length, L_SPEC48k ) ) && LE_32( core_brate, max_brate ) ) { - *hqswb_clas = (Word16)get_next_indice( st_fx, 2 ); + *hqswb_clas = (Word16) get_next_indice( st_fx, 2 ); move16(); bits = 2; move16(); @@ -69,7 +69,7 @@ Word16 ivas_hq_classifier_dec_fx( /* o : Consumed bits test(); IF( LE_32( st_fx->core_brate, HQ_32k ) && *hqswb_clas == HQ_NORMAL ) { - IF ( EQ_16( length, L_SPEC32k ) ) + IF( EQ_16( length, L_SPEC32k ) ) { *hqswb_clas = HQ_GEN_SWB; move16(); diff --git a/lib_dec/hq_core_dec_fx.c b/lib_dec/hq_core_dec_fx.c index ccdb58986..d629365f3 100644 --- a/lib_dec/hq_core_dec_fx.c +++ b/lib_dec/hq_core_dec_fx.c @@ -2,10 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED #include "prot.h" #include "ivas_prot_fx.h" diff --git a/lib_dec/hq_env_dec_fx.c b/lib_dec/hq_env_dec_fx.c index 20c64df45..df1635e37 100644 --- a/lib_dec/hq_env_dec_fx.c +++ b/lib_dec/hq_env_dec_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED /*------------------------------------------------------------------------* diff --git a/lib_dec/hq_hr_dec_fx.c b/lib_dec/hq_hr_dec_fx.c index 602df7dd3..4814b86e5 100644 --- a/lib_dec/hq_hr_dec_fx.c +++ b/lib_dec/hq_hr_dec_fx.c @@ -2,9 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/inov_dec_fx.c b/lib_dec/inov_dec_fx.c index 9377005a0..b91724125 100644 --- a/lib_dec/inov_dec_fx.c +++ b/lib_dec/inov_dec_fx.c @@ -3,10 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED /*======================================================================*/ /* FUNCTION : inov_decode_fx() */ diff --git a/lib_dec/ivas_stereo_dft_dec_dmx.c b/lib_dec/ivas_stereo_dft_dec_dmx.c index ee2c781b5..bacc5a0ab 100644 --- a/lib_dec/ivas_stereo_dft_dec_dmx.c +++ b/lib_dec/ivas_stereo_dft_dec_dmx.c @@ -294,13 +294,13 @@ void stereo_dft_unify_dmx_fx( Word16 exp_sum_abs = exp_sum_nrg_l; move16(); - if( GT_16( exp_sum_nrg_R, exp_sum_nrg_l ) ) + if ( GT_16( exp_sum_nrg_R, exp_sum_nrg_l ) ) { exp_sum_abs = exp_sum_nrg_R; move16(); } exp_sum_abs = add( exp_sum_abs, 1 ); - sum_abs = L_add( L_shr( tmp_nrg_L, sub(exp_sum_abs , exp_sum_nrg_l) ), L_shr( tmp_nrg_R, sub( exp_sum_abs, exp_sum_nrg_R ) ) ); + sum_abs = L_add( L_shr( tmp_nrg_L, sub( exp_sum_abs, exp_sum_nrg_l ) ), L_shr( tmp_nrg_R, sub( exp_sum_abs, exp_sum_nrg_R ) ) ); dot_prod_abs = Sqrt32( L_add( Mpy_32_32( dot_prod_real_32, dot_prod_real_32 ), Mpy_32_32( dot_prod_img_32, dot_prod_img_32 ) ), &exp_dot_prod_abs ); Word32 num = L_add( L_shr( L_add( sum_nrg_L_32, sum_nrg_R_32 ), 1 ), L_shr( dot_prod_abs, sub( sub( 31, exp_dot_prod_abs ), q_sum_nrg_L ) ) ); Word16 E_num = sub( 31, q_sum_nrg_L ); @@ -308,7 +308,7 @@ void stereo_dft_unify_dmx_fx( Word16 exp_wR = exp_sum_abs; move16(); - if( LT_16( exp_sum_abs, E_num ) ) + if ( LT_16( exp_sum_abs, E_num ) ) { exp_wR = E_num; move16(); @@ -328,14 +328,14 @@ void stereo_dft_unify_dmx_fx( } ELSE { - wR_temp = shr( divide3232( L_shr( num_sqrt, sub(exp_wR , E_num) ), L_shr( sum_abs, sub(exp_wR , exp_sum_abs) ) ), 2 ); + wR_temp = shr( divide3232( L_shr( num_sqrt, sub( exp_wR, E_num ) ), L_shr( sum_abs, sub( exp_wR, exp_sum_abs ) ) ), 2 ); } Word32 sum_nrg_Mid_sqrt = Sqrt32( sum_nrg_Mid, &exp_sum_nrg_Mid ); Word16 exp_wL = exp_sum_abs; move16(); - if( LT_16( exp_sum_abs, exp_sum_nrg_Mid ) ) + if ( LT_16( exp_sum_abs, exp_sum_nrg_Mid ) ) { exp_wL = exp_sum_nrg_Mid; move16(); diff --git a/lib_dec/ivas_stereo_dft_plc_fx.c b/lib_dec/ivas_stereo_dft_plc_fx.c index 3e41b5991..e0cd69ef6 100644 --- a/lib_dec/ivas_stereo_dft_plc_fx.c +++ b/lib_dec/ivas_stereo_dft_plc_fx.c @@ -110,12 +110,12 @@ void stereo_dft_res_ecu_fx( move16(); FOR( i = 0; i < STEREO_DFT32MS_N_8k / 4; i++ ) { - trigo_dec[i] = hStereoDft->dft_trigo_8k_fx[i_mult(i , trigo_step)]; + trigo_dec[i] = hStereoDft->dft_trigo_8k_fx[i_mult( i, trigo_step )]; move16(); - trigo_dec[STEREO_DFT32MS_N_8k / 2 - i] = hStereoDft->dft_trigo_8k_fx[i_mult(i , trigo_step)]; + trigo_dec[STEREO_DFT32MS_N_8k / 2 - i] = hStereoDft->dft_trigo_8k_fx[i_mult( i, trigo_step )]; move16(); } - trigo_dec[STEREO_DFT32MS_N_8k / 4] = hStereoDft->dft_trigo_8k_fx[i_mult(STEREO_DFT32MS_N_8k / 4 , trigo_step)]; + trigo_dec[STEREO_DFT32MS_N_8k / 4] = hStereoDft->dft_trigo_8k_fx[i_mult( STEREO_DFT32MS_N_8k / 4, trigo_step )]; move16(); /* estimation of res_cod_mem (ola part in imdct residual signal) and input_mem (memory for buffer in DFT analysis)*/ @@ -311,7 +311,7 @@ static void ivas_peakfinder_fx( move32(); ind[k] = 0; move16(); - k = add(k, 1); + k = add( k, 1 ); } FOR( i = 1; i < sub( len0, 1 ); i++ ) @@ -434,7 +434,7 @@ static void ivas_peakfinder_fx( move32(); } - ii = add(ii,1); /* Move onto the valley */ + ii = add( ii, 1 ); /* Move onto the valley */ /* Come down at least sel from peak */ test(); @@ -448,8 +448,8 @@ static void ivas_peakfinder_fx( move16(); peakMag[*cInd] = tempMag; move32(); - ( *cInd ) = add(*(cInd),1); - move16(); + ( *cInd ) = add( *( cInd ), 1 ); + move16(); } ELSE IF( LT_32( x[ii], leftMin ) ) /* New left minimum */ { @@ -581,7 +581,7 @@ void stereo_dft_res_subst_spec_fx( FOR( i = 1; i < L_res; i++ ) { Word32 r = L_shl( p_mem[2 * i], q_res ); - Word32 l = L_shl( p_mem[add(shl(i,1), 1)], q_res ); + Word32 l = L_shl( p_mem[add( shl( i, 1 ), 1 )], q_res ); abs_res[i] = Madd_32_32( Mpy_32_32( r, r ), l, l ); move32(); } @@ -693,7 +693,7 @@ void stereo_dft_res_subst_spec_fx( cos_F = shl_o( getCosWord16( extract_l( corr_phase ) ), 1, &flg_ov ); sin_F = getSinWord16( extract_l( corr_phase ) ); - idx = s_max( 0, sub(plocs[i] , Np) ); /* Iterate over plocs[i]-1:plocs[i]+1, considering the edges of the spectrum */ + idx = s_max( 0, sub( plocs[i], Np ) ); /* Iterate over plocs[i]-1:plocs[i]+1, considering the edges of the spectrum */ WHILE( ( idx < add( add( plocs[i], Np ), 1 ) ) && LT_16( idx, L_res ) ) { pDFT_RES[2 * idx] = Msub_32_16( Mpy_32_16_1( p_mem[2 * idx], cos_F ), p_mem[add( shl( idx, 1 ), 1 )], sin_F ); diff --git a/lib_dec/ivas_stereo_ica_dec.c b/lib_dec/ivas_stereo_ica_dec.c index 2553f40af..e96f22c03 100644 --- a/lib_dec/ivas_stereo_ica_dec.c +++ b/lib_dec/ivas_stereo_ica_dec.c @@ -694,7 +694,7 @@ void stereo_tca_scale_R_channel_fx( Word16 temp_a_q = 2; move16(); tempF1_fx = Inv16( temp_a, &temp_a_q ); - tempF1_fx = L_shl( tempF1_fx, sub(( 31 - 4 ) , sub( 15 , temp_a_q )) ); + tempF1_fx = L_shl( tempF1_fx, sub( ( 31 - 4 ), sub( 15, temp_a_q ) ) ); } @@ -709,7 +709,7 @@ void stereo_tca_scale_R_channel_fx( Word16 temp_b_q = 2; move16(); tempF_fx = Inv16( temp_b, &temp_b_q ); - tempF_fx = L_shl( tempF_fx, sub(( 31 - 4 ) , sub( 15 , temp_b_q )) ); + tempF_fx = L_shl( tempF_fx, sub( ( 31 - 4 ), sub( 15, temp_b_q ) ) ); } } SWITCH( output_Fs ) diff --git a/lib_dec/ivas_stereo_mdct_core_dec_fx.c b/lib_dec/ivas_stereo_mdct_core_dec_fx.c index 17e2d3601..078c8957d 100644 --- a/lib_dec/ivas_stereo_mdct_core_dec_fx.c +++ b/lib_dec/ivas_stereo_mdct_core_dec_fx.c @@ -81,7 +81,7 @@ static void stereo_mdct_dec_stereo_fx( sts[0]->bits_frame_channel = add( sts[0]->bits_frame_channel, i_mult( sts[0]->core, SMDCT_MINIMUM_ARITH_BITS ) ); sts[1]->bits_frame_channel = add( sts[1]->bits_frame_channel, i_mult( sts[1]->core, SMDCT_MINIMUM_ARITH_BITS ) ); - sts[1]->bit_stream = &sts[0]->bit_stream[add(add(sts[0]->next_bit_pos , sts[0]->bits_frame_channel) , i_mult(sts[0]->core , NF_GAIN_BITS))]; + sts[1]->bit_stream = &sts[0]->bit_stream[add( add( sts[0]->next_bit_pos, sts[0]->bits_frame_channel ), i_mult( sts[0]->core, NF_GAIN_BITS ) )]; return; } @@ -819,7 +819,7 @@ static void apply_dmx_weights_fx( { /* subframe is TCX5, but TCX10 or TCX20 in other channel -> convert channel with TCX5 to TCX10 resolution */ pTmp[ch][k] = sig[ch][k] = convertRes[ch] + i_mult( k, shr( frameSize, 1 ) ); - convert_coeffs_to_higher_res_fx( x[ch][k], x[ch][k] + shr(frameSize ,2), pTmp[ch][k], shr( frameSize, 2 ) ); + convert_coeffs_to_higher_res_fx( x[ch][k], x[ch][k] + shr( frameSize, 2 ), pTmp[ch][k], shr( frameSize, 2 ) ); } } @@ -840,7 +840,7 @@ static void apply_dmx_weights_fx( FOR( l = 0; l < nsub2[k]; l++ ) { // mdst[ch][k][l * numCoeffs[k]] = mdst[ch][k][( l + 1 ) * numCoeffs[k] - 1] = 0.f; - mdst[ch][k][i_mult(l , numCoeffs[k])] = mdst[ch][k][sub(i_mult(add( l , 1 ) , numCoeffs[k]) , 1)] = 0; + mdst[ch][k][i_mult( l, numCoeffs[k] )] = mdst[ch][k][sub( i_mult( add( l, 1 ), numCoeffs[k] ), 1 )] = 0; move32(); move32(); FOR( i = l * numCoeffs[k] + 1; i < ( l + 1 ) * numCoeffs[k] - 1; i++ ) @@ -1163,7 +1163,7 @@ static void run_min_stats_fx( FOR( Word16 i = 1; i < L_FRAME16k - 1; i++ ) { Word32 mdst; - mdst = L_sub( spec_in[i + 1], spec_in[i - 1] ); /* Q31 - x_e */ + mdst = L_sub( spec_in[i + 1], spec_in[i - 1] ); /* Q31 - x_e */ power_spec[i] = L_add( W_extract_h( W_shl( W_mult_32_32( spec_in[i], spec_in[i] ), sub( tmp16, 4 ) ) ), W_extract_h( W_shl( W_mult_32_32( mdst, mdst ), sub( tmp16, 4 ) ) ) ); /* 2 * (Q31 - x_e) + tmp16 - Q4 - Q31*/ move32(); } diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec.c index 626b71a10..922f6e369 100644 --- a/lib_dec/ivas_tcx_core_dec.c +++ b/lib_dec/ivas_tcx_core_dec.c @@ -630,7 +630,7 @@ void stereo_tcx_core_dec_fx( IF( !bfi ) { st->stab_fac_fx = lsf_stab_fx( &lsf_fx[M], &lsf_fx[0], 0, st->L_frame ); - move16(); + move16(); } IF( hTcxDec->enableTcxLpc ) diff --git a/lib_dec/lp_exc_d_fx.c b/lib_dec/lp_exc_d_fx.c index acad06090..76d4b4676 100644 --- a/lib_dec/lp_exc_d_fx.c +++ b/lib_dec/lp_exc_d_fx.c @@ -3,8 +3,8 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ /*======================================================================*/ diff --git a/lib_dec/lsf_dec_fx.c b/lib_dec/lsf_dec_fx.c index 2e99272cb..5db486999 100644 --- a/lib_dec/lsf_dec_fx.c +++ b/lib_dec/lsf_dec_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #if defined LSF_RE_USE_SECONDARY_CHANNEL || defined FIX_798_LSF_SECONDARY_CH_MISSING_CODE #include "ivas_prot.h" diff --git a/lib_dec/nelp_dec_fx.c b/lib_dec/nelp_dec_fx.c index e5df5d6e4..6943e0b82 100644 --- a/lib_dec/nelp_dec_fx.c +++ b/lib_dec/nelp_dec_fx.c @@ -3,7 +3,7 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" diff --git a/lib_dec/pvq_core_dec_fx.c b/lib_dec/pvq_core_dec_fx.c index f9e994cc6..cf904fac6 100644 --- a/lib_dec/pvq_core_dec_fx.c +++ b/lib_dec/pvq_core_dec_fx.c @@ -3,10 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/range_dec_fx.c b/lib_dec/range_dec_fx.c index 515bd9cda..a51625892 100644 --- a/lib_dec/range_dec_fx.c +++ b/lib_dec/range_dec_fx.c @@ -3,9 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_dec/re8_dec_fx.c b/lib_dec/re8_dec_fx.c index 2108ca24d..e6c35e293 100644 --- a/lib_dec/re8_dec_fx.c +++ b/lib_dec/re8_dec_fx.c @@ -3,7 +3,7 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------------- diff --git a/lib_dec/rst_dec_fx.c b/lib_dec/rst_dec_fx.c index 9e4f056d3..50aa1b906 100644 --- a/lib_dec/rst_dec_fx.c +++ b/lib_dec/rst_dec_fx.c @@ -4,8 +4,8 @@ #include "options.h" /* Compilation switches */ #include "stl.h" -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ /*----------------------------------------------------------------------------------* diff --git a/lib_dec/stat_noise_uv_dec_fx.c b/lib_dec/stat_noise_uv_dec_fx.c index 0ea10d749..651fb179e 100644 --- a/lib_dec/stat_noise_uv_dec_fx.c +++ b/lib_dec/stat_noise_uv_dec_fx.c @@ -3,7 +3,7 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_dec/swb_bwe_dec_hr_fx.c b/lib_dec/swb_bwe_dec_hr_fx.c index 660415302..2ff899705 100644 --- a/lib_dec/swb_bwe_dec_hr_fx.c +++ b/lib_dec/swb_bwe_dec_hr_fx.c @@ -2,11 +2,11 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ +#include "options.h" /* Compilation switches */ #include "prot_fx.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ -#include "rom_dec.h" /* Static table prototypes */ -#include "cnst.h" /* Static table prototypes */ +#include "rom_com.h" /* Static table prototypes */ +#include "rom_dec.h" /* Static table prototypes */ +#include "cnst.h" /* Static table prototypes */ #define Q_GUARD 1 #define Q_32_BITS 14 /* scaling of 't_audio32' */ diff --git a/lib_dec/syn_outp_fx.c b/lib_dec/syn_outp_fx.c index 32eebbfe8..0cdf21973 100644 --- a/lib_dec/syn_outp_fx.c +++ b/lib_dec/syn_outp_fx.c @@ -3,8 +3,8 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ #include "prot_fx.h" /* Debug prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_dec/tonalMDCTconcealment_fx.c b/lib_dec/tonalMDCTconcealment_fx.c index d465a03cd..bccb9ea3f 100644 --- a/lib_dec/tonalMDCTconcealment_fx.c +++ b/lib_dec/tonalMDCTconcealment_fx.c @@ -519,7 +519,7 @@ void TonalMDCTConceal_SaveFreqSignal_ivas_fx( FOR( i = 0; i < nNewSamples; i++ ) { Word16 tmp = 0; - if (mdctSpectrum[i] != 0) + if ( mdctSpectrum[i] != 0 ) { tmp = 1; move16(); diff --git a/lib_dec/transition_dec_fx.c b/lib_dec/transition_dec_fx.c index d0ee6d307..edb86ffd4 100644 --- a/lib_dec/transition_dec_fx.c +++ b/lib_dec/transition_dec_fx.c @@ -2,9 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_dec/updt_dec_fx.c b/lib_dec/updt_dec_fx.c index c71e93f35..28de7cca5 100644 --- a/lib_dec/updt_dec_fx.c +++ b/lib_dec/updt_dec_fx.c @@ -5,8 +5,8 @@ #include #include #include "options.h" -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ #include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/FEC_enc_fx.c b/lib_enc/FEC_enc_fx.c index c662d0572..d35f18b61 100644 --- a/lib_enc/FEC_enc_fx.c +++ b/lib_enc/FEC_enc_fx.c @@ -7,7 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/SNR_calc_fx.c b/lib_enc/SNR_calc_fx.c index e3805a1f1..674467cf4 100644 --- a/lib_enc/SNR_calc_fx.c +++ b/lib_enc/SNR_calc_fx.c @@ -6,7 +6,7 @@ #include "options.h" #include "basop_util.h" #include "vad_basop.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_enc.h" #include "rom_com.h" diff --git a/lib_enc/acelp_core_switch_enc_fx.c b/lib_enc/acelp_core_switch_enc_fx.c index 574ccb191..994fe70a9 100644 --- a/lib_enc/acelp_core_switch_enc_fx.c +++ b/lib_enc/acelp_core_switch_enc_fx.c @@ -8,7 +8,7 @@ #include "rom_com_fx.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/acelp_enc_util_fx.c b/lib_enc/acelp_enc_util_fx.c index 9ac0accad..ffdf837c4 100644 --- a/lib_enc/acelp_enc_util_fx.c +++ b/lib_enc/acelp_enc_util_fx.c @@ -9,7 +9,7 @@ //#include "prot_fx.h" #include "basop_util.h" #include "cnst.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stat_enc.h" #include "rom_com.h" diff --git a/lib_enc/amr_wb_enc_fx.c b/lib_enc/amr_wb_enc_fx.c index f8ab8e6b5..b4b011b35 100644 --- a/lib_enc/amr_wb_enc_fx.c +++ b/lib_enc/amr_wb_enc_fx.c @@ -10,7 +10,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" diff --git a/lib_enc/analy_lp_fx.c b/lib_enc/analy_lp_fx.c index 959cbecbe..b8582d271 100644 --- a/lib_enc/analy_lp_fx.c +++ b/lib_enc/analy_lp_fx.c @@ -9,7 +9,7 @@ #include "rom_com.h" /* Static table prototypes */ #include "rom_enc.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/analy_sp_fx.c b/lib_enc/analy_sp_fx.c index ffef5bb62..e23c9b9a5 100644 --- a/lib_enc/analy_sp_fx.c +++ b/lib_enc/analy_sp_fx.c @@ -7,7 +7,7 @@ #include "cnst.h" #include "basop_util.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_enc.h" #include "rom_com.h" diff --git a/lib_enc/ari_enc_fx.c b/lib_enc/ari_enc_fx.c index dd203aee0..54c21c9d1 100644 --- a/lib_enc/ari_enc_fx.c +++ b/lib_enc/ari_enc_fx.c @@ -9,7 +9,7 @@ #include "cnst.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------- diff --git a/lib_enc/ari_hm_enc_fx.c b/lib_enc/ari_hm_enc_fx.c index 93670491c..8414c56da 100644 --- a/lib_enc/ari_hm_enc_fx.c +++ b/lib_enc/ari_hm_enc_fx.c @@ -12,7 +12,7 @@ #include "rom_enc.h" #include "prot.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/arith_coder_enc_fx.c b/lib_enc/arith_coder_enc_fx.c index 585bd3ab3..ce9f146d8 100644 --- a/lib_enc/arith_coder_enc_fx.c +++ b/lib_enc/arith_coder_enc_fx.c @@ -6,7 +6,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" #include "rom_com.h" diff --git a/lib_enc/avq_cod_fx.c b/lib_enc/avq_cod_fx.c index ca75917b7..ece84e4e9 100644 --- a/lib_enc/avq_cod_fx.c +++ b/lib_enc/avq_cod_fx.c @@ -8,7 +8,7 @@ #include /* Compilation switches */ #include "prot.h" /* Function prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ diff --git a/lib_enc/bass_psfilter_enc_fx.c b/lib_enc/bass_psfilter_enc_fx.c index a468f94e6..df52213c2 100644 --- a/lib_enc/bass_psfilter_enc_fx.c +++ b/lib_enc/bass_psfilter_enc_fx.c @@ -7,7 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/bw_detect_fx.c b/lib_enc/bw_detect_fx.c index 004aa55d6..9660075e6 100644 --- a/lib_enc/bw_detect_fx.c +++ b/lib_enc/bw_detect_fx.c @@ -10,7 +10,7 @@ #include "rom_com.h" #include "basop_util.h" #include "ivas_cnst.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/cng_enc_fx.c b/lib_enc/cng_enc_fx.c index 9f5ec0ebf..e94da2f7c 100644 --- a/lib_enc/cng_enc_fx.c +++ b/lib_enc/cng_enc_fx.c @@ -7,7 +7,7 @@ #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ //#include "basop_mpy.h" diff --git a/lib_enc/cod2t32_fx.c b/lib_enc/cod2t32_fx.c index a975eeda4..06c4d31f0 100644 --- a/lib_enc/cod2t32_fx.c +++ b/lib_enc/cod2t32_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/cod4t64_fx.c b/lib_enc/cod4t64_fx.c index 2afb691c1..b20c94daf 100644 --- a/lib_enc/cod4t64_fx.c +++ b/lib_enc/cod4t64_fx.c @@ -8,7 +8,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/cod_ace_fx.c b/lib_enc/cod_ace_fx.c index 222f330c8..f816a7cd8 100644 --- a/lib_enc/cod_ace_fx.c +++ b/lib_enc/cod_ace_fx.c @@ -11,7 +11,7 @@ #include "options.h" #include "rom_basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/cod_uv_fx.c b/lib_enc/cod_uv_fx.c index accb947c7..1af9e3463 100644 --- a/lib_enc/cod_uv_fx.c +++ b/lib_enc/cod_uv_fx.c @@ -7,7 +7,7 @@ #include //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/comvad_decision_fx.c b/lib_enc/comvad_decision_fx.c index 489b7861c..98816e768 100644 --- a/lib_enc/comvad_decision_fx.c +++ b/lib_enc/comvad_decision_fx.c @@ -11,7 +11,7 @@ //#include "prot_fx.h" #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" diff --git a/lib_enc/cor_shif_fx.c b/lib_enc/cor_shif_fx.c index e96d59f08..112023505 100644 --- a/lib_enc/cor_shif_fx.c +++ b/lib_enc/cor_shif_fx.c @@ -5,7 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_2div_fx.c b/lib_enc/core_enc_2div_fx.c index 6318fe62d..42236eaf8 100644 --- a/lib_enc/core_enc_2div_fx.c +++ b/lib_enc/core_enc_2div_fx.c @@ -11,7 +11,7 @@ //#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_init_fx.c b/lib_enc/core_enc_init_fx.c index 5cbc60c31..b3b305673 100644 --- a/lib_enc/core_enc_init_fx.c +++ b/lib_enc/core_enc_init_fx.c @@ -15,7 +15,7 @@ #include #include "rom_com.h" /* Common constants */ #include "prot.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_ol_fx.c b/lib_enc/core_enc_ol_fx.c index a92d1a309..781cfe1a5 100644 --- a/lib_enc/core_enc_ol_fx.c +++ b/lib_enc/core_enc_ol_fx.c @@ -10,7 +10,7 @@ #include "basop_util.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_reconf_fx.c b/lib_enc/core_enc_reconf_fx.c index e1f50ba23..b66703f88 100644 --- a/lib_enc/core_enc_reconf_fx.c +++ b/lib_enc/core_enc_reconf_fx.c @@ -9,7 +9,7 @@ #include "rom_com_fx.h" #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_switch_fx.c b/lib_enc/core_enc_switch_fx.c index 644de838f..268bd58ac 100644 --- a/lib_enc/core_enc_switch_fx.c +++ b/lib_enc/core_enc_switch_fx.c @@ -11,7 +11,7 @@ #include "ivas_cnst.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_updt_fx.c b/lib_enc/core_enc_updt_fx.c index fba6cb439..bd6f5b548 100644 --- a/lib_enc/core_enc_updt_fx.c +++ b/lib_enc/core_enc_updt_fx.c @@ -8,7 +8,7 @@ #include "cnst.h" /* Common constants */ #include "basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_switching_enc_fx.c b/lib_enc/core_switching_enc_fx.c index b4b9ea120..4494f0104 100644 --- a/lib_enc/core_switching_enc_fx.c +++ b/lib_enc/core_switching_enc_fx.c @@ -8,7 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/corr_xh_fx.c b/lib_enc/corr_xh_fx.c index c25ee1450..86ba92c7a 100644 --- a/lib_enc/corr_xh_fx.c +++ b/lib_enc/corr_xh_fx.c @@ -5,7 +5,7 @@ #include "options.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/decision_matrix_enc_fx.c b/lib_enc/decision_matrix_enc_fx.c index 413dd876e..922883ffc 100644 --- a/lib_enc/decision_matrix_enc_fx.c +++ b/lib_enc/decision_matrix_enc_fx.c @@ -10,7 +10,7 @@ #include "stat_enc.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/detect_transient_fx.c b/lib_enc/detect_transient_fx.c index b8df7d373..e21579cd0 100644 --- a/lib_enc/detect_transient_fx.c +++ b/lib_enc/detect_transient_fx.c @@ -37,7 +37,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------*/ diff --git a/lib_enc/diffcod_fx.c b/lib_enc/diffcod_fx.c index 708568261..7ff48d816 100644 --- a/lib_enc/diffcod_fx.c +++ b/lib_enc/diffcod_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Compilation switches */ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function Prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------*/ diff --git a/lib_enc/dtx_fx.c b/lib_enc/dtx_fx.c index e79b8ace1..afc6fbe38 100644 --- a/lib_enc/dtx_fx.c +++ b/lib_enc/dtx_fx.c @@ -8,7 +8,7 @@ #include "rom_com.h" // #include "basop_mpy.h" #include -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "prot.h" @@ -67,8 +67,8 @@ void dtx_ivas_fx( Encoder_State *st_fx, /* i/o: encoder state structure */ const Word32 ivas_total_brate, /* i : IVAS total bitrate */ const Word16 vad, /* i : vad flag for DTX */ - const Word16 speech[] /* i : Pointer to the speech frame */ - + const Word16 speech[] /* i : Pointer to the speech frame */ + ) { Word16 alpha; @@ -424,7 +424,7 @@ void dtx_ivas_fx( #endif // hDtxEnc->frame_ener = sum2_f( speech, L_FRAME ); Word16 guard_bits = find_guarded_bits_fx( L_FRAME ); - // Word16 Q_frame_ener = 2 * Q_speech; + // Word16 Q_frame_ener = 2 * Q_speech; hDtxEnc->frame_ener_fx = sum2_f_16_gb_fx( speech, L_FRAME, guard_bits ); // 2*Q_speech-guard_bits /* Active speech (voiced) */ diff --git a/lib_enc/enc_acelp_fx.c b/lib_enc/enc_acelp_fx.c index 5f5943ac1..a60172827 100644 --- a/lib_enc/enc_acelp_fx.c +++ b/lib_enc/enc_acelp_fx.c @@ -12,7 +12,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "rom_enc.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_acelp_tcx_main_fx.c b/lib_enc/enc_acelp_tcx_main_fx.c index 3b003e8f2..0ee3c5185 100644 --- a/lib_enc/enc_acelp_tcx_main_fx.c +++ b/lib_enc/enc_acelp_tcx_main_fx.c @@ -7,7 +7,7 @@ //#include "prot_fx.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_acelpx_fx.c b/lib_enc/enc_acelpx_fx.c index 550147215..cac1c81ed 100644 --- a/lib_enc/enc_acelpx_fx.c +++ b/lib_enc/enc_acelpx_fx.c @@ -8,7 +8,7 @@ #include "basop_util.h" #include "options.h" #include "rom_enc.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------------------* diff --git a/lib_enc/enc_amr_wb_fx.c b/lib_enc/enc_amr_wb_fx.c index 9a03bffb0..9e9bbfcc1 100644 --- a/lib_enc/enc_amr_wb_fx.c +++ b/lib_enc/enc_amr_wb_fx.c @@ -7,7 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/enc_gain_fx.c b/lib_enc/enc_gain_fx.c index dbc0e4d29..3bf3db1aa 100644 --- a/lib_enc/enc_gain_fx.c +++ b/lib_enc/enc_gain_fx.c @@ -11,7 +11,7 @@ #include "rom_com.h" #include "rom_enc.h" #include "basop_util.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ void E_GAIN_norm_corr( Word16 exc[], Word16 xn[], Word16 h[], Word16 t_min, Word16 t_max, Word16 corr_norm[], Word16 L_subfr ); diff --git a/lib_enc/enc_gen_voic_fx.c b/lib_enc/enc_gen_voic_fx.c index a1c09310f..a9699855e 100644 --- a/lib_enc/enc_gen_voic_fx.c +++ b/lib_enc/enc_gen_voic_fx.c @@ -7,7 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_gen_voic_rf_fx.c b/lib_enc/enc_gen_voic_rf_fx.c index 665cb8d45..a4d506291 100644 --- a/lib_enc/enc_gen_voic_rf_fx.c +++ b/lib_enc/enc_gen_voic_rf_fx.c @@ -11,7 +11,7 @@ #include "rom_basop_util.h" //#include "basop_mpy.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/enc_nelp_fx.c b/lib_enc/enc_nelp_fx.c index 3fae11009..4be45c7e9 100644 --- a/lib_enc/enc_nelp_fx.c +++ b/lib_enc/enc_nelp_fx.c @@ -7,7 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/enc_pit_exc_fx.c b/lib_enc/enc_pit_exc_fx.c index 5c223a033..ff8fe3c32 100644 --- a/lib_enc/enc_pit_exc_fx.c +++ b/lib_enc/enc_pit_exc_fx.c @@ -7,7 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*======================================================================*/ diff --git a/lib_enc/enc_ppp_fx.c b/lib_enc/enc_ppp_fx.c index a3ea6dcbb..d76ed191f 100644 --- a/lib_enc/enc_ppp_fx.c +++ b/lib_enc/enc_ppp_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/enc_prm_fx.c b/lib_enc/enc_prm_fx.c index 0580c786d..f59fdf08f 100644 --- a/lib_enc/enc_prm_fx.c +++ b/lib_enc/enc_prm_fx.c @@ -12,7 +12,7 @@ #include "rom_com.h" #include "stl.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_tran_fx.c b/lib_enc/enc_tran_fx.c index d9cf06004..d3127ccda 100644 --- a/lib_enc/enc_tran_fx.c +++ b/lib_enc/enc_tran_fx.c @@ -7,7 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*=================================================================================*/ diff --git a/lib_enc/enc_uv_fx.c b/lib_enc/enc_uv_fx.c index 4e11b34d2..981d02a86 100644 --- a/lib_enc/enc_uv_fx.c +++ b/lib_enc/enc_uv_fx.c @@ -7,7 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/energy_fx.c b/lib_enc/energy_fx.c index f3708d604..4bd16df2e 100644 --- a/lib_enc/energy_fx.c +++ b/lib_enc/energy_fx.c @@ -9,7 +9,7 @@ #include "rom_enc.h" #include "vad_basop.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* * est_energy_fx() diff --git a/lib_enc/eval_pit_contr_fx.c b/lib_enc/eval_pit_contr_fx.c index 349b34f0f..f1cc54606 100644 --- a/lib_enc/eval_pit_contr_fx.c +++ b/lib_enc/eval_pit_contr_fx.c @@ -7,7 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/evs_enc_fx.c b/lib_enc/evs_enc_fx.c index b2262ece7..f75547599 100644 --- a/lib_enc/evs_enc_fx.c +++ b/lib_enc/evs_enc_fx.c @@ -7,7 +7,7 @@ #include "prot.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" diff --git a/lib_enc/ext_sig_ana_fx.c b/lib_enc/ext_sig_ana_fx.c index ab3dc57bb..bb8307850 100644 --- a/lib_enc/ext_sig_ana_fx.c +++ b/lib_enc/ext_sig_ana_fx.c @@ -9,7 +9,7 @@ //#include "prot_fx.h" #include "rom_com.h" #include "basop_util.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/find_tar_fx.c b/lib_enc/find_tar_fx.c index 6b4fde721..1fb28ca97 100644 --- a/lib_enc/find_tar_fx.c +++ b/lib_enc/find_tar_fx.c @@ -4,7 +4,7 @@ #include #include "options.h" /* Compilation switches */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "cnst.h" /* Common constants */ #include "basop_util.h" diff --git a/lib_enc/find_tilt_fx.c b/lib_enc/find_tilt_fx.c index f2e57a6c4..f0c39eee2 100644 --- a/lib_enc/find_tilt_fx.c +++ b/lib_enc/find_tilt_fx.c @@ -5,7 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/find_uv_fx.c b/lib_enc/find_uv_fx.c index 41ddc0ebf..ec934ad9c 100644 --- a/lib_enc/find_uv_fx.c +++ b/lib_enc/find_uv_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/find_wsp.c b/lib_enc/find_wsp.c index 9ecbc8a48..97df5db89 100644 --- a/lib_enc/find_wsp.c +++ b/lib_enc/find_wsp.c @@ -96,32 +96,32 @@ void ivas_find_wsp( const Word16 L_frame, /* i : length of the frame */ const Word16 L_subfr, /* i : length of subframe */ const Word16 nb_subfr, /* i : number of subframes */ - const Word16 *A_fx, /* i : A(z) filter coefficients */ - Word16 *Aw_fx, /* o : weighted A(z) filter coefficients */ - const Word16 *speech_fx, /* i : pointer to the denoised speech frame */ + const Word16 *A_fx, /* i : A(z) filter coefficients */ + Word16 *Aw_fx, /* o : weighted A(z) filter coefficients */ + const Word16 *speech_fx, /* i : pointer to the denoised speech frame */ const Word16 tilt_fact, /* i : tilt factor */ - Word16 *wsp_fx, /* o : poitnter to the weighted speech frame */ - Word16 *mem_wsp_fx, /* i/o: W(Z) denominator memory */ + Word16 *wsp_fx, /* o : poitnter to the weighted speech frame */ + Word16 *mem_wsp_fx, /* i/o: W(Z) denominator memory */ const Word16 gamma, /* i : weighting factor */ - const Word16 L_look /* i : look-ahead */ + const Word16 L_look /* i : look-ahead */ ) { Word16 *p_Aw_fx, tmp_fx; Word16 i_subfr; -/*-----------------------------------------------------------------* - * Compute weighted A(z) unquantized for subframes - *-----------------------------------------------------------------*/ + /*-----------------------------------------------------------------* + * Compute weighted A(z) unquantized for subframes + *-----------------------------------------------------------------*/ weight_a_subfr_fx( nb_subfr, A_fx, Aw_fx, gamma, M ); - + /*-----------------------------------------------------------------* * Compute weighted speech for all subframes *-----------------------------------------------------------------*/ p_Aw_fx = Aw_fx; for ( i_subfr = 0; i_subfr < L_frame; i_subfr += L_subfr ) { - Residu3_fx( p_Aw_fx, &speech_fx[i_subfr], &wsp_fx[i_subfr], L_subfr,0 ); + Residu3_fx( p_Aw_fx, &speech_fx[i_subfr], &wsp_fx[i_subfr], L_subfr, 0 ); p_Aw_fx += ( M + 1 ); } p_Aw_fx -= ( M + 1 ); @@ -131,7 +131,7 @@ void ivas_find_wsp( *-----------------------------------------------------------------*/ deemph_fx( wsp_fx, tilt_fact, L_frame, mem_wsp_fx ); - Residu3_fx( p_Aw_fx, &speech_fx[L_frame], &wsp_fx[L_frame], L_look,0 ); + Residu3_fx( p_Aw_fx, &speech_fx[L_frame], &wsp_fx[L_frame], L_look, 0 ); tmp_fx = *mem_wsp_fx; deemph_fx( &wsp_fx[L_frame], tilt_fact, L_look, &tmp_fx ); return; diff --git a/lib_enc/find_wsp_fx.c b/lib_enc/find_wsp_fx.c index 06b22cc5e..de81f1921 100644 --- a/lib_enc/find_wsp_fx.c +++ b/lib_enc/find_wsp_fx.c @@ -7,7 +7,7 @@ #include "options.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/frame_spec_dif_cor_rate_fx.c b/lib_enc/frame_spec_dif_cor_rate_fx.c index c94ccedeb..c7fa5eb1c 100644 --- a/lib_enc/frame_spec_dif_cor_rate_fx.c +++ b/lib_enc/frame_spec_dif_cor_rate_fx.c @@ -10,7 +10,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/gain_enc_fx.c b/lib_enc/gain_enc_fx.c index f9576afeb..abb66a8b8 100644 --- a/lib_enc/gain_enc_fx.c +++ b/lib_enc/gain_enc_fx.c @@ -7,7 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/gaus_enc_fx.c b/lib_enc/gaus_enc_fx.c index 8f35bc6fb..57a336ec2 100644 --- a/lib_enc/gaus_enc_fx.c +++ b/lib_enc/gaus_enc_fx.c @@ -8,7 +8,7 @@ #include "rom_com.h" /* Static table prototypes */ #include "rom_enc.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ //#include "basop_mpy.h" diff --git a/lib_enc/gp_clip_fx.c b/lib_enc/gp_clip_fx.c index 3a82ddd64..73a5c35ea 100644 --- a/lib_enc/gp_clip_fx.c +++ b/lib_enc/gp_clip_fx.c @@ -37,7 +37,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/gs_enc_fx.c b/lib_enc/gs_enc_fx.c index 29f6fbb3a..e2d1f4aa9 100644 --- a/lib_enc/gs_enc_fx.c +++ b/lib_enc/gs_enc_fx.c @@ -7,7 +7,7 @@ #include "rom_com_fx.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/guided_plc_enc_fx.c b/lib_enc/guided_plc_enc_fx.c index 64694bbdc..6470e0a3c 100644 --- a/lib_enc/guided_plc_enc_fx.c +++ b/lib_enc/guided_plc_enc_fx.c @@ -7,7 +7,7 @@ #include "options.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stat_enc.h" #include "basop_util.h" diff --git a/lib_enc/hf_cod_amrwb_fx.c b/lib_enc/hf_cod_amrwb_fx.c index 170bb9408..7c2060fa8 100644 --- a/lib_enc/hf_cod_amrwb_fx.c +++ b/lib_enc/hf_cod_amrwb_fx.c @@ -8,7 +8,7 @@ #include "rom_com_fx.h" #include "cnst.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/hq_classifier_enc_fx.c b/lib_enc/hq_classifier_enc_fx.c index c72ebb8cc..842f2029e 100644 --- a/lib_enc/hq_classifier_enc_fx.c +++ b/lib_enc/hq_classifier_enc_fx.c @@ -7,7 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/hq_core_enc_fx.c b/lib_enc/hq_core_enc_fx.c index a0ca2a16d..55e37a3b5 100644 --- a/lib_enc/hq_core_enc_fx.c +++ b/lib_enc/hq_core_enc_fx.c @@ -7,7 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------------- diff --git a/lib_enc/hq_env_enc_fx.c b/lib_enc/hq_env_enc_fx.c index f995f364a..bfb983641 100644 --- a/lib_enc/hq_env_enc_fx.c +++ b/lib_enc/hq_env_enc_fx.c @@ -8,7 +8,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------------------* diff --git a/lib_enc/hq_hr_enc_fx.c b/lib_enc/hq_hr_enc_fx.c index 706304fe0..ca7d941ee 100644 --- a/lib_enc/hq_hr_enc_fx.c +++ b/lib_enc/hq_hr_enc_fx.c @@ -7,7 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_enc/hq_lr_enc_fx.c b/lib_enc/hq_lr_enc_fx.c index 414a77c97..85827b9a1 100644 --- a/lib_enc/hq_lr_enc_fx.c +++ b/lib_enc/hq_lr_enc_fx.c @@ -9,7 +9,7 @@ #include "rom_enc.h" //#include "basop_mpy.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/hvq_enc_fx.c b/lib_enc/hvq_enc_fx.c index 4d817c104..b2adfef24 100644 --- a/lib_enc/hvq_enc_fx.c +++ b/lib_enc/hvq_enc_fx.c @@ -7,7 +7,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define HVQ_ENC_NOISE_DELTA ( (Word16) 3277 ) /* 0.1 in Q15 */ diff --git a/lib_enc/igf_enc_fx.c b/lib_enc/igf_enc_fx.c index c9661e16b..1bcb7698f 100644 --- a/lib_enc/igf_enc_fx.c +++ b/lib_enc/igf_enc_fx.c @@ -9,7 +9,7 @@ #include "cnst.h" #include "stl.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stat_enc.h" #include "basop_util.h" diff --git a/lib_enc/igf_scf_enc_fx.c b/lib_enc/igf_scf_enc_fx.c index 49bfbe9da..58b835803 100644 --- a/lib_enc/igf_scf_enc_fx.c +++ b/lib_enc/igf_scf_enc_fx.c @@ -9,7 +9,7 @@ #include "stat_enc.h" #include "stat_com.h" #include "basop_util.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/init_enc_fx.c b/lib_enc/init_enc_fx.c index 13c3e06ee..a38e19b71 100644 --- a/lib_enc/init_enc_fx.c +++ b/lib_enc/init_enc_fx.c @@ -10,7 +10,7 @@ #include "stl.h" #include "ivas_cnst.h" #include "ivas_error.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/inov_enc_fx.c b/lib_enc/inov_enc_fx.c index f3e9dbfd3..bb573b1c4 100644 --- a/lib_enc/inov_enc_fx.c +++ b/lib_enc/inov_enc_fx.c @@ -8,7 +8,7 @@ #include "basop_util.h" #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/isf_enc_amr_wb_fx.c b/lib_enc/isf_enc_amr_wb_fx.c index 02bdb00ad..505d3f290 100644 --- a/lib_enc/isf_enc_amr_wb_fx.c +++ b/lib_enc/isf_enc_amr_wb_fx.c @@ -34,7 +34,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/ivas_core_pre_proc_front.c b/lib_enc/ivas_core_pre_proc_front.c index 39530d87e..239e57cfc 100644 --- a/lib_enc/ivas_core_pre_proc_front.c +++ b/lib_enc/ivas_core_pre_proc_front.c @@ -919,7 +919,7 @@ ivas_error pre_proc_front_ivas_fx( float sp_div, PS[128]; /* speech/music clasif. parameters */ int16_t L_look; /* length of look-ahead */ #if 1 - float snr_sum_he; /* HE SAD parameters */ + float snr_sum_he; /* HE SAD parameters */ #endif float mem_decim_dummy[2 * L_FILT_MAX]; /* dummy decimation filter memory */ float temp1F_icatdmResampBuf[L_FILT_MAX]; /* temp buffers for ICA TDM resamplers */ @@ -961,8 +961,8 @@ ivas_error pre_proc_front_ivas_fx( Word16 *temp1F_icatdmResampBuf_fx; Word16 *old_inp_12k8_fx; Word16 *old_inp_16k_fx; - Word16 *mem_decim_dummy_fx; /* dummy decimation filter memory */ - Word32 Etot_fx; /* total energy */ + Word16 *mem_decim_dummy_fx; /* dummy decimation filter memory */ + Word32 Etot_fx; /* total energy */ #if 0 Word32 fr_bands_fx[2 * NB_BANDS]; /* energy in frequency bands */ Word16 Q_new; @@ -1353,7 +1353,7 @@ ivas_error pre_proc_front_ivas_fx( { mvr2r( new_inp_12k8, st->buf_speech_enc_flt + L_FRAME32k, L_FRAME ); } -#ifndef MSAN_FIX/*To be enabled when updations related to new_inp_12k8_fx is enabled */ +#ifndef MSAN_FIX /*To be enabled when updations related to new_inp_12k8_fx is enabled */ #if 1 IF( EQ_16( element_mode, IVAS_CPE_DFT ) ) { @@ -1729,7 +1729,7 @@ ivas_error pre_proc_front_ivas_fx( st->lt_mean_NB_fx = (Word16) st->lt_mean_NB * ( 1 << 11 ); st->lt_mean_WB_fx = (Word16) st->lt_mean_WB * ( 1 << 11 ); st->lt_mean_SWB_fx = (Word16) st->lt_mean_SWB * ( 1 << 11 ); - st->lp_noise_fx = (Word16) st->lp_noise * ( 1 << 8 ); //have taken Q8 as above one functions uses Q8 + st->lp_noise_fx = (Word16) st->lp_noise * ( 1 << 8 ); // have taken Q8 as above one functions uses Q8 #endif bw_detect_fx( st, st->input_fx, NULL, enerBuffer_fx, sf_energySum, ivas_format, 0 ); diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc.c index 1aa7a85c3..eea3314d8 100644 --- a/lib_enc/ivas_ism_dtx_enc.c +++ b/lib_enc/ivas_ism_dtx_enc.c @@ -154,7 +154,7 @@ Word16 ivas_ism_dtx_enc_fx( test(); test(); - if( GT_16( lp_noise_mean_fx, ( 50 << 8 ) ) || ( GT_16( lp_noise_mean_fx, ( 25 << 8 ) ) && GT_16( lp_noise_variation_fx, ( 32 << 8 ) ) ) ) + if ( GT_16( lp_noise_mean_fx, ( 50 << 8 ) ) || ( GT_16( lp_noise_mean_fx, ( 25 << 8 ) ) && GT_16( lp_noise_variation_fx, ( 32 << 8 ) ) ) ) { dtx_flag = 0; move16(); @@ -172,11 +172,11 @@ Word16 ivas_ism_dtx_enc_fx( test(); test(); test(); - if( !( ( EQ_16( nchan_ism, 1 ) && LE_32( ivas_total_brate, IVAS_24k4 ) ) || - ( EQ_16( nchan_ism, 2 ) && LE_32( ivas_total_brate, IVAS_48k ) ) || - ( EQ_16( nchan_ism, 3 ) && LE_32( ivas_total_brate, IVAS_80k ) ) || - ( EQ_16( nchan_ism, 4 ) && LE_32( ivas_total_brate, IVAS_96k ) ) || - LT_16( lp_noise_max_fx, ( 15 << 8 ) ) ) ) + if ( !( ( EQ_16( nchan_ism, 1 ) && LE_32( ivas_total_brate, IVAS_24k4 ) ) || + ( EQ_16( nchan_ism, 2 ) && LE_32( ivas_total_brate, IVAS_48k ) ) || + ( EQ_16( nchan_ism, 3 ) && LE_32( ivas_total_brate, IVAS_80k ) ) || + ( EQ_16( nchan_ism, 4 ) && LE_32( ivas_total_brate, IVAS_96k ) ) || + LT_16( lp_noise_max_fx, ( 15 << 8 ) ) ) ) { dtx_flag = 0; move16(); @@ -208,13 +208,13 @@ Word16 ivas_ism_dtx_enc_fx( /* check difference between current and last metadata */ md_diff_flag[ch] = 0; move16(); - if( GT_32( L_abs( L_sub( hIsmMeta[ch]->azimuth_fx, hIsmMeta[ch]->last_azimuth_fx ) ), MD_MAX_DIFF_AZIMUTH_FX ) ) + if ( GT_32( L_abs( L_sub( hIsmMeta[ch]->azimuth_fx, hIsmMeta[ch]->last_azimuth_fx ) ), MD_MAX_DIFF_AZIMUTH_FX ) ) { md_diff_flag[ch] = 1; move16(); } - if( GT_32( L_abs( L_sub( hIsmMeta[ch]->elevation_fx, hIsmMeta[ch]->last_elevation_fx ) ), MD_MAX_DIFF_ELEVATION_FX ) ) + if ( GT_32( L_abs( L_sub( hIsmMeta[ch]->elevation_fx, hIsmMeta[ch]->last_elevation_fx ) ), MD_MAX_DIFF_ELEVATION_FX ) ) { md_diff_flag[ch] = 1; move16(); @@ -235,7 +235,7 @@ Word16 ivas_ism_dtx_enc_fx( move16(); nBits_MD_max = sub( nBits_MD_max, SID_FORMAT_NBITS ); - if( GT_16( nchan_transport, 1 ) ) + if ( GT_16( nchan_transport, 1 ) ) { nBits_MD_max = sub( nBits_MD_max, nBits_sce_id ); } @@ -245,13 +245,13 @@ Word16 ivas_ism_dtx_enc_fx( nBits_MD_max = sub( nBits_MD_max, nBits_coh ); /* coherence */ } - if( GT_16( nchan_ism, 3 ) ) + if ( GT_16( nchan_ism, 3 ) ) { nBits_MD_max = sub( nBits_MD_max, 1 ); /* ism_mode flag */ } /* too many metadata bits -> switch to active coding */ - if( GT_16( nBits, nBits_MD_max ) ) + if ( GT_16( nBits, nBits_MD_max ) ) { dtx_flag = 0; move16(); @@ -717,7 +717,7 @@ void ivas_ism_coh_estim_dtx_enc_fx( { norm_inp = norm_l( st_id0->input32_fx[i] ); scaled_inp = L_shl( st_id0->input32_fx[i], norm_inp ); - tot_exp = shl( sub( 20, norm_inp), 1 ); + tot_exp = shl( sub( 20, norm_inp ), 1 ); acorr_ene_fx[hISMDTX->sce_id_dtx] = BASOP_Util_Add_Mant32Exp( acorr_ene_fx[hISMDTX->sce_id_dtx], acorr_ene_e[hISMDTX->sce_id_dtx], Mult_32_32( scaled_inp, scaled_inp ), tot_exp, &acorr_ene_e[hISMDTX->sce_id_dtx] ); move32(); } @@ -744,7 +744,7 @@ void ivas_ism_coh_estim_dtx_enc_fx( { norm_inp = norm_l( st->input32_fx[i] ); scaled_inp = L_shl( st->input32_fx[i], norm_inp ); - tot_exp = shl( sub( 20, norm_inp), 1 ); + tot_exp = shl( sub( 20, norm_inp ), 1 ); acorr_ene_fx[sce_id] = BASOP_Util_Add_Mant32Exp( acorr_ene_fx[sce_id], acorr_ene_e[sce_id], Mult_32_32( scaled_inp, scaled_inp ), tot_exp, &acorr_ene_e[sce_id] ); move32(); xcorr_ene_fx = BASOP_Util_Add_Mant32Exp( xcorr_ene_fx, xcorr_ene_e, Mult_32_32( scaled_inp, scaled_inp ), tot_exp, &xcorr_ene_e ); diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc.c index 43cc16ecc..7e51c82bf 100644 --- a/lib_enc/ivas_ism_enc.c +++ b/lib_enc/ivas_ism_enc.c @@ -203,12 +203,12 @@ ivas_error ivas_ism_enc( /* compute the dominant sce_id using long term energy */ #ifdef IVAS_FLOAT_FIXED #if 1 /************************flt_to_fix****************************/ - for( int j = 0; j < st_ivas->nchan_transport; j++ ) + for ( int j = 0; j < st_ivas->nchan_transport; j++ ) { - floatToFixed_arrL( st_ivas->hSCE[j]->hCoreCoder[0]->input, st_ivas->hSCE[j]->hCoreCoder[0]->input32_fx, Q11, input_frame ); /*Q0*/ + floatToFixed_arrL( st_ivas->hSCE[j]->hCoreCoder[0]->input, st_ivas->hSCE[j]->hCoreCoder[0]->input32_fx, Q11, input_frame ); /*Q0*/ } f2me_buf( &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc[0][0], &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_fx[0][0], &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_e, st_ivas->nchan_transport * PARAM_ISM_HYS_BUF_SIZE ); - for( int ch = 0; ch < nchan_ism; ch++ ) + for ( int ch = 0; ch < nchan_ism; ch++ ) { st_ivas->hIsmMetaData[ch]->azimuth_fx = float_to_fix( st_ivas->hIsmMetaData[ch]->azimuth, Q22 ); st_ivas->hIsmMetaData[ch]->last_azimuth_fx = float_to_fix( st_ivas->hIsmMetaData[ch]->last_azimuth, Q22 ); @@ -223,15 +223,15 @@ ivas_error ivas_ism_enc( #endif /****************************ends here*********************************/ ivas_ism_get_sce_id_dtx_fx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame ); dtx_flag = ivas_ism_dtx_enc_fx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->hEncoderConfig->ivas_total_brate, nchan_ism, st_ivas->nchan_transport, vad_flag, st_ivas->hIsmMetaData, md_diff_flag, &sid_flag ); - IF ( sid_flag ) + IF( sid_flag ) { /* estimate coherence between objects */ ivas_ism_coh_estim_dtx_enc_fx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame ); } #if 1 /************************fix_to_flt****************************/ - me2f_buf(&st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_fx[0][0], st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_e, &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc[0][0], st_ivas->nchan_transport * PARAM_ISM_HYS_BUF_SIZE); + me2f_buf( &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_fx[0][0], st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc_e, &st_ivas->hISMDTX->long_term_energy_stereo_dmx_enc[0][0], st_ivas->nchan_transport * PARAM_ISM_HYS_BUF_SIZE ); fixedToFloat_arr( st_ivas->hISMDTX->coh_fx, st_ivas->hISMDTX->coh, Q15, st_ivas->nchan_transport ); -#endif/****************************ends here*********************************/ +#endif /****************************ends here*********************************/ #else ivas_ism_get_sce_id_dtx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame ); diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c index 49ba2e480..3bf1bb5c8 100644 --- a/lib_enc/ivas_ism_metadata_enc.c +++ b/lib_enc/ivas_ism_metadata_enc.c @@ -1646,15 +1646,15 @@ ivas_error ivas_ism_metadata_enc_create( st_ivas->hIsmMetaData[ch]->last_true_radius_fx = ONE_IN_Q9; /*===============fix-to-flt====================*/ - st_ivas->hIsmMetaData[ch]->last_azimuth = fix_to_float(st_ivas->hIsmMetaData[ch]->last_azimuth_fx, Q22); - st_ivas->hIsmMetaData[ch]->last_elevation = fix_to_float(st_ivas->hIsmMetaData[ch]->last_elevation_fx, Q22); + st_ivas->hIsmMetaData[ch]->last_azimuth = fix_to_float( st_ivas->hIsmMetaData[ch]->last_azimuth_fx, Q22 ); + st_ivas->hIsmMetaData[ch]->last_elevation = fix_to_float( st_ivas->hIsmMetaData[ch]->last_elevation_fx, Q22 ); - st_ivas->hIsmMetaData[ch]->last_true_azimuth = fix_to_float(st_ivas->hIsmMetaData[ch]->last_true_azimuth_fx, Q22); - st_ivas->hIsmMetaData[ch]->last_true_elevation = fix_to_float(st_ivas->hIsmMetaData[ch]->last_true_elevation_fx, Q22); - st_ivas->hIsmMetaData[ch]->last_true_radius = fix16_to_float(st_ivas->hIsmMetaData[ch]->last_true_radius_fx, Q9); + st_ivas->hIsmMetaData[ch]->last_true_azimuth = fix_to_float( st_ivas->hIsmMetaData[ch]->last_true_azimuth_fx, Q22 ); + st_ivas->hIsmMetaData[ch]->last_true_elevation = fix_to_float( st_ivas->hIsmMetaData[ch]->last_true_elevation_fx, Q22 ); + st_ivas->hIsmMetaData[ch]->last_true_radius = fix16_to_float( st_ivas->hIsmMetaData[ch]->last_true_radius_fx, Q9 ); /*===============fix-to-flt====================*/ } - + IF( EQ_16( st_ivas->hEncoderConfig->ivas_format, MASA_ISM_FORMAT ) ) { test(); diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c index 56b4d4f7d..eed03579e 100644 --- a/lib_enc/ivas_ism_param_enc.c +++ b/lib_enc/ivas_ism_param_enc.c @@ -555,14 +555,14 @@ void ivas_param_ism_compute_noisy_speech_flag( Word16 i; /* Move the Noisy speech buffer */ - FOR ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) + FOR( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) { st_ivas->hParamIsm->noisy_speech_buffer[i] = st_ivas->hParamIsm->noisy_speech_buffer[i + 1]; move16(); } /* Set flag_noisy_speech to 0 for cases where object energies are not roughly equal */ - IF ( !st_ivas->hParamIsm->flag_equal_energy ) + IF( !st_ivas->hParamIsm->flag_equal_energy ) { st_ivas->hParamIsm->noisy_speech_buffer[i] = 0; st_ivas->hParamIsm->flag_noisy_speech = 0; @@ -573,10 +573,10 @@ void ivas_param_ism_compute_noisy_speech_flag( { /* For the current frame, make a decision based on some core-coder flags */ test(); - IF ( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr ) + IF( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr ) { test(); - IF ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) + IF( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) { st_ivas->hParamIsm->noisy_speech_buffer[i] = 0; move16(); @@ -596,7 +596,7 @@ void ivas_param_ism_compute_noisy_speech_flag( /* Do a decision based on hysteresis */ st_ivas->hParamIsm->flag_noisy_speech = 1; move16(); - FOR ( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ ) + FOR( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ ) { test(); st_ivas->hParamIsm->flag_noisy_speech = st_ivas->hParamIsm->flag_noisy_speech && st_ivas->hParamIsm->noisy_speech_buffer[i]; diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc.c index 0588844fb..3a49e4aae 100644 --- a/lib_enc/ivas_mcmasa_enc.c +++ b/lib_enc/ivas_mcmasa_enc.c @@ -1025,21 +1025,21 @@ void ivas_mcmasa_param_est_enc( Word16 x1_q_fx[MASA_FREQUENCY_BANDS]; Word16 x2_q_fx[MASA_FREQUENCY_BANDS]; Word16 y_q_fx[MASA_FREQUENCY_BANDS]; - FOR(i = 0; i < num_freq_bands; i++) + FOR( i = 0; i < num_freq_bands; i++ ) { - x1_q_fx[i] = Q_factor_L(diffuseness_vector[i]); - x1_fx[i] = (Word32)(diffuseness_vector[i] * (W_shl(1, x1_q_fx[i]))); - x2_q_fx[i] = Q_factor_L(vertical_diffuseness_vector[i]); - x2_fx[i] = (Word32)(vertical_diffuseness_vector[i] * (W_shl(1, x2_q_fx[i]))); + x1_q_fx[i] = Q_factor_L( diffuseness_vector[i] ); + x1_fx[i] = (Word32) ( diffuseness_vector[i] * ( W_shl( 1, x1_q_fx[i] ) ) ); + x2_q_fx[i] = Q_factor_L( vertical_diffuseness_vector[i] ); + x2_fx[i] = (Word32) ( vertical_diffuseness_vector[i] * ( W_shl( 1, x2_q_fx[i] ) ) ); } ///////////////////////////////////////////////////////////////////////// - v_min_fx((const Word32 *)x1_fx, x1_q_fx, (const Word32 *)x2_fx, x2_q_fx, y_fx, y_q_fx, num_freq_bands ); + v_min_fx( (const Word32 *) x1_fx, x1_q_fx, (const Word32 *) x2_fx, x2_q_fx, y_fx, y_q_fx, num_freq_bands ); //////////////////////// to be removed //////////////////////////////// - FOR(i = 0; i < num_freq_bands; i++) + FOR( i = 0; i < num_freq_bands; i++ ) { - diffuseness_vector[i] = (Float32)y_fx[i] / (W_shl(1, y_q_fx[i])); + diffuseness_vector[i] = (Float32) y_fx[i] / ( W_shl( 1, y_q_fx[i] ) ); } /////////////////////////////////////////////////////////////////////// #else diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index b28abea78..22d07cf28 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -233,7 +233,7 @@ void stereo_classifier_init( hStereoClassif->nchar_ch2 = 0.0f; hStereoClassif->non_sta_ch1 = 0.0f; hStereoClassif->sp_div_ch1 = 0.0f; - + #ifdef IVAS_FLOAT_FIXED hStereoClassif->ps_diff_ch1_fx = 0; hStereoClassif->ps_diff_ch2_fx = 0; diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc.c index 4068c17ef..86715a6ce 100644 --- a/lib_enc/ivas_stereo_mdct_core_enc.c +++ b/lib_enc/ivas_stereo_mdct_core_enc.c @@ -470,8 +470,8 @@ void stereo_mdct_core_enc( if ( !hStereoMdct->isSBAStereoMode ) { #ifdef IVAS_FLOAT_FIXED - IF(hStereoMdct->hItd) - hStereoMdct->hItd->itd_fx[1] = float_to_fix(hStereoMdct->hItd->itd[1], Q23); + IF( hStereoMdct->hItd ) + hStereoMdct->hItd->itd_fx[1] = float_to_fix( hStereoMdct->hItd->itd[1], Q23 ); #endif stereo_bits = write_stereo_to_bitstream( hStereoMdct, sts, ms_mask, 0, hBstr ); } @@ -488,16 +488,16 @@ void stereo_mdct_core_enc( FindSplitRatio( hCPE, sts ); #else #if 1 - FOR( ch = 0; ch < CPE_CHANNELS; ch++) + FOR( ch = 0; ch < CPE_CHANNELS; ch++ ) { - L_subframeTCX = sts[ch]->hTcxEnc->L_frameTCX / (( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV); - IF(sts[ch]->last_core == ACELP_CORE) + L_subframeTCX = sts[ch]->hTcxEnc->L_frameTCX / ( ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV ); + IF( sts[ch]->last_core == ACELP_CORE ) { L_subframeTCX += L_subframeTCX / 4; } - FOR ( n = 0; n <= (( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV) - 1; n++ ) + FOR( n = 0; n <= ( ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV ) - 1; n++ ) { - f2me_buf(sts[ch]->hTcxEnc->spectrum[n], sts[ch]->hTcxEnc->spectrum_fx[n], &sts[ch]->hTcxEnc->spectrum_e[n], L_subframeTCX); + f2me_buf( sts[ch]->hTcxEnc->spectrum[n], sts[ch]->hTcxEnc->spectrum_fx[n], &sts[ch]->hTcxEnc->spectrum_e[n], L_subframeTCX ); } } #endif diff --git a/lib_enc/lead_indexing_fx.c b/lib_enc/lead_indexing_fx.c index 282bdf5fb..ff2933014 100644 --- a/lib_enc/lead_indexing_fx.c +++ b/lib_enc/lead_indexing_fx.c @@ -7,7 +7,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index 73ae64a70..230c58c44 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -481,11 +481,11 @@ ivas_error IVAS_ENC_FeedObjectMetadata( error = ivas_set_ism_metadata_fx( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], azimuth_fx, elevation_fx, radius_fx, yaw_fx, pitch_fx, metadata.non_diegetic_flag ); /*================fix-to-flt====================*/ - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->azimuth = fix_to_float(azimuth_fx, Q22); - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->elevation = fix_to_float(elevation_fx, Q22); - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->radius = fix_to_float(radius_fx, Q9); - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->yaw = fix_to_float(yaw_fx, Q22); - hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->pitch = fix_to_float(pitch_fx, Q22); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->azimuth = fix_to_float( azimuth_fx, Q22 ); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->elevation = fix_to_float( elevation_fx, Q22 ); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->radius = fix_to_float( radius_fx, Q9 ); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->yaw = fix_to_float( yaw_fx, Q22 ); + hIvasEnc->st_ivas->hIsmMetaData[ismIndex]->pitch = fix_to_float( pitch_fx, Q22 ); /*================fix-to-flt====================*/ #else error = ivas_set_ism_metadata( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth, metadata.elevation, metadata.radius, metadata.yaw, metadata.pitch, metadata.non_diegetic_flag ); diff --git a/lib_enc/long_enr_fx.c b/lib_enc/long_enr_fx.c index 3f0d5e792..cc6291cee 100644 --- a/lib_enc/long_enr_fx.c +++ b/lib_enc/long_enr_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" #include "stl.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ @@ -17,14 +17,14 @@ *-------------------------------------------------------------------*/ #ifdef IVAS_FLOAT_FIXED void ivas_long_enr_fx( - Encoder_State *st_fx, /* i/o: state structure */ - const Word16 Etot, /* i : total channel E (see lib_enc\analy_sp.c) */ - const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */ - Word16 high_lpn_flag, /* i : sp/mus LPN flag */ - FRONT_VAD_ENC_HANDLE hFrontVad[], /* i/o: front-VAD handles */ - const Word16 n_chan, /* i : number of channels */ + Encoder_State *st_fx, /* i/o: state structure */ + const Word16 Etot, /* i : total channel E (see lib_enc\analy_sp.c) */ + const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */ + Word16 high_lpn_flag, /* i : sp/mus LPN flag */ + FRONT_VAD_ENC_HANDLE hFrontVad[], /* i/o: front-VAD handles */ + const Word16 n_chan, /* i : number of channels */ const Word16 localVAD_HE_SAD_LR[], /* i : HE-SAD flag without hangover LR channels */ - const Word16 Etot_LR[] /* i : total channel energy LR channels */ + const Word16 Etot_LR[] /* i : total channel energy LR channels */ ) { @@ -37,16 +37,16 @@ void ivas_long_enr_fx( * and total active speech energy *-----------------------------------------------------------------*/ Word16 n; - IF ( hFrontVad != NULL ) + IF( hFrontVad != NULL ) { - IF ( LT_16(hFrontVad[0]->ini_frame , 4) ) + IF( LT_16( hFrontVad[0]->ini_frame, 4 ) ) { - FOR ( n = 0; n < n_chan; n++ ) + FOR( n = 0; n < n_chan; n++ ) { hFrontVad[n]->lp_noise_fx = hFrontVad[n]->hNoiseEst->totalNoise_fx; tmp = add( hFrontVad[n]->lp_noise_fx, 2560 ); - IF ( LT_16(hFrontVad[n]->lp_speech_fx , tmp )) + IF( LT_16( hFrontVad[n]->lp_speech_fx, tmp ) ) { hFrontVad[n]->lp_speech_fx = tmp; move16(); @@ -57,7 +57,7 @@ void ivas_long_enr_fx( { Word16 smooth_prev, smooth_curr; - IF ( LT_16(hFrontVad[0]->ini_frame , 150) ) + IF( LT_16( hFrontVad[0]->ini_frame, 150 ) ) { smooth_prev = 31130; smooth_curr = 1638; @@ -68,24 +68,24 @@ void ivas_long_enr_fx( smooth_curr = 655; } - FOR ( n = 0; n < n_chan; n++ ) + FOR( n = 0; n < n_chan; n++ ) { - hFrontVad[n]->lp_noise_fx = add(mult_r(smooth_prev , hFrontVad[n]->lp_noise_fx) , mult_r(smooth_curr , hFrontVad[n]->hNoiseEst->totalNoise_fx)); + hFrontVad[n]->lp_noise_fx = add( mult_r( smooth_prev, hFrontVad[n]->lp_noise_fx ), mult_r( smooth_curr, hFrontVad[n]->hNoiseEst->totalNoise_fx ) ); - IF ( localVAD_HE_SAD_LR[n] && !high_lpn_flag ) + IF( localVAD_HE_SAD_LR[n] && !high_lpn_flag ) { - IF ( LT_16(sub( hFrontVad[n]->lp_speech_fx , Etot_LR[n] ) , 2560) ) + IF( LT_16( sub( hFrontVad[n]->lp_speech_fx, Etot_LR[n] ), 2560 ) ) { - hFrontVad[n]->lp_speech_fx = add(mult_r(32113 , hFrontVad[n]->lp_speech_fx) , mult_r(655 , Etot_LR[n])); + hFrontVad[n]->lp_speech_fx = add( mult_r( 32113, hFrontVad[n]->lp_speech_fx ), mult_r( 655, Etot_LR[n] ) ); } ELSE { - hFrontVad[n]->lp_speech_fx = sub(hFrontVad[n]->lp_speech_fx , 13); + hFrontVad[n]->lp_speech_fx = sub( hFrontVad[n]->lp_speech_fx, 13 ); } } } } - FOR ( n = 0; n < n_chan; n++ ) + FOR( n = 0; n < n_chan; n++ ) { hFrontVad[n]->hNoiseEst->Etot_last_fx = Etot_LR[n]; move16(); diff --git a/lib_enc/lp_exc_e_fx.c b/lib_enc/lp_exc_e_fx.c index 206e7435c..9562eabf8 100644 --- a/lib_enc/lp_exc_e_fx.c +++ b/lib_enc/lp_exc_e_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/lsf_enc_fx.c b/lib_enc/lsf_enc_fx.c index 97aef1cc7..3a4632797 100644 --- a/lib_enc/lsf_enc_fx.c +++ b/lib_enc/lsf_enc_fx.c @@ -8,7 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "ivas_prot_fx.h" /* Function prototypes */ diff --git a/lib_enc/lsf_msvq_ma_enc_fx.c b/lib_enc/lsf_msvq_ma_enc_fx.c index 4d0cce641..fdb1ab0fc 100644 --- a/lib_enc/lsf_msvq_ma_enc_fx.c +++ b/lib_enc/lsf_msvq_ma_enc_fx.c @@ -11,7 +11,7 @@ #include "rom_com.h" #include "rom_enc.h" #include "basop_util.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/ltd_stable_fx.c b/lib_enc/ltd_stable_fx.c index 0da80653f..500620273 100644 --- a/lib_enc/ltd_stable_fx.c +++ b/lib_enc/ltd_stable_fx.c @@ -9,7 +9,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/mdct_classifier_fx.c b/lib_enc/mdct_classifier_fx.c index a34ff46b4..dc938766b 100644 --- a/lib_enc/mdct_classifier_fx.c +++ b/lib_enc/mdct_classifier_fx.c @@ -7,7 +7,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_enc/mdct_selector_fx.c b/lib_enc/mdct_selector_fx.c index 88b3d1f04..bb9de2fb9 100644 --- a/lib_enc/mdct_selector_fx.c +++ b/lib_enc/mdct_selector_fx.c @@ -7,7 +7,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/mslvq_enc_fx.c b/lib_enc/mslvq_enc_fx.c index c951eac70..c5a3e6bb7 100644 --- a/lib_enc/mslvq_enc_fx.c +++ b/lib_enc/mslvq_enc_fx.c @@ -9,7 +9,7 @@ #include "stl.h" #include "prot.h" /* Function prototypes */ #include "basop32.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/multi_harm_fx.c b/lib_enc/multi_harm_fx.c index 084f81c8f..2611fec4b 100644 --- a/lib_enc/multi_harm_fx.c +++ b/lib_enc/multi_harm_fx.c @@ -5,7 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/nelp_enc_fx.c b/lib_enc/nelp_enc_fx.c index 6cd309d08..576a9ea20 100644 --- a/lib_enc/nelp_enc_fx.c +++ b/lib_enc/nelp_enc_fx.c @@ -32,9 +32,9 @@ #include #include "control.h" -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com.h" diff --git a/lib_enc/nois_est_fx.c b/lib_enc/nois_est_fx.c index bc5f2790f..bf4637666 100644 --- a/lib_enc/nois_est_fx.c +++ b/lib_enc/nois_est_fx.c @@ -8,7 +8,7 @@ #include "cnst.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/noise_adjust_fx.c b/lib_enc/noise_adjust_fx.c index adfd407b7..1a2e204ae 100644 --- a/lib_enc/noise_adjust_fx.c +++ b/lib_enc/noise_adjust_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_enc/normalizecoefs_fx.c b/lib_enc/normalizecoefs_fx.c index 4fb461c65..f6f5eedee 100644 --- a/lib_enc/normalizecoefs_fx.c +++ b/lib_enc/normalizecoefs_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "basop_mpy.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/peak_vq_enc_fx.c b/lib_enc/peak_vq_enc_fx.c index 37090b922..5a1fe61d1 100644 --- a/lib_enc/peak_vq_enc_fx.c +++ b/lib_enc/peak_vq_enc_fx.c @@ -10,7 +10,7 @@ #include "rom_enc.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------------- diff --git a/lib_enc/pit_enc_fx.c b/lib_enc/pit_enc_fx.c index 9c1a80d6f..6bcf678a1 100644 --- a/lib_enc/pit_enc_fx.c +++ b/lib_enc/pit_enc_fx.c @@ -10,7 +10,7 @@ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_basop_util.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define inv_T0_res InvIntTable diff --git a/lib_enc/pitch_ol2_fx.c b/lib_enc/pitch_ol2_fx.c index 73fdde952..f5352b75b 100644 --- a/lib_enc/pitch_ol2_fx.c +++ b/lib_enc/pitch_ol2_fx.c @@ -9,7 +9,7 @@ #include "rom_com.h" /* Encoder static table prototypes */ #include "rom_dec.h" //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/pitch_ol_fx.c b/lib_enc/pitch_ol_fx.c index 8a1a7c753..a43bdd82f 100644 --- a/lib_enc/pitch_ol_fx.c +++ b/lib_enc/pitch_ol_fx.c @@ -10,7 +10,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "rom_enc.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/plc_enc_ext_fx.c b/lib_enc/plc_enc_ext_fx.c index 0a451f757..56598be2f 100644 --- a/lib_enc/plc_enc_ext_fx.c +++ b/lib_enc/plc_enc_ext_fx.c @@ -9,7 +9,7 @@ #include "stat_enc.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/ppp_enc_fx.c b/lib_enc/ppp_enc_fx.c index 82657654c..bfe64e343 100644 --- a/lib_enc/ppp_enc_fx.c +++ b/lib_enc/ppp_enc_fx.c @@ -8,7 +8,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/pre_proc_fx.c b/lib_enc/pre_proc_fx.c index 3cc9a733a..cfaea3113 100644 --- a/lib_enc/pre_proc_fx.c +++ b/lib_enc/pre_proc_fx.c @@ -8,7 +8,7 @@ #include "rom_com_fx.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/pvq_core_enc_fx.c b/lib_enc/pvq_core_enc_fx.c index dce290b45..e87ae006f 100644 --- a/lib_enc/pvq_core_enc_fx.c +++ b/lib_enc/pvq_core_enc_fx.c @@ -8,7 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/pvq_encode_fx.c b/lib_enc/pvq_encode_fx.c index 9faaf9ed5..1cee445e0 100644 --- a/lib_enc/pvq_encode_fx.c +++ b/lib_enc/pvq_encode_fx.c @@ -5,7 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com_fx.h" #include "rom_com.h" diff --git a/lib_enc/q_gain2p_fx.c b/lib_enc/q_gain2p_fx.c index a2f2c93da..8bfdcb588 100644 --- a/lib_enc/q_gain2p_fx.c +++ b/lib_enc/q_gain2p_fx.c @@ -10,7 +10,7 @@ #include "basop_util.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/qlpc_avq_fx.c b/lib_enc/qlpc_avq_fx.c index 1c28210ad..2740eac14 100644 --- a/lib_enc/qlpc_avq_fx.c +++ b/lib_enc/qlpc_avq_fx.c @@ -9,7 +9,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/qlpc_stoch_fx.c b/lib_enc/qlpc_stoch_fx.c index 042a7f9f3..dab87e3b3 100644 --- a/lib_enc/qlpc_stoch_fx.c +++ b/lib_enc/qlpc_stoch_fx.c @@ -11,7 +11,7 @@ #include "rom_com_fx.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_enc/range_enc_fx.c b/lib_enc/range_enc_fx.c index 4f8c5c905..b05b2cf99 100644 --- a/lib_enc/range_enc_fx.c +++ b/lib_enc/range_enc_fx.c @@ -9,7 +9,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/re8_cod_fx.c b/lib_enc/re8_cod_fx.c index e3c084c4b..e035baf57 100644 --- a/lib_enc/re8_cod_fx.c +++ b/lib_enc/re8_cod_fx.c @@ -5,7 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*------------------------------------------------------------------------ diff --git a/lib_enc/reordernorm_fx.c b/lib_enc/reordernorm_fx.c index ceb9d8d6f..40f12ffb8 100644 --- a/lib_enc/reordernorm_fx.c +++ b/lib_enc/reordernorm_fx.c @@ -8,7 +8,7 @@ #include "rom_com_fx.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------*/ diff --git a/lib_enc/rst_enc_fx.c b/lib_enc/rst_enc_fx.c index 938efc631..85821ef0b 100644 --- a/lib_enc/rst_enc_fx.c +++ b/lib_enc/rst_enc_fx.c @@ -7,7 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_enc/scale_enc_fx.c b/lib_enc/scale_enc_fx.c index 22e79e310..cfb3568bb 100644 --- a/lib_enc/scale_enc_fx.c +++ b/lib_enc/scale_enc_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_enc/set_impulse_fx.c b/lib_enc/set_impulse_fx.c index 7243d9a72..f9efcacca 100644 --- a/lib_enc/set_impulse_fx.c +++ b/lib_enc/set_impulse_fx.c @@ -7,7 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/setmodeindex_fx.c b/lib_enc/setmodeindex_fx.c index 2a2fcf7e9..dff13ec89 100644 --- a/lib_enc/setmodeindex_fx.c +++ b/lib_enc/setmodeindex_fx.c @@ -8,7 +8,7 @@ #include "cnst.h" #include "rom_com_fx.h" #include "rom_enc.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------- diff --git a/lib_enc/sig_clas_fx.c b/lib_enc/sig_clas_fx.c index a80f2865f..a0ef0caf4 100644 --- a/lib_enc/sig_clas_fx.c +++ b/lib_enc/sig_clas_fx.c @@ -7,7 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_enc/spec_center_fx.c b/lib_enc/spec_center_fx.c index 5c088ca97..920da568d 100644 --- a/lib_enc/spec_center_fx.c +++ b/lib_enc/spec_center_fx.c @@ -8,7 +8,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_enc.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/spec_flatness_fx.c b/lib_enc/spec_flatness_fx.c index 33337bb7a..271f7ba1b 100644 --- a/lib_enc/spec_flatness_fx.c +++ b/lib_enc/spec_flatness_fx.c @@ -9,7 +9,7 @@ #include "basop_util.h" #include "vad_basop.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/speech_music_classif.c b/lib_enc/speech_music_classif.c index 38fc00649..8df503bd1 100644 --- a/lib_enc/speech_music_classif.c +++ b/lib_enc/speech_music_classif.c @@ -136,8 +136,8 @@ void speech_music_clas_init( { hSpMusClas->prev_FV[i] = 0.5f * hout_intervals[2 * i] + 0.5f * hout_intervals[2 * i + 1]; #ifdef IVAS_FLOAT_FIXED - hSpMusClas->prev_FV_fx[i] =( Word32)( hSpMusClas->prev_FV[i] * ONE_IN_Q20 ); - #endif + hSpMusClas->prev_FV_fx[i] = (Word32) ( hSpMusClas->prev_FV[i] * ONE_IN_Q20 ); +#endif } for ( i = 0; i < NB_BANDS_SPMUS; i++ ) diff --git a/lib_enc/speech_music_classif_fx.c b/lib_enc/speech_music_classif_fx.c index cfb9ac57c..1606ba3d7 100644 --- a/lib_enc/speech_music_classif_fx.c +++ b/lib_enc/speech_music_classif_fx.c @@ -11,7 +11,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include @@ -3021,7 +3021,7 @@ static void flux_fx( #ifdef BASOP_NOGLOB L_flux = L_add_sat( L_flux, abs_s( sub_sat( Bin_E[i], old_Bin_E[i] ) ) ); /*Q7 */ #else - L_flux = L_add( L_flux, abs_s( sub( Bin_E[i], old_Bin_E[i] ) ) ); /*Q7 */ + L_flux = L_add( L_flux, abs_s( sub( Bin_E[i], old_Bin_E[i] ) ) ); /*Q7 */ #endif } if ( p2v_map[i] != 0 ) diff --git a/lib_enc/stat_noise_uv_enc_fx.c b/lib_enc/stat_noise_uv_enc_fx.c index c5d2d15c6..809f4e5b3 100644 --- a/lib_enc/stat_noise_uv_enc_fx.c +++ b/lib_enc/stat_noise_uv_enc_fx.c @@ -8,7 +8,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*======================================================================*/ diff --git a/lib_enc/subband_fft_fx.c b/lib_enc/subband_fft_fx.c index 66c55d586..e5ffd49a6 100644 --- a/lib_enc/subband_fft_fx.c +++ b/lib_enc/subband_fft_fx.c @@ -9,7 +9,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_enc.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_enc/swb_bwe_enc_fx.c b/lib_enc/swb_bwe_enc_fx.c index 5ee7f2313..9cd165b8d 100644 --- a/lib_enc/swb_bwe_enc_fx.c +++ b/lib_enc/swb_bwe_enc_fx.c @@ -10,7 +10,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_enc/swb_bwe_enc_hr_fx.c b/lib_enc/swb_bwe_enc_hr_fx.c index 60526314e..094ad37fa 100644 --- a/lib_enc/swb_bwe_enc_hr_fx.c +++ b/lib_enc/swb_bwe_enc_hr_fx.c @@ -9,7 +9,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/swb_bwe_enc_lr_fx.c b/lib_enc/swb_bwe_enc_lr_fx.c index 3a8b23845..8cca1104c 100644 --- a/lib_enc/swb_bwe_enc_lr_fx.c +++ b/lib_enc/swb_bwe_enc_lr_fx.c @@ -32,7 +32,7 @@ #include #include "options.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com.h" #include "enh32.h" diff --git a/lib_enc/swb_pre_proc_fx.c b/lib_enc/swb_pre_proc_fx.c index 7650141b6..463f0a96a 100644 --- a/lib_enc/swb_pre_proc_fx.c +++ b/lib_enc/swb_pre_proc_fx.c @@ -9,7 +9,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/swb_tbe_enc_fx.c b/lib_enc/swb_tbe_enc_fx.c index b34283381..c86d5c97c 100644 --- a/lib_enc/swb_tbe_enc_fx.c +++ b/lib_enc/swb_tbe_enc_fx.c @@ -9,7 +9,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_enc/tcq_core_enc_fx.c b/lib_enc/tcq_core_enc_fx.c index 1855527d1..29ea322b6 100644 --- a/lib_enc/tcq_core_enc_fx.c +++ b/lib_enc/tcq_core_enc_fx.c @@ -8,7 +8,7 @@ //#include "prot_fx.h" #include "rom_com.h" #include "ivas_error.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ ivas_error tcq_core_LR_enc_fx( diff --git a/lib_enc/tcx_ltp_enc_fx.c b/lib_enc/tcx_ltp_enc_fx.c index 7a791ef7e..32e44d84a 100644 --- a/lib_enc/tcx_ltp_enc_fx.c +++ b/lib_enc/tcx_ltp_enc_fx.c @@ -10,7 +10,7 @@ #include "basop_util.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ static Word32 dot( const Word16 *X, const Word16 *Y, Word16 n ) diff --git a/lib_enc/tcx_utils_enc_fx.c b/lib_enc/tcx_utils_enc_fx.c index 8307c68d3..1ef5f0463 100644 --- a/lib_enc/tcx_utils_enc_fx.c +++ b/lib_enc/tcx_utils_enc_fx.c @@ -13,7 +13,7 @@ #include "rom_basop_util.h" #include "basop_util.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define inv_int InvIntTable diff --git a/lib_enc/tfa_enc_fx.c b/lib_enc/tfa_enc_fx.c index 80b4cea6f..cfb48aaec 100644 --- a/lib_enc/tfa_enc_fx.c +++ b/lib_enc/tfa_enc_fx.c @@ -7,7 +7,7 @@ #include "basop_util.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/tns_base_enc_fx.c b/lib_enc/tns_base_enc_fx.c index f1de8f802..b371381d5 100644 --- a/lib_enc/tns_base_enc_fx.c +++ b/lib_enc/tns_base_enc_fx.c @@ -13,7 +13,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "prot.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define HLM_MIN_NRG ( 32768.0f * 2 * NORM_MDCT_FACTOR / ( 640 * 640 ) ) diff --git a/lib_enc/transient_detection_fx.c b/lib_enc/transient_detection_fx.c index 5b40d7c1b..c57facc67 100644 --- a/lib_enc/transient_detection_fx.c +++ b/lib_enc/transient_detection_fx.c @@ -12,7 +12,7 @@ #include #include #include -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /* Exponent of attack threshold. Picked according to current threshold values. */ diff --git a/lib_enc/transition_enc_fx.c b/lib_enc/transition_enc_fx.c index 32a510946..96b672985 100644 --- a/lib_enc/transition_enc_fx.c +++ b/lib_enc/transition_enc_fx.c @@ -8,7 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/update_decision_fx.c b/lib_enc/update_decision_fx.c index 91170ece1..c161ac256 100644 --- a/lib_enc/update_decision_fx.c +++ b/lib_enc/update_decision_fx.c @@ -8,7 +8,7 @@ #include "basop_util.h" #include "vad_basop.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* * bg_music_decision_fx() diff --git a/lib_enc/updt_enc_fx.c b/lib_enc/updt_enc_fx.c index 97e704a5f..1b153f387 100644 --- a/lib_enc/updt_enc_fx.c +++ b/lib_enc/updt_enc_fx.c @@ -7,7 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/updt_tar_fx.c b/lib_enc/updt_tar_fx.c index b6c2a166c..d62daff20 100644 --- a/lib_enc/updt_tar_fx.c +++ b/lib_enc/updt_tar_fx.c @@ -5,7 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*----------------------------------------------------------------------------------* diff --git a/lib_enc/vad_basop_fx.c b/lib_enc/vad_basop_fx.c index 9114554c7..f8f528c0e 100644 --- a/lib_enc/vad_basop_fx.c +++ b/lib_enc/vad_basop_fx.c @@ -5,7 +5,7 @@ #include #include "options.h" //#include "prot_fx.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "vad_basop.h" #include "basop_util.h" diff --git a/lib_enc/vad_fx.c b/lib_enc/vad_fx.c index 3a04fb947..d0356f518 100644 --- a/lib_enc/vad_fx.c +++ b/lib_enc/vad_fx.c @@ -6,7 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_enc.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/vad_param_updt_fx.c b/lib_enc/vad_param_updt_fx.c index 0466916ac..f1eb9b031 100644 --- a/lib_enc/vad_param_updt_fx.c +++ b/lib_enc/vad_param_updt_fx.c @@ -7,7 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "ivas_stat_enc.h" /* Function prototypes */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/vad_proc_fx.c b/lib_enc/vad_proc_fx.c index 3592b12f6..cf235d96d 100644 --- a/lib_enc/vad_proc_fx.c +++ b/lib_enc/vad_proc_fx.c @@ -12,7 +12,7 @@ #include "stat_enc.h" #include "rom_enc.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/vbr_average_rate_fx.c b/lib_enc/vbr_average_rate_fx.c index 9eb3d12b2..fe5766eea 100644 --- a/lib_enc/vbr_average_rate_fx.c +++ b/lib_enc/vbr_average_rate_fx.c @@ -9,7 +9,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "stat_enc.h" /* Static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/vlpc_1st_cod_fx.c b/lib_enc/vlpc_1st_cod_fx.c index 120a927f5..cc9592739 100644 --- a/lib_enc/vlpc_1st_cod_fx.c +++ b/lib_enc/vlpc_1st_cod_fx.c @@ -9,7 +9,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define ISF_ONE 3 /*1.0f*1.28f Q1*/ /*=1.0f in 14Q1*1.28*/ diff --git a/lib_enc/vlpc_2st_cod_fx.c b/lib_enc/vlpc_2st_cod_fx.c index 7553f8d1c..0785e9e6e 100644 --- a/lib_enc/vlpc_2st_cod_fx.c +++ b/lib_enc/vlpc_2st_cod_fx.c @@ -8,7 +8,7 @@ #include "options.h" //#include "prot_fx.h" #include "control.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/voiced_enc_fx.c b/lib_enc/voiced_enc_fx.c index 5cd8c3ef1..0e3d7b20b 100644 --- a/lib_enc/voiced_enc_fx.c +++ b/lib_enc/voiced_enc_fx.c @@ -8,7 +8,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/waveadjust_fec_cod_fx.c b/lib_enc/waveadjust_fec_cod_fx.c index 92056c0c3..378898522 100644 --- a/lib_enc/waveadjust_fec_cod_fx.c +++ b/lib_enc/waveadjust_fec_cod_fx.c @@ -9,7 +9,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stat_com.h" -#include "prot_fx.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c index f94e5a58a..e9c76787d 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -3142,7 +3142,7 @@ static ivas_error ivas_rend_crendConvolver( } } - offset = imult1616( hCrend->delay_line_rw_index, subframe_length ); /* subframe_length * ( pCrend->hHrtfCrend->max_num_iterations - 1 ); */ + offset = imult1616( hCrend->delay_line_rw_index, subframe_length ); /* subframe_length * ( pCrend->hHrtfCrend->max_num_iterations - 1 ); */ offset_diffuse = imult1616( hCrend->diffuse_delay_line_rw_index, subframe_length ); /* subframe_length *( pCrend->hHrtfCrend->num_iterations_diffuse[0] - 1 ); */ IF( pCrend->hHrtfCrend->num_iterations_diffuse[0] > 0 ) diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c index 39640f699..590704a99 100644 --- a/lib_rend/ivas_dirac_dec_binaural_functions.c +++ b/lib_rend/ivas_dirac_dec_binaural_functions.c @@ -1411,7 +1411,7 @@ static void ivas_dirac_dec_binaural_internal_fx( q_cldfb[ch][slot] = q_input; move16(); cldfbAnalysis_ts_fx_fixed_q( - &( st_ivas->hTcBuffer->tc_fx[ch][add(imult1616(nBins , slot) , offsetSamples)] ), + &( st_ivas->hTcBuffer->tc_fx[ch][add( imult1616( nBins, slot ), offsetSamples )] ), Cldfb_RealBuffer_in_fx[ch][slot], Cldfb_ImagBuffer_in_fx[ch][slot], nBins, st_ivas->cldfbAnaDec[ch], &q_cldfb[ch][slot] ); @@ -2890,7 +2890,7 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric e = 0; move16(); hDiracDecBin->frameMeanDiffuseness_fx[bin] = BASOP_Util_Divide3232_Scale( hDiracDecBin->frameMeanDiffuseness_fx[bin], L_max( EPSILLON_FX, frameMeanDiffusenessEneWeight_fx[bin] ), &e ); - hDiracDecBin->frameMeanDiffuseness_fx[bin] = L_shl( hDiracDecBin->frameMeanDiffuseness_fx[bin], add(14 , e) ); // Q29 + hDiracDecBin->frameMeanDiffuseness_fx[bin] = L_shl( hDiracDecBin->frameMeanDiffuseness_fx[bin], add( 14, e ) ); // Q29 move32(); move32(); } @@ -5283,8 +5283,8 @@ static void eig2x2_fx( } } - IF ( q_U_1 != 0 ) - *q_U = q_U_1; + IF( q_U_1 != 0 ) + *q_U = q_U_1; ELSE *q_U = q_U_2; move16(); diff --git a/lib_rend/ivas_dirac_decorr_dec.c b/lib_rend/ivas_dirac_decorr_dec.c index d37a961cf..d1f758fe8 100644 --- a/lib_rend/ivas_dirac_decorr_dec.c +++ b/lib_rend/ivas_dirac_decorr_dec.c @@ -953,19 +953,19 @@ void ivas_dirac_dec_decorr_process_fx( /* check handles */ test(); - if( h_freq_domain_decorr_ap_params == NULL || h_freq_domain_decorr_ap_state == NULL ) + if ( h_freq_domain_decorr_ap_params == NULL || h_freq_domain_decorr_ap_state == NULL ) { return; } /* check input data */ - if( input_frame_fx == NULL ) + if ( input_frame_fx == NULL ) { return; } /* check result arrays */ - if( frame_dec_fx == NULL ) + if ( frame_dec_fx == NULL ) { return; } @@ -1045,7 +1045,7 @@ void ivas_dirac_dec_decorr_process_fx( IF( NE_16( q_temp, q_onset_dec ) ) { - FOR( Word16 i = 0; i < imult1616(num_protos_diff , max_band_decorr_temp); i++ ) + FOR( Word16 i = 0; i < imult1616( num_protos_diff, max_band_decorr_temp ); i++ ) { h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx[i] = L_shr( h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2_fx[i], sub( q_onset_dec, q_temp ) ); h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx[i] = L_shr( h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1_fx[i], sub( q_onset_dec, q_temp ) ); @@ -1055,7 +1055,7 @@ void ivas_dirac_dec_decorr_process_fx( } IF( NE_16( q_temp, q_aux_buffer ) ) { - FOR( Word16 i = 0; i < shl( imult1616(num_protos_diff , max_band_decorr_temp),1); i++ ) + FOR( Word16 i = 0; i < shl( imult1616( num_protos_diff, max_band_decorr_temp ), 1 ); i++ ) { aux_buffer_fx[i] = L_shr( aux_buffer_fx[i], sub( q_aux_buffer, q_temp ) ); move32(); @@ -1132,7 +1132,7 @@ void ivas_dirac_dec_decorr_process_fx( q_shift = getScaleFactor32( aux_buffer_fx, imult1616( imult1616( 2, num_protos_dir ), max_band_decorr_temp ) ); - FOR( Word16 j = 0; j < shl( imult1616(num_protos_dir , max_band_decorr_temp),1); j++ ) + FOR( Word16 j = 0; j < shl( imult1616( num_protos_dir, max_band_decorr_temp ), 1 ); j++ ) { aux_buffer_fx[j] = L_shl( aux_buffer_fx[j], q_shift ); move32(); @@ -1292,7 +1292,7 @@ void ivas_dirac_dec_decorr_process_fx( } } - FOR( Word16 i = 0; i < shl(imult1616(num_channels , max_band_decorr),1); i++ ) + FOR( Word16 i = 0; i < shl( imult1616( num_channels, max_band_decorr ), 1 ); i++ ) { aux_buffer_fx[i] = W_extract_h( W_shl( aux_64[i], sub( norm, find_guarded_bits_fx( 2 ) ) ) ); move32(); @@ -1491,13 +1491,13 @@ void ivas_dirac_dec_decorr_close_fx( *-----------------------------------------------------------------*/ test(); - if( ph_freq_domain_decorr_ap_params == NULL || ph_freq_domain_decorr_ap_state == NULL ) + if ( ph_freq_domain_decorr_ap_params == NULL || ph_freq_domain_decorr_ap_state == NULL ) { return; } test(); - if( *ph_freq_domain_decorr_ap_params == NULL || *ph_freq_domain_decorr_ap_state == NULL ) + if ( *ph_freq_domain_decorr_ap_params == NULL || *ph_freq_domain_decorr_ap_state == NULL ) { return; } diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c index 4d8b2e9bc..557105d43 100644 --- a/lib_rend/ivas_reverb.c +++ b/lib_rend/ivas_reverb.c @@ -2451,7 +2451,7 @@ ivas_error ivas_reverb_open_fx( return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Reverberator " ); } - IF( NE_32(( error = set_base_config_fx( ¶ms, output_Fs ) ) , IVAS_ERR_OK) ) + IF( NE_32( ( error = set_base_config_fx( ¶ms, output_Fs ) ), IVAS_ERR_OK ) ) { return error; } @@ -2542,7 +2542,7 @@ ivas_error ivas_reverb_open_fx( /* set up jot reverb 60 filters - must be set up after set_reverb_acoustic_data() */ - IF( NE_32(( error = compute_t60_coeffs_fx( ¶ms, nr_fc_fft_filter, output_Fs ) ) , IVAS_ERR_OK) ) + IF( NE_32( ( error = compute_t60_coeffs_fx( ¶ms, nr_fc_fft_filter, output_Fs ) ), IVAS_ERR_OK ) ) { return error; } @@ -2590,7 +2590,7 @@ ivas_error ivas_reverb_open_fx( move16(); /* clear & init jot reverb fft filters */ - IF( NE_32(( error = initialize_reverb_filters_fx( pState ) ) , IVAS_ERR_OK) ) + IF( NE_32( ( error = initialize_reverb_filters_fx( pState ) ), IVAS_ERR_OK ) ) { return error; } -- GitLab