diff options
-rw-r--r-- | silk/A2NLSF.c (renamed from silk/silk_A2NLSF.c) | 4 | ||||
-rw-r--r-- | silk/API.h (renamed from silk/silk_API.h) | 6 | ||||
-rw-r--r-- | silk/CNG.c (renamed from silk/silk_CNG.c) | 2 | ||||
-rw-r--r-- | silk/HP_variable_cutoff.c (renamed from silk/silk_HP_variable_cutoff.c) | 6 | ||||
-rw-r--r-- | silk/Inlines.h (renamed from silk/silk_Inlines.h) | 0 | ||||
-rw-r--r-- | silk/LPC_analysis_filter.c (renamed from silk/silk_LPC_analysis_filter.c) | 2 | ||||
-rw-r--r-- | silk/LPC_inv_pred_gain.c (renamed from silk/silk_LPC_inv_pred_gain.c) | 2 | ||||
-rw-r--r-- | silk/LP_variable_cutoff.c (renamed from silk/silk_LP_variable_cutoff.c) | 2 | ||||
-rw-r--r-- | silk/MacroCount.h (renamed from silk/silk_MacroCount.h) | 0 | ||||
-rw-r--r-- | silk/MacroDebug.h (renamed from silk/silk_MacroDebug.h) | 0 | ||||
-rw-r--r-- | silk/NLSF2A.c (renamed from silk/silk_NLSF2A.c) | 4 | ||||
-rw-r--r-- | silk/NLSF_VQ.c (renamed from silk/silk_NLSF_VQ.c) | 2 | ||||
-rw-r--r-- | silk/NLSF_VQ_weights_laroia.c (renamed from silk/silk_NLSF_VQ_weights_laroia.c) | 4 | ||||
-rw-r--r-- | silk/NLSF_decode.c (renamed from silk/silk_NLSF_decode.c) | 2 | ||||
-rw-r--r-- | silk/NLSF_del_dec_quant.c (renamed from silk/silk_NLSF_del_dec_quant.c) | 2 | ||||
-rw-r--r-- | silk/NLSF_encode.c (renamed from silk/silk_NLSF_encode.c) | 2 | ||||
-rw-r--r-- | silk/NLSF_stabilize.c (renamed from silk/silk_NLSF_stabilize.c) | 2 | ||||
-rw-r--r-- | silk/NLSF_unpack.c (renamed from silk/silk_NLSF_unpack.c) | 2 | ||||
-rw-r--r-- | silk/NSQ.c (renamed from silk/silk_NSQ.c) | 2 | ||||
-rw-r--r-- | silk/NSQ_del_dec.c (renamed from silk/silk_NSQ_del_dec.c) | 2 | ||||
-rw-r--r-- | silk/PLC.c (renamed from silk/silk_PLC.c) | 4 | ||||
-rw-r--r-- | silk/PLC.h (renamed from silk/silk_PLC.h) | 2 | ||||
-rw-r--r-- | silk/SigProc_FIX.h (renamed from silk/silk_SigProc_FIX.h) | 12 | ||||
-rw-r--r-- | silk/VAD.c (renamed from silk/silk_VAD.c) | 2 | ||||
-rw-r--r-- | silk/VQ_WMat_EC.c (renamed from silk/silk_VQ_WMat_EC.c) | 2 | ||||
-rw-r--r-- | silk/ana_filt_bank_1.c (renamed from silk/silk_ana_filt_bank_1.c) | 2 | ||||
-rw-r--r-- | silk/apply_sine_window.c (renamed from silk/silk_apply_sine_window.c) | 2 | ||||
-rw-r--r-- | silk/array_maxabs.c (renamed from silk/silk_array_maxabs.c) | 2 | ||||
-rw-r--r-- | silk/autocorr.c (renamed from silk/silk_autocorr.c) | 2 | ||||
-rw-r--r-- | silk/biquad_alt.c (renamed from silk/silk_biquad_alt.c) | 2 | ||||
-rw-r--r-- | silk/burg_modified.c (renamed from silk/silk_burg_modified.c) | 2 | ||||
-rw-r--r-- | silk/bwexpander.c (renamed from silk/silk_bwexpander.c) | 2 | ||||
-rw-r--r-- | silk/bwexpander_32.c (renamed from silk/silk_bwexpander_32.c) | 2 | ||||
-rw-r--r-- | silk/check_control_input.c (renamed from silk/silk_check_control_input.c) | 6 | ||||
-rw-r--r-- | silk/code_signs.c (renamed from silk/silk_code_signs.c) | 2 | ||||
-rw-r--r-- | silk/control.h (renamed from silk/silk_control.h) | 2 | ||||
-rw-r--r-- | silk/control_SNR.c (renamed from silk/silk_control_SNR.c) | 4 | ||||
-rw-r--r-- | silk/control_audio_bandwidth.c (renamed from silk/silk_control_audio_bandwidth.c) | 4 | ||||
-rw-r--r-- | silk/control_codec.c (renamed from silk/silk_control_codec.c) | 6 | ||||
-rw-r--r-- | silk/create_init_destroy.c (renamed from silk/silk_create_init_destroy.c) | 2 | ||||
-rw-r--r-- | silk/debug.c (renamed from silk/silk_debug.c) | 4 | ||||
-rw-r--r-- | silk/debug.h (renamed from silk/silk_debug.h) | 2 | ||||
-rw-r--r-- | silk/dec_API.c (renamed from silk/silk_dec_API.c) | 4 | ||||
-rw-r--r-- | silk/decode_core.c (renamed from silk/silk_decode_core.c) | 2 | ||||
-rw-r--r-- | silk/decode_frame.c (renamed from silk/silk_decode_frame.c) | 4 | ||||
-rw-r--r-- | silk/decode_indices.c (renamed from silk/silk_decode_indices.c) | 2 | ||||
-rw-r--r-- | silk/decode_parameters.c (renamed from silk/silk_decode_parameters.c) | 2 | ||||
-rw-r--r-- | silk/decode_pitch.c (renamed from silk/silk_decode_pitch.c) | 4 | ||||
-rw-r--r-- | silk/decode_pulses.c (renamed from silk/silk_decode_pulses.c) | 2 | ||||
-rw-r--r-- | silk/decoder_set_fs.c (renamed from silk/silk_decoder_set_fs.c) | 2 | ||||
-rw-r--r-- | silk/define.h (renamed from silk/silk_define.h) | 4 | ||||
-rw-r--r-- | silk/enc_API.c (renamed from silk/silk_enc_API.c) | 16 | ||||
-rw-r--r-- | silk/encode_indices.c (renamed from silk/silk_encode_indices.c) | 2 | ||||
-rw-r--r-- | silk/encode_pulses.c (renamed from silk/silk_encode_pulses.c) | 2 | ||||
-rw-r--r-- | silk/errors.h (renamed from silk/silk_errors.h) | 0 | ||||
-rw-r--r-- | silk/fixed/LTP_analysis_filter_FIX.c (renamed from silk/fixed/silk_LTP_analysis_filter_FIX.c) | 2 | ||||
-rw-r--r-- | silk/fixed/LTP_scale_ctrl_FIX.c (renamed from silk/fixed/silk_LTP_scale_ctrl_FIX.c) | 2 | ||||
-rw-r--r-- | silk/fixed/corrMatrix_FIX.c (renamed from silk/fixed/silk_corrMatrix_FIX.c) | 2 | ||||
-rw-r--r-- | silk/fixed/encode_frame_FIX.c (renamed from silk/fixed/silk_encode_frame_FIX.c) | 4 | ||||
-rw-r--r-- | silk/fixed/find_LPC_FIX.c (renamed from silk/fixed/silk_find_LPC_FIX.c) | 4 | ||||
-rw-r--r-- | silk/fixed/find_LTP_FIX.c (renamed from silk/fixed/silk_find_LTP_FIX.c) | 4 | ||||
-rw-r--r-- | silk/fixed/find_pitch_lags_FIX.c (renamed from silk/fixed/silk_find_pitch_lags_FIX.c) | 4 | ||||
-rw-r--r-- | silk/fixed/find_pred_coefs_FIX.c (renamed from silk/fixed/silk_find_pred_coefs_FIX.c) | 2 | ||||
-rw-r--r-- | silk/fixed/main_FIX.h (renamed from silk/fixed/silk_main_FIX.h) | 12 | ||||
-rw-r--r-- | silk/fixed/noise_shape_analysis_FIX.c (renamed from silk/fixed/silk_noise_shape_analysis_FIX.c) | 4 | ||||
-rw-r--r-- | silk/fixed/prefilter_FIX.c (renamed from silk/fixed/silk_prefilter_FIX.c) | 4 | ||||
-rw-r--r-- | silk/fixed/process_gains_FIX.c (renamed from silk/fixed/silk_process_gains_FIX.c) | 4 | ||||
-rw-r--r-- | silk/fixed/regularize_correlations_FIX.c (renamed from silk/fixed/silk_regularize_correlations_FIX.c) | 2 | ||||
-rw-r--r-- | silk/fixed/residual_energy16_FIX.c (renamed from silk/fixed/silk_residual_energy16_FIX.c) | 2 | ||||
-rw-r--r-- | silk/fixed/residual_energy_FIX.c (renamed from silk/fixed/silk_residual_energy_FIX.c) | 2 | ||||
-rw-r--r-- | silk/fixed/silk_fixed.vcxproj | 38 | ||||
-rw-r--r-- | silk/fixed/silk_fixed.vcxproj.filters | 38 | ||||
-rw-r--r-- | silk/fixed/solve_LS_FIX.c (renamed from silk/fixed/silk_solve_LS_FIX.c) | 4 | ||||
-rw-r--r-- | silk/fixed/structs_FIX.h (renamed from silk/fixed/silk_structs_FIX.h) | 6 | ||||
-rw-r--r-- | silk/fixed/warped_autocorrelation_FIX.c (renamed from silk/fixed/silk_warped_autocorrelation_FIX.c) | 2 | ||||
-rw-r--r-- | silk/float/LPC_analysis_filter_FLP.c (renamed from silk/float/silk_LPC_analysis_filter_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/LPC_inv_pred_gain_FLP.c (renamed from silk/float/silk_LPC_inv_pred_gain_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/LTP_analysis_filter_FLP.c (renamed from silk/float/silk_LTP_analysis_filter_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/LTP_scale_ctrl_FLP.c (renamed from silk/float/silk_LTP_scale_ctrl_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/SigProc_FLP.h (renamed from silk/float/silk_SigProc_FLP.h) | 2 | ||||
-rw-r--r-- | silk/float/apply_sine_window_FLP.c (renamed from silk/float/silk_apply_sine_window_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/autocorrelation_FLP.c (renamed from silk/float/silk_autocorrelation_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/burg_modified_FLP.c (renamed from silk/float/silk_burg_modified_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/bwexpander_FLP.c (renamed from silk/float/silk_bwexpander_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/corrMatrix_FLP.c (renamed from silk/float/silk_corrMatrix_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/encode_frame_FLP.c (renamed from silk/float/silk_encode_frame_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/energy_FLP.c (renamed from silk/float/silk_energy_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/find_LPC_FLP.c (renamed from silk/float/silk_find_LPC_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/find_LTP_FLP.c (renamed from silk/float/silk_find_LTP_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/find_pitch_lags_FLP.c (renamed from silk/float/silk_find_pitch_lags_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/find_pred_coefs_FLP.c (renamed from silk/float/silk_find_pred_coefs_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/inner_product_FLP.c (renamed from silk/float/silk_inner_product_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/k2a_FLP.c (renamed from silk/float/silk_k2a_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/levinsondurbin_FLP.c (renamed from silk/float/silk_levinsondurbin_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/main_FLP.h (renamed from silk/float/silk_main_FLP.h) | 12 | ||||
-rw-r--r-- | silk/float/noise_shape_analysis_FLP.c (renamed from silk/float/silk_noise_shape_analysis_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/pitch_analysis_core_FLP.c (renamed from silk/float/silk_pitch_analysis_core_FLP.c) | 6 | ||||
-rw-r--r-- | silk/float/prefilter_FLP.c (renamed from silk/float/silk_prefilter_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/process_gains_FLP.c (renamed from silk/float/silk_process_gains_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/regularize_correlations_FLP.c (renamed from silk/float/silk_regularize_correlations_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/residual_energy_FLP.c (renamed from silk/float/silk_residual_energy_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/scale_copy_vector_FLP.c (renamed from silk/float/silk_scale_copy_vector_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/scale_vector_FLP.c (renamed from silk/float/silk_scale_vector_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/schur_FLP.c (renamed from silk/float/silk_schur_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/silk_float.vcxproj | 68 | ||||
-rw-r--r-- | silk/float/silk_float.vcxproj.filters | 68 | ||||
-rw-r--r-- | silk/float/solve_LS_FLP.c (renamed from silk/float/silk_solve_LS_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/sort_FLP.c (renamed from silk/float/silk_sort_FLP.c) | 4 | ||||
-rw-r--r-- | silk/float/structs_FLP.h (renamed from silk/float/silk_structs_FLP.h) | 6 | ||||
-rw-r--r-- | silk/float/warped_autocorrelation_FLP.c (renamed from silk/float/silk_warped_autocorrelation_FLP.c) | 2 | ||||
-rw-r--r-- | silk/float/wrappers_FLP.c (renamed from silk/float/silk_wrappers_FLP.c) | 2 | ||||
-rw-r--r-- | silk/gain_quant.c (renamed from silk/silk_gain_quant.c) | 2 | ||||
-rw-r--r-- | silk/init_encoder.c (renamed from silk/silk_init_encoder.c) | 6 | ||||
-rw-r--r-- | silk/inner_prod_aligned.c (renamed from silk/silk_inner_prod_aligned.c) | 2 | ||||
-rw-r--r-- | silk/interpolate.c (renamed from silk/silk_interpolate.c) | 2 | ||||
-rw-r--r-- | silk/k2a.c (renamed from silk/silk_k2a.c) | 2 | ||||
-rw-r--r-- | silk/k2a_Q16.c (renamed from silk/silk_k2a_Q16.c) | 2 | ||||
-rw-r--r-- | silk/lin2log.c (renamed from silk/silk_lin2log.c) | 2 | ||||
-rw-r--r-- | silk/log2lin.c (renamed from silk/silk_log2lin.c) | 2 | ||||
-rw-r--r-- | silk/macros.h (renamed from silk/silk_macros.h) | 0 | ||||
-rw-r--r-- | silk/main.h (renamed from silk/silk_main.h) | 14 | ||||
-rw-r--r-- | silk/pitch_analysis_core.c (renamed from silk/silk_pitch_analysis_core.c) | 6 | ||||
-rw-r--r-- | silk/pitch_est_defines.h (renamed from silk/silk_pitch_est_defines.h) | 2 | ||||
-rw-r--r-- | silk/pitch_est_tables.c (renamed from silk/silk_pitch_est_tables.c) | 4 | ||||
-rw-r--r-- | silk/process_NLSFs.c (renamed from silk/silk_process_NLSFs.c) | 2 | ||||
-rw-r--r-- | silk/quant_LTP_gains.c (renamed from silk/silk_quant_LTP_gains.c) | 2 | ||||
-rw-r--r-- | silk/resampler.c (renamed from silk/silk_resampler.c) | 2 | ||||
-rw-r--r-- | silk/resampler_down2.c (renamed from silk/silk_resampler_down2.c) | 4 | ||||
-rw-r--r-- | silk/resampler_down2_3.c (renamed from silk/silk_resampler_down2_3.c) | 4 | ||||
-rw-r--r-- | silk/resampler_down3.c (renamed from silk/silk_resampler_down3.c) | 4 | ||||
-rw-r--r-- | silk/resampler_private.h (renamed from silk/silk_resampler_private.h) | 6 | ||||
-rw-r--r-- | silk/resampler_private_AR2.c (renamed from silk/silk_resampler_private_AR2.c) | 4 | ||||
-rw-r--r-- | silk/resampler_private_ARMA4.c (renamed from silk/silk_resampler_private_ARMA4.c) | 4 | ||||
-rw-r--r-- | silk/resampler_private_IIR_FIR.c (renamed from silk/silk_resampler_private_IIR_FIR.c) | 4 | ||||
-rw-r--r-- | silk/resampler_private_copy.c (renamed from silk/silk_resampler_private_copy.c) | 4 | ||||
-rw-r--r-- | silk/resampler_private_down4.c (renamed from silk/silk_resampler_private_down4.c) | 4 | ||||
-rw-r--r-- | silk/resampler_private_down_FIR.c (renamed from silk/silk_resampler_private_down_FIR.c) | 4 | ||||
-rw-r--r-- | silk/resampler_private_up2_HQ.c (renamed from silk/silk_resampler_private_up2_HQ.c) | 4 | ||||
-rw-r--r-- | silk/resampler_private_up4.c (renamed from silk/silk_resampler_private_up4.c) | 4 | ||||
-rw-r--r-- | silk/resampler_rom.c (renamed from silk/silk_resampler_rom.c) | 2 | ||||
-rw-r--r-- | silk/resampler_rom.h (renamed from silk/silk_resampler_rom.h) | 4 | ||||
-rw-r--r-- | silk/resampler_structs.h (renamed from silk/silk_resampler_structs.h) | 0 | ||||
-rw-r--r-- | silk/resampler_up2.c (renamed from silk/silk_resampler_up2.c) | 4 | ||||
-rw-r--r-- | silk/scale_copy_vector16.c (renamed from silk/silk_scale_copy_vector16.c) | 2 | ||||
-rw-r--r-- | silk/scale_vector.c (renamed from silk/silk_scale_vector.c) | 2 | ||||
-rw-r--r-- | silk/schur.c (renamed from silk/silk_schur.c) | 2 | ||||
-rw-r--r-- | silk/schur64.c (renamed from silk/silk_schur64.c) | 2 | ||||
-rw-r--r-- | silk/shell_coder.c (renamed from silk/silk_shell_coder.c) | 2 | ||||
-rw-r--r-- | silk/sigm_Q15.c (renamed from silk/silk_sigm_Q15.c) | 2 | ||||
-rw-r--r-- | silk/silk_common.vcxproj | 228 | ||||
-rw-r--r-- | silk/silk_common.vcxproj.filters | 228 | ||||
-rw-r--r-- | silk/sort.c (renamed from silk/silk_sort.c) | 2 | ||||
-rw-r--r-- | silk/stereo_LR_to_MS.c (renamed from silk/silk_stereo_LR_to_MS.c) | 2 | ||||
-rw-r--r-- | silk/stereo_MS_to_LR.c (renamed from silk/silk_stereo_MS_to_LR.c) | 2 | ||||
-rw-r--r-- | silk/stereo_decode_pred.c (renamed from silk/silk_stereo_decode_pred.c) | 2 | ||||
-rw-r--r-- | silk/stereo_encode_pred.c (renamed from silk/silk_stereo_encode_pred.c) | 2 | ||||
-rw-r--r-- | silk/stereo_find_predictor.c (renamed from silk/silk_stereo_find_predictor.c) | 2 | ||||
-rw-r--r-- | silk/stereo_quant_pred.c (renamed from silk/silk_stereo_quant_pred.c) | 2 | ||||
-rw-r--r-- | silk/structs.h (renamed from silk/silk_structs.h) | 6 | ||||
-rw-r--r-- | silk/sum_sqr_shift.c (renamed from silk/silk_sum_sqr_shift.c) | 2 | ||||
-rw-r--r-- | silk/table_LSF_cos.c (renamed from silk/silk_table_LSF_cos.c) | 2 | ||||
-rw-r--r-- | silk/tables.h (renamed from silk/silk_tables.h) | 4 | ||||
-rw-r--r-- | silk/tables_LTP.c (renamed from silk/silk_tables_LTP.c) | 2 | ||||
-rw-r--r-- | silk/tables_NLSF_CB_NB_MB.c (renamed from silk/silk_tables_NLSF_CB_NB_MB.c) | 2 | ||||
-rw-r--r-- | silk/tables_NLSF_CB_WB.c (renamed from silk/silk_tables_NLSF_CB_WB.c) | 2 | ||||
-rw-r--r-- | silk/tables_gain.c (renamed from silk/silk_tables_gain.c) | 2 | ||||
-rw-r--r-- | silk/tables_other.c (renamed from silk/silk_tables_other.c) | 6 | ||||
-rw-r--r-- | silk/tables_pitch_lag.c (renamed from silk/silk_tables_pitch_lag.c) | 2 | ||||
-rw-r--r-- | silk/tables_pulses_per_block.c (renamed from silk/silk_tables_pulses_per_block.c) | 2 | ||||
-rw-r--r-- | silk/tuning_parameters.h (renamed from silk/silk_tuning_parameters.h) | 0 | ||||
-rw-r--r-- | silk/typedef.h (renamed from silk/silk_typedef.h) | 0 | ||||
-rw-r--r-- | silk_headers.txt | 50 | ||||
-rw-r--r-- | silk_sources.mk | 280 | ||||
-rw-r--r-- | src/opus_decoder.c | 6 | ||||
-rw-r--r-- | src/opus_encoder.c | 8 | ||||
-rw-r--r-- | src/test_opus.c | 2 |
176 files changed, 761 insertions, 761 deletions
diff --git a/silk/silk_A2NLSF.c b/silk/A2NLSF.c index 028d770e..3b39a5f1 100644 --- a/silk/silk_A2NLSF.c +++ b/silk/A2NLSF.c @@ -35,8 +35,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_tables.h" +#include "SigProc_FIX.h" +#include "tables.h" /* Number of binary divisions, when not in low complexity mode */ #define BIN_DIV_STEPS_A2NLSF_FIX 3 /* must be no higher than 16 - log2( LSF_COS_TAB_SZ_FIX ) */ diff --git a/silk/silk_API.h b/silk/API.h index 7f2861de..ca24808f 100644 --- a/silk/silk_API.h +++ b/silk/API.h @@ -28,9 +28,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_API_H #define SILK_API_H -#include "silk_control.h" -#include "silk_typedef.h" -#include "silk_errors.h" +#include "control.h" +#include "typedef.h" +#include "errors.h" #include "entenc.h" #include "entdec.h" diff --git a/silk/silk_CNG.c b/silk/CNG.c index b7464209..0b43b865 100644 --- a/silk/silk_CNG.c +++ b/silk/CNG.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Generates excitation for CNG LPC synthesis */ static inline void silk_CNG_exc( diff --git a/silk/silk_HP_variable_cutoff.c b/silk/HP_variable_cutoff.c index 5b8d538d..1cd82a4e 100644 --- a/silk/silk_HP_variable_cutoff.c +++ b/silk/HP_variable_cutoff.c @@ -29,11 +29,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif #ifdef FIXED_POINT -#include "silk_main_FIX.h" +#include "main_FIX.h" #else -#include "silk_main_FLP.h" +#include "main_FLP.h" #endif -#include "silk_tuning_parameters.h" +#include "tuning_parameters.h" /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */ void silk_HP_variable_cutoff( diff --git a/silk/silk_Inlines.h b/silk/Inlines.h index ec97cfbc..ec97cfbc 100644 --- a/silk/silk_Inlines.h +++ b/silk/Inlines.h diff --git a/silk/silk_LPC_analysis_filter.c b/silk/LPC_analysis_filter.c index 7859d735..a8d1c333 100644 --- a/silk/silk_LPC_analysis_filter.c +++ b/silk/LPC_analysis_filter.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /*******************************************/ /* LPC analysis filter */ diff --git a/silk/silk_LPC_inv_pred_gain.c b/silk/LPC_inv_pred_gain.c index 42765bd5..1669745d 100644 --- a/silk/silk_LPC_inv_pred_gain.c +++ b/silk/LPC_inv_pred_gain.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" #define QA 16 #define A_LIMIT SILK_FIX_CONST( 0.99975, QA ) diff --git a/silk/silk_LP_variable_cutoff.c b/silk/LP_variable_cutoff.c index 9b10f291..2ed062c6 100644 --- a/silk/silk_LP_variable_cutoff.c +++ b/silk/LP_variable_cutoff.c @@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [0.95 : 0.15 : 0.35] normalized cut off frequencies. */ -#include "silk_main.h" +#include "main.h" /* Helper function, interpolates the filter taps */ static inline void silk_LP_interpolate_filter_taps( diff --git a/silk/silk_MacroCount.h b/silk/MacroCount.h index 98eacfb6..98eacfb6 100644 --- a/silk/silk_MacroCount.h +++ b/silk/MacroCount.h diff --git a/silk/silk_MacroDebug.h b/silk/MacroDebug.h index f91da061..f91da061 100644 --- a/silk/silk_MacroDebug.h +++ b/silk/MacroDebug.h diff --git a/silk/silk_NLSF2A.c b/silk/NLSF2A.c index 5461bdc2..87b87498 100644 --- a/silk/silk_NLSF2A.c +++ b/silk/NLSF2A.c @@ -35,8 +35,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* therefore the result is not accurate LSFs, but the two */ /* functions are accurate inverses of each other */ -#include "silk_SigProc_FIX.h" -#include "silk_tables.h" +#include "SigProc_FIX.h" +#include "tables.h" #define QA 16 diff --git a/silk/silk_NLSF_VQ.c b/silk/NLSF_VQ.c index 73183856..a9d781a5 100644 --- a/silk/silk_NLSF_VQ.c +++ b/silk/NLSF_VQ.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */ void silk_NLSF_VQ( diff --git a/silk/silk_NLSF_VQ_weights_laroia.c b/silk/NLSF_VQ_weights_laroia.c index ce7a3e5d..887d3471 100644 --- a/silk/silk_NLSF_VQ_weights_laroia.c +++ b/silk/NLSF_VQ_weights_laroia.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_define.h" -#include "silk_SigProc_FIX.h" +#include "define.h" +#include "SigProc_FIX.h" /* R. Laroia, N. Phamdo and N. Farvardin, "Robust and Efficient Quantization of Speech LSP diff --git a/silk/silk_NLSF_decode.c b/silk/NLSF_decode.c index acd2c49f..b6588c14 100644 --- a/silk/silk_NLSF_decode.c +++ b/silk/NLSF_decode.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Predictive dequantizer for NLSF residuals */ void silk_NLSF_residual_dequant( /* O Returns RD value in Q30 */ diff --git a/silk/silk_NLSF_del_dec_quant.c b/silk/NLSF_del_dec_quant.c index 03a9cf51..87629a26 100644 --- a/silk/silk_NLSF_del_dec_quant.c +++ b/silk/NLSF_del_dec_quant.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Delayed-decision quantizer for NLSF residuals */ opus_int32 silk_NLSF_del_dec_quant( /* O Returns RD value in Q25 */ diff --git a/silk/silk_NLSF_encode.c b/silk/NLSF_encode.c index 83a26d16..fbff0a05 100644 --- a/silk/silk_NLSF_encode.c +++ b/silk/NLSF_encode.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" #define STORE_LSF_DATA_FOR_TRAINING 0 diff --git a/silk/silk_NLSF_stabilize.c b/silk/NLSF_stabilize.c index fd831f18..1c7d60b2 100644 --- a/silk/silk_NLSF_stabilize.c +++ b/silk/NLSF_stabilize.c @@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* - Output are sorted NLSF coefficients */ /* */ -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Constant Definitions */ #define MAX_LOOPS 20 diff --git a/silk/silk_NLSF_unpack.c b/silk/NLSF_unpack.c index 00845a24..3f4d292a 100644 --- a/silk/silk_NLSF_unpack.c +++ b/silk/NLSF_unpack.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Unpack predictor values and indices for entropy coding tables */ void silk_NLSF_unpack( diff --git a/silk/silk_NSQ.c b/silk/NSQ.c index e32fd616..76e81346 100644 --- a/silk/silk_NSQ.c +++ b/silk/NSQ.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" static inline void silk_nsq_scale_states( const silk_encoder_state *psEncC, /* I Encoder State */ diff --git a/silk/silk_NSQ_del_dec.c b/silk/NSQ_del_dec.c index e61fd790..1cb55b65 100644 --- a/silk/silk_NSQ_del_dec.c +++ b/silk/NSQ_del_dec.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" typedef struct { opus_int32 sLPC_Q14[ MAX_FRAME_LENGTH / MAX_NB_SUBFR + NSQ_LPC_BUF_LENGTH ]; diff --git a/silk/silk_PLC.c b/silk/PLC.c index d0658a4f..43894c22 100644 --- a/silk/silk_PLC.c +++ b/silk/PLC.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" -#include "silk_PLC.h" +#include "main.h" +#include "PLC.h" #define NB_ATT 2 static const opus_int16 HARM_ATT_Q15[NB_ATT] = { 32440, 31130 }; /* 0.99, 0.95 */ diff --git a/silk/silk_PLC.h b/silk/PLC.h index 44297c2b..4fe09e24 100644 --- a/silk/silk_PLC.h +++ b/silk/PLC.h @@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_PLC_FIX_H #define SILK_PLC_FIX_H -#include "silk_main.h" +#include "main.h" #define BWE_COEF 0.99 #define V_PITCH_GAIN_START_MIN_Q14 11469 /* 0.7 in Q14 */ diff --git a/silk/silk_SigProc_FIX.h b/silk/SigProc_FIX.h index 7514eb76..42c67c36 100644 --- a/silk/silk_SigProc_FIX.h +++ b/silk/SigProc_FIX.h @@ -39,9 +39,9 @@ extern "C" #include <stdlib.h> /* for abs() */ #include <string.h> /* for memset(), memcpy(), memmove() */ -#include "silk_typedef.h" -#include "silk_resampler_structs.h" -#include "silk_macros.h" +#include "typedef.h" +#include "resampler_structs.h" +#include "macros.h" /********************************************************************/ @@ -609,9 +609,9 @@ static inline opus_int64 silk_max_64(opus_int64 a, opus_int64 b) /* the following seems faster on x86 */ #define silk_SMMUL(a32, b32) (opus_int32)silk_RSHIFT64(silk_SMULL((a32), (b32)), 32) -#include "silk_Inlines.h" -#include "silk_MacroCount.h" -#include "silk_MacroDebug.h" +#include "Inlines.h" +#include "MacroCount.h" +#include "MacroDebug.h" #ifdef __cplusplus } diff --git a/silk/silk_VAD.c b/silk/VAD.c index f9470da2..377b4058 100644 --- a/silk/silk_VAD.c +++ b/silk/VAD.c @@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #include <stdlib.h> -#include "silk_main.h" +#include "main.h" /**********************************/ /* Initialization of the Silk VAD */ diff --git a/silk/silk_VQ_WMat_EC.c b/silk/VQ_WMat_EC.c index 1720366d..5397d86f 100644 --- a/silk/silk_VQ_WMat_EC.c +++ b/silk/VQ_WMat_EC.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */ void silk_VQ_WMat_EC( diff --git a/silk/silk_ana_filt_bank_1.c b/silk/ana_filt_bank_1.c index d19790fc..3cca817a 100644 --- a/silk/silk_ana_filt_bank_1.c +++ b/silk/ana_filt_bank_1.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Coefficients for 2-band filter bank based on first-order allpass filters */ /* old*/ diff --git a/silk/silk_apply_sine_window.c b/silk/apply_sine_window.c index dcc19898..11a8545f 100644 --- a/silk/silk_apply_sine_window.c +++ b/silk/apply_sine_window.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Apply sine window to signal vector. */ /* Window types: */ diff --git a/silk/silk_array_maxabs.c b/silk/array_maxabs.c index 2df83a6a..1194f0c4 100644 --- a/silk/silk_array_maxabs.c +++ b/silk/array_maxabs.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Function that returns the maximum absolut value of the input vector */ opus_int16 silk_int16_array_maxabs( /* O Maximum absolute value, max: 2^15-1 */ diff --git a/silk/silk_autocorr.c b/silk/autocorr.c index 098d96aa..37ab66c0 100644 --- a/silk/silk_autocorr.c +++ b/silk/autocorr.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Compute autocorrelation */ void silk_autocorr( diff --git a/silk/silk_biquad_alt.c b/silk/biquad_alt.c index ef95bf8c..617b33ab 100644 --- a/silk/silk_biquad_alt.c +++ b/silk/biquad_alt.c @@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Second order ARMA filter, alternative implementation */ diff --git a/silk/silk_burg_modified.c b/silk/burg_modified.c index f41fcc96..0bf90e51 100644 --- a/silk/silk_burg_modified.c +++ b/silk/burg_modified.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" #define MAX_FRAME_SIZE 384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384*/ #define MAX_NB_SUBFR 4 diff --git a/silk/silk_bwexpander.c b/silk/bwexpander.c index ba0f4ec9..ab74272d 100644 --- a/silk/silk_bwexpander.c +++ b/silk/bwexpander.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Chirp (bandwidth expand) LP AR filter */ void silk_bwexpander( diff --git a/silk/silk_bwexpander_32.c b/silk/bwexpander_32.c index c58c7432..4bac1c68 100644 --- a/silk/silk_bwexpander_32.c +++ b/silk/bwexpander_32.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Chirp (bandwidth expand) LP AR filter */ void silk_bwexpander_32( diff --git a/silk/silk_check_control_input.c b/silk/check_control_input.c index aa8ee6d2..0a8d7269 100644 --- a/silk/silk_check_control_input.c +++ b/silk/check_control_input.c @@ -29,9 +29,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" -#include "silk_control.h" -#include "silk_errors.h" +#include "main.h" +#include "control.h" +#include "errors.h" /* Check encoder control struct */ opus_int check_control_input( diff --git a/silk/silk_code_signs.c b/silk/code_signs.c index 2697b36d..65187e61 100644 --- a/silk/silk_code_signs.c +++ b/silk/code_signs.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /*#define silk_enc_map(a) ((a) > 0 ? 1 : 0)*/ /*#define silk_dec_map(a) ((a) > 0 ? 1 : -1)*/ diff --git a/silk/silk_control.h b/silk/control.h index 0ebf5a33..36b190c0 100644 --- a/silk/silk_control.h +++ b/silk/control.h @@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_CONTROL_H #define SILK_CONTROL_H -#include "silk_typedef.h" +#include "typedef.h" #ifdef __cplusplus extern "C" diff --git a/silk/silk_control_SNR.c b/silk/control_SNR.c index d9dd8f81..3c65fd72 100644 --- a/silk/silk_control_SNR.c +++ b/silk/control_SNR.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" -#include "silk_tuning_parameters.h" +#include "main.h" +#include "tuning_parameters.h" /* Control SNR of redidual quantizer */ opus_int silk_control_SNR( diff --git a/silk/silk_control_audio_bandwidth.c b/silk/control_audio_bandwidth.c index 2f995a5b..54bf3d4e 100644 --- a/silk/silk_control_audio_bandwidth.c +++ b/silk/control_audio_bandwidth.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" -#include "silk_tuning_parameters.h" +#include "main.h" +#include "tuning_parameters.h" /* Control internal sampling rate */ opus_int silk_control_audio_bandwidth( diff --git a/silk/silk_control_codec.c b/silk/control_codec.c index 0e807245..b1d3bab9 100644 --- a/silk/silk_control_codec.c +++ b/silk/control_codec.c @@ -29,13 +29,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif #ifdef FIXED_POINT -#include "silk_main_FIX.h" +#include "main_FIX.h" #define silk_encoder_state_Fxx silk_encoder_state_FIX #else -#include "silk_main_FLP.h" +#include "main_FLP.h" #define silk_encoder_state_Fxx silk_encoder_state_FLP #endif -#include "silk_tuning_parameters.h" +#include "tuning_parameters.h" opus_int silk_setup_resamplers( silk_encoder_state_Fxx *psEnc, /* I/O */ diff --git a/silk/silk_create_init_destroy.c b/silk/create_init_destroy.c index 236a7453..1e32c941 100644 --- a/silk/silk_create_init_destroy.c +++ b/silk/create_init_destroy.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /************************/ diff --git a/silk/silk_debug.c b/silk/debug.c index ecd2d950..b8a31b33 100644 --- a/silk/silk_debug.c +++ b/silk/debug.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_debug.h" -#include "silk_SigProc_FIX.h" +#include "debug.h" +#include "SigProc_FIX.h" #if SILK_TIC_TOC diff --git a/silk/silk_debug.h b/silk/debug.h index 77d390d3..e48f55d7 100644 --- a/silk/silk_debug.h +++ b/silk/debug.h @@ -32,7 +32,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _CRT_SECURE_NO_DEPRECATE 1 #endif -#include "silk_typedef.h" +#include "typedef.h" #include <stdio.h> /* file writing */ #include <string.h> /* strcpy, strcmp */ diff --git a/silk/silk_dec_API.c b/silk/dec_API.c index 9ae47d13..675bfb99 100644 --- a/silk/silk_dec_API.c +++ b/silk/dec_API.c @@ -28,8 +28,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "silk_API.h" -#include "silk_main.h" +#include "API.h" +#include "main.h" /************************/ /* Decoder Super Struct */ diff --git a/silk/silk_decode_core.c b/silk/decode_core.c index a6554c8f..91ebc7f1 100644 --- a/silk/silk_decode_core.c +++ b/silk/decode_core.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /**********************************************************/ /* Core decoder. Performs inverse NSQ operation LTP + LPC */ diff --git a/silk/silk_decode_frame.c b/silk/decode_frame.c index 3e918cf0..d70dccb1 100644 --- a/silk/silk_decode_frame.c +++ b/silk/decode_frame.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" -#include "silk_PLC.h" +#include "main.h" +#include "PLC.h" /****************/ /* Decode frame */ diff --git a/silk/silk_decode_indices.c b/silk/decode_indices.c index 99afd547..9ea0a80e 100644 --- a/silk/silk_decode_indices.c +++ b/silk/decode_indices.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Decode side-information parameters from payload */ void silk_decode_indices( diff --git a/silk/silk_decode_parameters.c b/silk/decode_parameters.c index a4b1fc00..ad4788f9 100644 --- a/silk/silk_decode_parameters.c +++ b/silk/decode_parameters.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Decode parameters from payload */ void silk_decode_parameters( diff --git a/silk/silk_decode_pitch.c b/silk/decode_pitch.c index 00df918f..6aeb7ab2 100644 --- a/silk/silk_decode_pitch.c +++ b/silk/decode_pitch.c @@ -32,8 +32,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /*********************************************************** * Pitch analyser function ********************************************************** */ -#include "silk_SigProc_FIX.h" -#include "silk_pitch_est_defines.h" +#include "SigProc_FIX.h" +#include "pitch_est_defines.h" void silk_decode_pitch( opus_int16 lagIndex, /* I */ diff --git a/silk/silk_decode_pulses.c b/silk/decode_pulses.c index 924bcb9f..8b3fae70 100644 --- a/silk/silk_decode_pulses.c +++ b/silk/decode_pulses.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /*********************************************/ /* Decode quantization indices of excitation */ diff --git a/silk/silk_decoder_set_fs.c b/silk/decoder_set_fs.c index dea18360..02cdff00 100644 --- a/silk/silk_decoder_set_fs.c +++ b/silk/decoder_set_fs.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Set decoder sampling rate */ void silk_decoder_set_fs( diff --git a/silk/silk_define.h b/silk/define.h index 3c54a756..dcfeb1d3 100644 --- a/silk/silk_define.h +++ b/silk/define.h @@ -28,8 +28,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_DEFINE_H #define SILK_DEFINE_H -#include "silk_errors.h" -#include "silk_typedef.h" +#include "errors.h" +#include "typedef.h" #ifdef __cplusplus extern "C" diff --git a/silk/silk_enc_API.c b/silk/enc_API.c index ecd8abee..29d75686 100644 --- a/silk/silk_enc_API.c +++ b/silk/enc_API.c @@ -28,16 +28,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "silk_define.h" -#include "silk_API.h" -#include "silk_control.h" -#include "silk_typedef.h" -#include "silk_structs.h" -#include "silk_tuning_parameters.h" +#include "define.h" +#include "API.h" +#include "control.h" +#include "typedef.h" +#include "structs.h" +#include "tuning_parameters.h" #ifdef FIXED_POINT -#include "silk_main_FIX.h" +#include "main_FIX.h" #else -#include "silk_main_FLP.h" +#include "main_FLP.h" #endif /****************************************/ diff --git a/silk/silk_encode_indices.c b/silk/encode_indices.c index 61f174fe..aa4585f4 100644 --- a/silk/silk_encode_indices.c +++ b/silk/encode_indices.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Encode side-information parameters to payload */ void silk_encode_indices( diff --git a/silk/silk_encode_pulses.c b/silk/encode_pulses.c index 9c529fff..2fd6b505 100644 --- a/silk/silk_encode_pulses.c +++ b/silk/encode_pulses.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /*********************************************/ /* Encode quantization indices of excitation */ diff --git a/silk/silk_errors.h b/silk/errors.h index b936cf5a..b936cf5a 100644 --- a/silk/silk_errors.h +++ b/silk/errors.h diff --git a/silk/fixed/silk_LTP_analysis_filter_FIX.c b/silk/fixed/LTP_analysis_filter_FIX.c index 7809a329..f31a5500 100644 --- a/silk/fixed/silk_LTP_analysis_filter_FIX.c +++ b/silk/fixed/LTP_analysis_filter_FIX.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" +#include "main_FIX.h" void silk_LTP_analysis_filter_FIX( opus_int16 *LTP_res, /* O: LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length ) */ diff --git a/silk/fixed/silk_LTP_scale_ctrl_FIX.c b/silk/fixed/LTP_scale_ctrl_FIX.c index abd53568..463cf735 100644 --- a/silk/fixed/silk_LTP_scale_ctrl_FIX.c +++ b/silk/fixed/LTP_scale_ctrl_FIX.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" +#include "main_FIX.h" void silk_LTP_scale_ctrl_FIX( silk_encoder_state_FIX *psEnc, /* I/O encoder state FIX */ diff --git a/silk/fixed/silk_corrMatrix_FIX.c b/silk/fixed/corrMatrix_FIX.c index 4475b9c8..09994d0d 100644 --- a/silk/fixed/silk_corrMatrix_FIX.c +++ b/silk/fixed/corrMatrix_FIX.c @@ -33,7 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * Correlation Matrix Computations for LS estimate. **********************************************************************/ -#include "silk_main_FIX.h" +#include "main_FIX.h" /* Calculates correlation vector X'*t */ void silk_corrVector_FIX( diff --git a/silk/fixed/silk_encode_frame_FIX.c b/silk/fixed/encode_frame_FIX.c index ad522077..55cf5395 100644 --- a/silk/fixed/silk_encode_frame_FIX.c +++ b/silk/fixed/encode_frame_FIX.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" -#include "silk_tuning_parameters.h" +#include "main_FIX.h" +#include "tuning_parameters.h" /****************/ /* Encode frame */ diff --git a/silk/fixed/silk_find_LPC_FIX.c b/silk/fixed/find_LPC_FIX.c index a1bda7a6..aab4d0ff 100644 --- a/silk/fixed/silk_find_LPC_FIX.c +++ b/silk/fixed/find_LPC_FIX.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" -#include "silk_tuning_parameters.h" +#include "main_FIX.h" +#include "tuning_parameters.h" /* Finds LPC vector from correlations, and converts to NLSF */ void silk_find_LPC_FIX( diff --git a/silk/fixed/silk_find_LTP_FIX.c b/silk/fixed/find_LTP_FIX.c index eaeaba1f..2de290d5 100644 --- a/silk/fixed/silk_find_LTP_FIX.c +++ b/silk/fixed/find_LTP_FIX.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" -#include "silk_tuning_parameters.h" +#include "main_FIX.h" +#include "tuning_parameters.h" /* Head room for correlations */ #define LTP_CORRS_HEAD_ROOM 2 diff --git a/silk/fixed/silk_find_pitch_lags_FIX.c b/silk/fixed/find_pitch_lags_FIX.c index ba69668d..c40efe94 100644 --- a/silk/fixed/silk_find_pitch_lags_FIX.c +++ b/silk/fixed/find_pitch_lags_FIX.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" -#include "silk_tuning_parameters.h" +#include "main_FIX.h" +#include "tuning_parameters.h" /* Find pitch lags */ void silk_find_pitch_lags_FIX( diff --git a/silk/fixed/silk_find_pred_coefs_FIX.c b/silk/fixed/find_pred_coefs_FIX.c index f7ad87f2..980e321d 100644 --- a/silk/fixed/silk_find_pred_coefs_FIX.c +++ b/silk/fixed/find_pred_coefs_FIX.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" +#include "main_FIX.h" void silk_find_pred_coefs_FIX( silk_encoder_state_FIX *psEnc, /* I/O encoder state */ diff --git a/silk/fixed/silk_main_FIX.h b/silk/fixed/main_FIX.h index fa13f8d3..0a98edc3 100644 --- a/silk/fixed/silk_main_FIX.h +++ b/silk/fixed/main_FIX.h @@ -28,12 +28,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MAIN_FIX_H #define SILK_MAIN_FIX_H -#include "silk_SigProc_FIX.h" -#include "silk_structs_FIX.h" -#include "silk_control.h" -#include "silk_main.h" -#include "silk_PLC.h" -#include "silk_debug.h" +#include "SigProc_FIX.h" +#include "structs_FIX.h" +#include "control.h" +#include "main.h" +#include "PLC.h" +#include "debug.h" #include "entenc.h" #ifndef FORCE_CPP_BUILD diff --git a/silk/fixed/silk_noise_shape_analysis_FIX.c b/silk/fixed/noise_shape_analysis_FIX.c index c4789e66..8f5ac7bf 100644 --- a/silk/fixed/silk_noise_shape_analysis_FIX.c +++ b/silk/fixed/noise_shape_analysis_FIX.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" -#include "silk_tuning_parameters.h" +#include "main_FIX.h" +#include "tuning_parameters.h" /* Compute gain to make warped filter coefficients have a zero mean log frequency response on a */ /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */ diff --git a/silk/fixed/silk_prefilter_FIX.c b/silk/fixed/prefilter_FIX.c index f4c1bb23..493a46b0 100644 --- a/silk/fixed/silk_prefilter_FIX.c +++ b/silk/fixed/prefilter_FIX.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" -#include "silk_tuning_parameters.h" +#include "main_FIX.h" +#include "tuning_parameters.h" /* silk_prefilter. Prefilter for finding Quantizer input signal */ static inline void silk_prefilt_FIX( diff --git a/silk/fixed/silk_process_gains_FIX.c b/silk/fixed/process_gains_FIX.c index 405faa5c..0dea69b6 100644 --- a/silk/fixed/silk_process_gains_FIX.c +++ b/silk/fixed/process_gains_FIX.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" -#include "silk_tuning_parameters.h" +#include "main_FIX.h" +#include "tuning_parameters.h" /* Processing of gains */ void silk_process_gains_FIX( diff --git a/silk/fixed/silk_regularize_correlations_FIX.c b/silk/fixed/regularize_correlations_FIX.c index 926c812b..d8e79949 100644 --- a/silk/fixed/silk_regularize_correlations_FIX.c +++ b/silk/fixed/regularize_correlations_FIX.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" +#include "main_FIX.h" /* Add noise to matrix diagonal */ void silk_regularize_correlations_FIX( diff --git a/silk/fixed/silk_residual_energy16_FIX.c b/silk/fixed/residual_energy16_FIX.c index 08a3b0fd..e73cdf85 100644 --- a/silk/fixed/silk_residual_energy16_FIX.c +++ b/silk/fixed/residual_energy16_FIX.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" +#include "main_FIX.h" /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */ opus_int32 silk_residual_energy16_covar_FIX( diff --git a/silk/fixed/silk_residual_energy_FIX.c b/silk/fixed/residual_energy_FIX.c index eed19ed0..0053a89d 100644 --- a/silk/fixed/silk_residual_energy_FIX.c +++ b/silk/fixed/residual_energy_FIX.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" +#include "main_FIX.h" /* Calculates residual energies of input subframes where all subframes have LPC_order */ /* of preceeding samples */ diff --git a/silk/fixed/silk_fixed.vcxproj b/silk/fixed/silk_fixed.vcxproj index 6d7bd04b..9e2a6056 100644 --- a/silk/fixed/silk_fixed.vcxproj +++ b/silk/fixed/silk_fixed.vcxproj @@ -86,28 +86,28 @@ <None Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="silk_corrMatrix_FIX.c" />
- <ClCompile Include="silk_encode_frame_FIX.c" />
- <ClCompile Include="silk_find_LPC_FIX.c" />
- <ClCompile Include="silk_find_LTP_FIX.c" />
- <ClCompile Include="silk_find_pitch_lags_FIX.c" />
- <ClCompile Include="silk_find_pred_coefs_FIX.c" />
- <ClCompile Include="silk_LTP_analysis_filter_FIX.c" />
- <ClCompile Include="silk_LTP_scale_ctrl_FIX.c" />
- <ClCompile Include="silk_noise_shape_analysis_FIX.c" />
- <ClCompile Include="silk_prefilter_FIX.c" />
- <ClCompile Include="silk_process_gains_FIX.c" />
- <ClCompile Include="silk_regularize_correlations_FIX.c" />
- <ClCompile Include="silk_residual_energy16_FIX.c" />
- <ClCompile Include="silk_residual_energy_FIX.c" />
- <ClCompile Include="silk_solve_LS_FIX.c" />
- <ClCompile Include="silk_warped_autocorrelation_FIX.c" />
+ <ClCompile Include="corrMatrix_FIX.c" />
+ <ClCompile Include="encode_frame_FIX.c" />
+ <ClCompile Include="find_LPC_FIX.c" />
+ <ClCompile Include="find_LTP_FIX.c" />
+ <ClCompile Include="find_pitch_lags_FIX.c" />
+ <ClCompile Include="find_pred_coefs_FIX.c" />
+ <ClCompile Include="LTP_analysis_filter_FIX.c" />
+ <ClCompile Include="LTP_scale_ctrl_FIX.c" />
+ <ClCompile Include="noise_shape_analysis_FIX.c" />
+ <ClCompile Include="prefilter_FIX.c" />
+ <ClCompile Include="process_gains_FIX.c" />
+ <ClCompile Include="regularize_correlations_FIX.c" />
+ <ClCompile Include="residual_energy16_FIX.c" />
+ <ClCompile Include="residual_energy_FIX.c" />
+ <ClCompile Include="solve_LS_FIX.c" />
+ <ClCompile Include="warped_autocorrelation_FIX.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\win32\config.h" />
- <ClInclude Include="..\silk_SigProc_FIX.h" />
- <ClInclude Include="silk_main_FIX.h" />
- <ClInclude Include="silk_structs_FIX.h" />
+ <ClInclude Include="..\SigProc_FIX.h" />
+ <ClInclude Include="main_FIX.h" />
+ <ClInclude Include="structs_FIX.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/silk/fixed/silk_fixed.vcxproj.filters b/silk/fixed/silk_fixed.vcxproj.filters index 4fbb3696..c26e874b 100644 --- a/silk/fixed/silk_fixed.vcxproj.filters +++ b/silk/fixed/silk_fixed.vcxproj.filters @@ -18,52 +18,52 @@ <None Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="silk_corrMatrix_FIX.c">
+ <ClCompile Include="corrMatrix_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_encode_frame_FIX.c">
+ <ClCompile Include="encode_frame_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_find_LPC_FIX.c">
+ <ClCompile Include="find_LPC_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_find_LTP_FIX.c">
+ <ClCompile Include="find_LTP_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_find_pitch_lags_FIX.c">
+ <ClCompile Include="find_pitch_lags_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_find_pred_coefs_FIX.c">
+ <ClCompile Include="find_pred_coefs_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_LTP_analysis_filter_FIX.c">
+ <ClCompile Include="LTP_analysis_filter_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_LTP_scale_ctrl_FIX.c">
+ <ClCompile Include="LTP_scale_ctrl_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_noise_shape_analysis_FIX.c">
+ <ClCompile Include="noise_shape_analysis_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_prefilter_FIX.c">
+ <ClCompile Include="prefilter_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_process_gains_FIX.c">
+ <ClCompile Include="process_gains_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_regularize_correlations_FIX.c">
+ <ClCompile Include="regularize_correlations_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_residual_energy16_FIX.c">
+ <ClCompile Include="residual_energy16_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_residual_energy_FIX.c">
+ <ClCompile Include="residual_energy_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_solve_LS_FIX.c">
+ <ClCompile Include="solve_LS_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_warped_autocorrelation_FIX.c">
+ <ClCompile Include="warped_autocorrelation_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -71,13 +71,13 @@ <ClInclude Include="..\..\win32\config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_main_FIX.h">
+ <ClInclude Include="main_FIX.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\silk_SigProc_FIX.h">
+ <ClInclude Include="..\SigProc_FIX.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_structs_FIX.h">
+ <ClInclude Include="structs_FIX.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
diff --git a/silk/fixed/silk_solve_LS_FIX.c b/silk/fixed/solve_LS_FIX.c index 40abd148..3285051e 100644 --- a/silk/fixed/silk_solve_LS_FIX.c +++ b/silk/fixed/solve_LS_FIX.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" -#include "silk_tuning_parameters.h" +#include "main_FIX.h" +#include "tuning_parameters.h" /*****************************/ /* Internal function headers */ diff --git a/silk/fixed/silk_structs_FIX.h b/silk/fixed/structs_FIX.h index 4d5cfc3f..da22203e 100644 --- a/silk/fixed/silk_structs_FIX.h +++ b/silk/fixed/structs_FIX.h @@ -28,9 +28,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_STRUCTS_FIX_H #define SILK_STRUCTS_FIX_H -#include "silk_typedef.h" -#include "silk_main.h" -#include "silk_structs.h" +#include "typedef.h" +#include "main.h" +#include "structs.h" #ifdef __cplusplus extern "C" diff --git a/silk/fixed/silk_warped_autocorrelation_FIX.c b/silk/fixed/warped_autocorrelation_FIX.c index 0eadda45..73007e5b 100644 --- a/silk/fixed/silk_warped_autocorrelation_FIX.c +++ b/silk/fixed/warped_autocorrelation_FIX.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FIX.h" +#include "main_FIX.h" #define QC 10 #define QS 14 diff --git a/silk/float/silk_LPC_analysis_filter_FLP.c b/silk/float/LPC_analysis_filter_FLP.c index 1cfd1d7f..66911530 100644 --- a/silk/float/silk_LPC_analysis_filter_FLP.c +++ b/silk/float/LPC_analysis_filter_FLP.c @@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #include <stdlib.h> -#include "silk_main_FLP.h" +#include "main_FLP.h" /************************************************/ /* LPC analysis filter */ diff --git a/silk/float/silk_LPC_inv_pred_gain_FLP.c b/silk/float/LPC_inv_pred_gain_FLP.c index 29c0c0d2..a141d111 100644 --- a/silk/float/silk_LPC_inv_pred_gain_FLP.c +++ b/silk/float/LPC_inv_pred_gain_FLP.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_SigProc_FLP.h" +#include "SigProc_FIX.h" +#include "SigProc_FLP.h" #define RC_THRESHOLD 0.9999f diff --git a/silk/float/silk_LTP_analysis_filter_FLP.c b/silk/float/LTP_analysis_filter_FLP.c index 4b54c0f6..030aea11 100644 --- a/silk/float/silk_LTP_analysis_filter_FLP.c +++ b/silk/float/LTP_analysis_filter_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" +#include "main_FLP.h" void silk_LTP_analysis_filter_FLP( silk_float *LTP_res, /* O LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */ diff --git a/silk/float/silk_LTP_scale_ctrl_FLP.c b/silk/float/LTP_scale_ctrl_FLP.c index bd4405dd..76290b14 100644 --- a/silk/float/silk_LTP_scale_ctrl_FLP.c +++ b/silk/float/LTP_scale_ctrl_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" +#include "main_FLP.h" void silk_LTP_scale_ctrl_FLP( silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ diff --git a/silk/float/silk_SigProc_FLP.h b/silk/float/SigProc_FLP.h index b1019245..b11c396d 100644 --- a/silk/float/silk_SigProc_FLP.h +++ b/silk/float/SigProc_FLP.h @@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef _SILK_SIGPROC_FLP_H_ #define _SILK_SIGPROC_FLP_H_ -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" #include <math.h> #ifdef __cplusplus diff --git a/silk/float/silk_apply_sine_window_FLP.c b/silk/float/apply_sine_window_FLP.c index 9a82d9c2..4de05dd7 100644 --- a/silk/float/silk_apply_sine_window_FLP.c +++ b/silk/float/apply_sine_window_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" +#include "main_FLP.h" /* Apply sine window to signal vector. */ /* Window types: */ diff --git a/silk/float/silk_autocorrelation_FLP.c b/silk/float/autocorrelation_FLP.c index 5c6662a3..89c016df 100644 --- a/silk/float/silk_autocorrelation_FLP.c +++ b/silk/float/autocorrelation_FLP.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_typedef.h" -#include "silk_SigProc_FLP.h" +#include "typedef.h" +#include "SigProc_FLP.h" /* compute autocorrelation */ void silk_autocorrelation_FLP( diff --git a/silk/float/silk_burg_modified_FLP.c b/silk/float/burg_modified_FLP.c index 24806aed..afda4501 100644 --- a/silk/float/silk_burg_modified_FLP.c +++ b/silk/float/burg_modified_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FLP.h" +#include "SigProc_FLP.h" #define MAX_FRAME_SIZE 384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384*/ #define MAX_NB_SUBFR 4 diff --git a/silk/float/silk_bwexpander_FLP.c b/silk/float/bwexpander_FLP.c index 4a0088ae..6b6acf08 100644 --- a/silk/float/silk_bwexpander_FLP.c +++ b/silk/float/bwexpander_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FLP.h" +#include "SigProc_FLP.h" /* Chirp (bw expand) LP AR filter */ diff --git a/silk/float/silk_corrMatrix_FLP.c b/silk/float/corrMatrix_FLP.c index d66107af..56ea1cd0 100644 --- a/silk/float/silk_corrMatrix_FLP.c +++ b/silk/float/corrMatrix_FLP.c @@ -33,7 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * Correlation matrix computations for LS estimate. **********************************************************************/ -#include "silk_main_FLP.h" +#include "main_FLP.h" /* Calculates correlation vector X'*t */ void silk_corrVector_FLP( diff --git a/silk/float/silk_encode_frame_FLP.c b/silk/float/encode_frame_FLP.c index fce61601..a50b0a12 100644 --- a/silk/float/silk_encode_frame_FLP.c +++ b/silk/float/encode_frame_FLP.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" -#include "silk_tuning_parameters.h" +#include "main_FLP.h" +#include "tuning_parameters.h" /****************/ /* Encode frame */ diff --git a/silk/float/silk_energy_FLP.c b/silk/float/energy_FLP.c index bb6c7807..86767da3 100644 --- a/silk/float/silk_energy_FLP.c +++ b/silk/float/energy_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FLP.h" +#include "SigProc_FLP.h" /* sum of squares of a silk_float array, with result as double */ double silk_energy_FLP( diff --git a/silk/float/silk_find_LPC_FLP.c b/silk/float/find_LPC_FLP.c index f98e9505..18373fbf 100644 --- a/silk/float/silk_find_LPC_FLP.c +++ b/silk/float/find_LPC_FLP.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" -#include "silk_tuning_parameters.h" +#include "main_FLP.h" +#include "tuning_parameters.h" void silk_find_LPC_FLP( opus_int16 NLSF_Q15[], /* O NLSFs */ diff --git a/silk/float/silk_find_LTP_FLP.c b/silk/float/find_LTP_FLP.c index faf1b982..a95f5646 100644 --- a/silk/float/silk_find_LTP_FLP.c +++ b/silk/float/find_LTP_FLP.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" -#include "silk_tuning_parameters.h" +#include "main_FLP.h" +#include "tuning_parameters.h" void silk_find_LTP_FLP( silk_float b[ MAX_NB_SUBFR * LTP_ORDER ], /* O LTP coefs */ diff --git a/silk/float/silk_find_pitch_lags_FLP.c b/silk/float/find_pitch_lags_FLP.c index 05629eaf..b37c0ff0 100644 --- a/silk/float/silk_find_pitch_lags_FLP.c +++ b/silk/float/find_pitch_lags_FLP.c @@ -30,8 +30,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #include <stdlib.h> -#include "silk_main_FLP.h" -#include "silk_tuning_parameters.h" +#include "main_FLP.h" +#include "tuning_parameters.h" void silk_find_pitch_lags_FLP( silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ diff --git a/silk/float/silk_find_pred_coefs_FLP.c b/silk/float/find_pred_coefs_FLP.c index 9ad33779..49c29d36 100644 --- a/silk/float/silk_find_pred_coefs_FLP.c +++ b/silk/float/find_pred_coefs_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" +#include "main_FLP.h" void silk_find_pred_coefs_FLP( diff --git a/silk/float/silk_inner_product_FLP.c b/silk/float/inner_product_FLP.c index 18444e1d..4ed56a35 100644 --- a/silk/float/silk_inner_product_FLP.c +++ b/silk/float/inner_product_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FLP.h" +#include "SigProc_FLP.h" /* inner product of two silk_float arrays, with result as double */ double silk_inner_product_FLP( /* O result */ diff --git a/silk/float/silk_k2a_FLP.c b/silk/float/k2a_FLP.c index dd2081b8..8884b8dc 100644 --- a/silk/float/silk_k2a_FLP.c +++ b/silk/float/k2a_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FLP.h" +#include "SigProc_FLP.h" /* step up function, converts reflection coefficients to prediction coefficients */ void silk_k2a_FLP( diff --git a/silk/float/silk_levinsondurbin_FLP.c b/silk/float/levinsondurbin_FLP.c index 05933bba..813b1175 100644 --- a/silk/float/silk_levinsondurbin_FLP.c +++ b/silk/float/levinsondurbin_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FLP.h" +#include "SigProc_FLP.h" /* Solve the normal equations using the Levinson-Durbin recursion */ silk_float silk_levinsondurbin_FLP( /* O prediction error energy */ diff --git a/silk/float/silk_main_FLP.h b/silk/float/main_FLP.h index da658616..a8da330b 100644 --- a/silk/float/silk_main_FLP.h +++ b/silk/float/main_FLP.h @@ -28,12 +28,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MAIN_FLP_H #define SILK_MAIN_FLP_H -#include "silk_SigProc_FLP.h" -#include "silk_SigProc_FIX.h" -#include "silk_structs_FLP.h" -#include "silk_main.h" -#include "silk_define.h" -#include "silk_debug.h" +#include "SigProc_FLP.h" +#include "SigProc_FIX.h" +#include "structs_FLP.h" +#include "main.h" +#include "define.h" +#include "debug.h" #include "entenc.h" #ifdef __cplusplus diff --git a/silk/float/silk_noise_shape_analysis_FLP.c b/silk/float/noise_shape_analysis_FLP.c index ac4c8872..4d82858b 100644 --- a/silk/float/silk_noise_shape_analysis_FLP.c +++ b/silk/float/noise_shape_analysis_FLP.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" -#include "silk_tuning_parameters.h" +#include "main_FLP.h" +#include "tuning_parameters.h" /* Compute gain to make warped filter coefficients have a zero mean log frequency response on a */ /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */ diff --git a/silk/float/silk_pitch_analysis_core_FLP.c b/silk/float/pitch_analysis_core_FLP.c index 5aaf41af..11f9bead 100644 --- a/silk/float/silk_pitch_analysis_core_FLP.c +++ b/silk/float/pitch_analysis_core_FLP.c @@ -34,9 +34,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * Pitch analyser function * ******************************************************************************/ -#include "silk_SigProc_FLP.h" -#include "silk_SigProc_FIX.h" -#include "silk_pitch_est_defines.h" +#include "SigProc_FLP.h" +#include "SigProc_FIX.h" +#include "pitch_est_defines.h" #define SCRATCH_SIZE 22 diff --git a/silk/float/silk_prefilter_FLP.c b/silk/float/prefilter_FLP.c index 6737559b..9f16e2dd 100644 --- a/silk/float/silk_prefilter_FLP.c +++ b/silk/float/prefilter_FLP.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" -#include "silk_tuning_parameters.h" +#include "main_FLP.h" +#include "tuning_parameters.h" /* * silk_prefilter. Prefilter for finding Quantizer input signal diff --git a/silk/float/silk_process_gains_FLP.c b/silk/float/process_gains_FLP.c index 33dada2a..e0c18a97 100644 --- a/silk/float/silk_process_gains_FLP.c +++ b/silk/float/process_gains_FLP.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" -#include "silk_tuning_parameters.h" +#include "main_FLP.h" +#include "tuning_parameters.h" /* Processing of gains */ void silk_process_gains_FLP( diff --git a/silk/float/silk_regularize_correlations_FLP.c b/silk/float/regularize_correlations_FLP.c index 7034dd3e..0876e6a9 100644 --- a/silk/float/silk_regularize_correlations_FLP.c +++ b/silk/float/regularize_correlations_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" +#include "main_FLP.h" void silk_regularize_correlations_FLP( silk_float *XX, /* I/O Correlation matrices */ diff --git a/silk/float/silk_residual_energy_FLP.c b/silk/float/residual_energy_FLP.c index 6ab9ecf2..da3b841d 100644 --- a/silk/float/silk_residual_energy_FLP.c +++ b/silk/float/residual_energy_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" +#include "main_FLP.h" #define MAX_ITERATIONS_RESIDUAL_NRG 10 #define REGULARIZATION_FACTOR 1e-8f diff --git a/silk/float/silk_scale_copy_vector_FLP.c b/silk/float/scale_copy_vector_FLP.c index ca6867e1..689134f4 100644 --- a/silk/float/silk_scale_copy_vector_FLP.c +++ b/silk/float/scale_copy_vector_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FLP.h" +#include "SigProc_FLP.h" /* copy and multiply a vector by a constant */ void silk_scale_copy_vector_FLP( diff --git a/silk/float/silk_scale_vector_FLP.c b/silk/float/scale_vector_FLP.c index 33982ebb..656061e4 100644 --- a/silk/float/silk_scale_vector_FLP.c +++ b/silk/float/scale_vector_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FLP.h" +#include "SigProc_FLP.h" /* multiply a vector by a constant */ void silk_scale_vector_FLP( diff --git a/silk/float/silk_schur_FLP.c b/silk/float/schur_FLP.c index d13d5ccd..0f123698 100644 --- a/silk/float/silk_schur_FLP.c +++ b/silk/float/schur_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FLP.h" +#include "SigProc_FLP.h" silk_float silk_schur_FLP( /* O returns residual energy */ silk_float refl_coef[], /* O reflection coefficients (length order) */ diff --git a/silk/float/silk_float.vcxproj b/silk/float/silk_float.vcxproj index c4a34417..abcdaf05 100644 --- a/silk/float/silk_float.vcxproj +++ b/silk/float/silk_float.vcxproj @@ -86,43 +86,43 @@ <None Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="silk_apply_sine_window_FLP.c" />
- <ClCompile Include="silk_autocorrelation_FLP.c" />
- <ClCompile Include="silk_burg_modified_FLP.c" />
- <ClCompile Include="silk_bwexpander_FLP.c" />
- <ClCompile Include="silk_corrMatrix_FLP.c" />
- <ClCompile Include="silk_encode_frame_FLP.c" />
- <ClCompile Include="silk_energy_FLP.c" />
- <ClCompile Include="silk_find_LPC_FLP.c" />
- <ClCompile Include="silk_find_LTP_FLP.c" />
- <ClCompile Include="silk_find_pitch_lags_FLP.c" />
- <ClCompile Include="silk_find_pred_coefs_FLP.c" />
- <ClCompile Include="silk_inner_product_FLP.c" />
- <ClCompile Include="silk_k2a_FLP.c" />
- <ClCompile Include="silk_levinsondurbin_FLP.c" />
- <ClCompile Include="silk_LPC_analysis_filter_FLP.c" />
- <ClCompile Include="silk_LPC_inv_pred_gain_FLP.c" />
- <ClCompile Include="silk_LTP_analysis_filter_FLP.c" />
- <ClCompile Include="silk_LTP_scale_ctrl_FLP.c" />
- <ClCompile Include="silk_noise_shape_analysis_FLP.c" />
- <ClCompile Include="silk_pitch_analysis_core_FLP.c" />
- <ClCompile Include="silk_prefilter_FLP.c" />
- <ClCompile Include="silk_process_gains_FLP.c" />
- <ClCompile Include="silk_regularize_correlations_FLP.c" />
- <ClCompile Include="silk_residual_energy_FLP.c" />
- <ClCompile Include="silk_scale_copy_vector_FLP.c" />
- <ClCompile Include="silk_scale_vector_FLP.c" />
- <ClCompile Include="silk_schur_FLP.c" />
- <ClCompile Include="silk_solve_LS_FLP.c" />
- <ClCompile Include="silk_sort_FLP.c" />
- <ClCompile Include="silk_warped_autocorrelation_FLP.c" />
- <ClCompile Include="silk_wrappers_FLP.c" />
+ <ClCompile Include="apply_sine_window_FLP.c" />
+ <ClCompile Include="autocorrelation_FLP.c" />
+ <ClCompile Include="burg_modified_FLP.c" />
+ <ClCompile Include="bwexpander_FLP.c" />
+ <ClCompile Include="corrMatrix_FLP.c" />
+ <ClCompile Include="encode_frame_FLP.c" />
+ <ClCompile Include="energy_FLP.c" />
+ <ClCompile Include="find_LPC_FLP.c" />
+ <ClCompile Include="find_LTP_FLP.c" />
+ <ClCompile Include="find_pitch_lags_FLP.c" />
+ <ClCompile Include="find_pred_coefs_FLP.c" />
+ <ClCompile Include="inner_product_FLP.c" />
+ <ClCompile Include="k2a_FLP.c" />
+ <ClCompile Include="levinsondurbin_FLP.c" />
+ <ClCompile Include="LPC_analysis_filter_FLP.c" />
+ <ClCompile Include="LPC_inv_pred_gain_FLP.c" />
+ <ClCompile Include="LTP_analysis_filter_FLP.c" />
+ <ClCompile Include="LTP_scale_ctrl_FLP.c" />
+ <ClCompile Include="noise_shape_analysis_FLP.c" />
+ <ClCompile Include="pitch_analysis_core_FLP.c" />
+ <ClCompile Include="prefilter_FLP.c" />
+ <ClCompile Include="process_gains_FLP.c" />
+ <ClCompile Include="regularize_correlations_FLP.c" />
+ <ClCompile Include="residual_energy_FLP.c" />
+ <ClCompile Include="scale_copy_vector_FLP.c" />
+ <ClCompile Include="scale_vector_FLP.c" />
+ <ClCompile Include="schur_FLP.c" />
+ <ClCompile Include="solve_LS_FLP.c" />
+ <ClCompile Include="sort_FLP.c" />
+ <ClCompile Include="warped_autocorrelation_FLP.c" />
+ <ClCompile Include="wrappers_FLP.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\win32\config.h" />
- <ClInclude Include="silk_main_FLP.h" />
- <ClInclude Include="silk_SigProc_FLP.h" />
- <ClInclude Include="silk_structs_FLP.h" />
+ <ClInclude Include="main_FLP.h" />
+ <ClInclude Include="SigProc_FLP.h" />
+ <ClInclude Include="structs_FLP.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/silk/float/silk_float.vcxproj.filters b/silk/float/silk_float.vcxproj.filters index debd97d9..bf29bbe1 100644 --- a/silk/float/silk_float.vcxproj.filters +++ b/silk/float/silk_float.vcxproj.filters @@ -18,97 +18,97 @@ <None Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="silk_apply_sine_window_FLP.c">
+ <ClCompile Include="apply_sine_window_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_autocorrelation_FLP.c">
+ <ClCompile Include="autocorrelation_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_burg_modified_FLP.c">
+ <ClCompile Include="burg_modified_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_bwexpander_FLP.c">
+ <ClCompile Include="bwexpander_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_corrMatrix_FLP.c">
+ <ClCompile Include="corrMatrix_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_encode_frame_FLP.c">
+ <ClCompile Include="encode_frame_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_energy_FLP.c">
+ <ClCompile Include="energy_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_find_LPC_FLP.c">
+ <ClCompile Include="find_LPC_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_find_LTP_FLP.c">
+ <ClCompile Include="find_LTP_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_find_pitch_lags_FLP.c">
+ <ClCompile Include="find_pitch_lags_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_find_pred_coefs_FLP.c">
+ <ClCompile Include="find_pred_coefs_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_inner_product_FLP.c">
+ <ClCompile Include="inner_product_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_k2a_FLP.c">
+ <ClCompile Include="k2a_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_levinsondurbin_FLP.c">
+ <ClCompile Include="levinsondurbin_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_LPC_analysis_filter_FLP.c">
+ <ClCompile Include="LPC_analysis_filter_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_LPC_inv_pred_gain_FLP.c">
+ <ClCompile Include="LPC_inv_pred_gain_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_LTP_analysis_filter_FLP.c">
+ <ClCompile Include="LTP_analysis_filter_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_LTP_scale_ctrl_FLP.c">
+ <ClCompile Include="LTP_scale_ctrl_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_noise_shape_analysis_FLP.c">
+ <ClCompile Include="noise_shape_analysis_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_pitch_analysis_core_FLP.c">
+ <ClCompile Include="pitch_analysis_core_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_prefilter_FLP.c">
+ <ClCompile Include="prefilter_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_process_gains_FLP.c">
+ <ClCompile Include="process_gains_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_regularize_correlations_FLP.c">
+ <ClCompile Include="regularize_correlations_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_residual_energy_FLP.c">
+ <ClCompile Include="residual_energy_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_scale_copy_vector_FLP.c">
+ <ClCompile Include="scale_copy_vector_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_scale_vector_FLP.c">
+ <ClCompile Include="scale_vector_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_schur_FLP.c">
+ <ClCompile Include="schur_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_solve_LS_FLP.c">
+ <ClCompile Include="solve_LS_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_sort_FLP.c">
+ <ClCompile Include="sort_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_warped_autocorrelation_FLP.c">
+ <ClCompile Include="warped_autocorrelation_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_wrappers_FLP.c">
+ <ClCompile Include="wrappers_FLP.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -116,13 +116,13 @@ <ClInclude Include="..\..\win32\config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_main_FLP.h">
+ <ClInclude Include="main_FLP.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_SigProc_FLP.h">
+ <ClInclude Include="SigProc_FLP.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_structs_FLP.h">
+ <ClInclude Include="structs_FLP.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
diff --git a/silk/float/silk_solve_LS_FLP.c b/silk/float/solve_LS_FLP.c index fc38c7f3..8baf2c61 100644 --- a/silk/float/silk_solve_LS_FLP.c +++ b/silk/float/solve_LS_FLP.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" -#include "silk_tuning_parameters.h" +#include "main_FLP.h" +#include "tuning_parameters.h" /********************************************************************** * LDL Factorisation. Finds the upper triangular matrix L and the diagonal diff --git a/silk/float/silk_sort_FLP.c b/silk/float/sort_FLP.c index c08fb32f..19860db9 100644 --- a/silk/float/silk_sort_FLP.c +++ b/silk/float/sort_FLP.c @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* Best case: O(n) for an already sorted array */ /* Worst case: O(n^2) for an inversely sorted array */ -#include "silk_typedef.h" -#include "silk_SigProc_FLP.h" +#include "typedef.h" +#include "SigProc_FLP.h" void silk_insertion_sort_decreasing_FLP( silk_float *a, /* I/O: Unsorted / Sorted vector */ diff --git a/silk/float/silk_structs_FLP.h b/silk/float/structs_FLP.h index 68d358a2..4e729a63 100644 --- a/silk/float/silk_structs_FLP.h +++ b/silk/float/structs_FLP.h @@ -28,9 +28,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_STRUCTS_FLP_H #define SILK_STRUCTS_FLP_H -#include "silk_typedef.h" -#include "silk_main.h" -#include "silk_structs.h" +#include "typedef.h" +#include "main.h" +#include "structs.h" #ifdef __cplusplus extern "C" diff --git a/silk/float/silk_warped_autocorrelation_FLP.c b/silk/float/warped_autocorrelation_FLP.c index de08d497..236dbed8 100644 --- a/silk/float/silk_warped_autocorrelation_FLP.c +++ b/silk/float/warped_autocorrelation_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" +#include "main_FLP.h" /* Autocorrelations for a warped frequency axis */ void silk_warped_autocorrelation_FLP( diff --git a/silk/float/silk_wrappers_FLP.c b/silk/float/wrappers_FLP.c index 2e38f081..f4c046a6 100644 --- a/silk/float/silk_wrappers_FLP.c +++ b/silk/float/wrappers_FLP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main_FLP.h" +#include "main_FLP.h" /* Wrappers. Calls flp / fix code */ diff --git a/silk/silk_gain_quant.c b/silk/gain_quant.c index 0092601a..9b52a32e 100644 --- a/silk/silk_gain_quant.c +++ b/silk/gain_quant.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" #define OFFSET ( ( MIN_QGAIN_DB * 128 ) / 6 + 16 * 128 ) #define SCALE_Q16 ( ( 65536 * ( N_LEVELS_QGAIN - 1 ) ) / ( ( ( MAX_QGAIN_DB - MIN_QGAIN_DB ) * 128 ) / 6 ) ) diff --git a/silk/silk_init_encoder.c b/silk/init_encoder.c index 540e4fc6..cebf8ccd 100644 --- a/silk/silk_init_encoder.c +++ b/silk/init_encoder.c @@ -29,11 +29,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif #ifdef FIXED_POINT -#include "silk_main_FIX.h" +#include "main_FIX.h" #else -#include "silk_main_FLP.h" +#include "main_FLP.h" #endif -#include "silk_tuning_parameters.h" +#include "tuning_parameters.h" /*********************************/ /* Initialize Silk Encoder state */ diff --git a/silk/silk_inner_prod_aligned.c b/silk/inner_prod_aligned.c index 9897ef16..bf00a749 100644 --- a/silk/silk_inner_prod_aligned.c +++ b/silk/inner_prod_aligned.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* sum= for(i=0;i<len;i++)inVec1[i]*inVec2[i]; --- inner product */ /* Note for ARM asm: */ diff --git a/silk/silk_interpolate.c b/silk/interpolate.c index 40292569..9309aad5 100644 --- a/silk/silk_interpolate.c +++ b/silk/interpolate.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Interpolate two vectors */ void silk_interpolate( diff --git a/silk/silk_k2a.c b/silk/k2a.c index 04f8f9f8..98c6bf29 100644 --- a/silk/silk_k2a.c +++ b/silk/k2a.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Step up function, converts reflection coefficients to prediction coefficients */ void silk_k2a( diff --git a/silk/silk_k2a_Q16.c b/silk/k2a_Q16.c index 41f661ee..962e2306 100644 --- a/silk/silk_k2a_Q16.c +++ b/silk/k2a_Q16.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Step up function, converts reflection coefficients to prediction coefficients */ void silk_k2a_Q16( diff --git a/silk/silk_lin2log.c b/silk/lin2log.c index a054e40e..99641583 100644 --- a/silk/silk_lin2log.c +++ b/silk/lin2log.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Approximation of 128 * log2() (very close inverse of silk_log2lin()) */ /* Convert input to a log scale */ opus_int32 silk_lin2log( const opus_int32 inLin ) /* I: Input in linear scale */ diff --git a/silk/silk_log2lin.c b/silk/log2lin.c index ae81f9c3..b49dd0a2 100644 --- a/silk/silk_log2lin.c +++ b/silk/log2lin.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Approximation of 2^() (very close inverse of silk_lin2log()) */ /* Convert input to a linear scale */ diff --git a/silk/silk_macros.h b/silk/macros.h index 9135ddea..9135ddea 100644 --- a/silk/silk_macros.h +++ b/silk/macros.h diff --git a/silk/silk_main.h b/silk/main.h index d87897cb..a91cf07d 100644 --- a/silk/silk_main.h +++ b/silk/main.h @@ -28,13 +28,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MAIN_H #define SILK_MAIN_H -#include "silk_SigProc_FIX.h" -#include "silk_define.h" -#include "silk_structs.h" -#include "silk_tables.h" -#include "silk_PLC.h" -#include "silk_control.h" -#include "silk_debug.h" +#include "SigProc_FIX.h" +#include "define.h" +#include "structs.h" +#include "tables.h" +#include "PLC.h" +#include "control.h" +#include "debug.h" #include "entenc.h" #include "entdec.h" diff --git a/silk/silk_pitch_analysis_core.c b/silk/pitch_analysis_core.c index bd6dba1e..c8ce79b1 100644 --- a/silk/silk_pitch_analysis_core.c +++ b/silk/pitch_analysis_core.c @@ -32,9 +32,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /*********************************************************** * Pitch analyser function ********************************************************** */ -#include "silk_SigProc_FIX.h" -#include "silk_pitch_est_defines.h" -#include "silk_debug.h" +#include "SigProc_FIX.h" +#include "pitch_est_defines.h" +#include "debug.h" #define SCRATCH_SIZE 22 diff --git a/silk/silk_pitch_est_defines.h b/silk/pitch_est_defines.h index f18c7ca7..c6f084f7 100644 --- a/silk/silk_pitch_est_defines.h +++ b/silk/pitch_est_defines.h @@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_PE_DEFINES_H #define SILK_PE_DEFINES_H -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /************************************************************/ /* Definitions For Fix pitch estimator */ diff --git a/silk/silk_pitch_est_tables.c b/silk/pitch_est_tables.c index 5fd7962a..aafa30db 100644 --- a/silk/silk_pitch_est_tables.c +++ b/silk/pitch_est_tables.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_typedef.h" -#include "silk_pitch_est_defines.h" +#include "typedef.h" +#include "pitch_est_defines.h" const opus_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR >> 1][ PE_NB_CBKS_STAGE2_10MS ] = { diff --git a/silk/silk_process_NLSFs.c b/silk/process_NLSFs.c index 7920e4b2..2c87f013 100644 --- a/silk/silk_process_NLSFs.c +++ b/silk/process_NLSFs.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Limit, stabilize, convert and quantize NLSFs */ void silk_process_NLSFs( diff --git a/silk/silk_quant_LTP_gains.c b/silk/quant_LTP_gains.c index 7ae09117..7a5c46c3 100644 --- a/silk/silk_quant_LTP_gains.c +++ b/silk/quant_LTP_gains.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" void silk_quant_LTP_gains( opus_int16 B_Q14[ MAX_NB_SUBFR * LTP_ORDER ], /* I/O (un)quantized LTP gains */ diff --git a/silk/silk_resampler.c b/silk/resampler.c index af6fda64..cb1aeb76 100644 --- a/silk/silk_resampler.c +++ b/silk/resampler.c @@ -55,7 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * Output signals sampled above 48 kHz are upsampled from at most 48 kHz. */ -#include "silk_resampler_private.h" +#include "resampler_private.h" /* Greatest common divisor */ static opus_int32 gcd( diff --git a/silk/silk_resampler_down2.c b/silk/resampler_down2.c index 52743a30..5a04247c 100644 --- a/silk/silk_resampler_down2.c +++ b/silk/resampler_down2.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_rom.h" +#include "SigProc_FIX.h" +#include "resampler_rom.h" /* Downsample by a factor 2, mediocre quality */ void silk_resampler_down2( diff --git a/silk/silk_resampler_down2_3.c b/silk/resampler_down2_3.c index 0057c840..bd74c614 100644 --- a/silk/silk_resampler_down2_3.c +++ b/silk/resampler_down2_3.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" #define ORDER_FIR 4 diff --git a/silk/silk_resampler_down3.c b/silk/resampler_down3.c index 73edf17b..738ebb20 100644 --- a/silk/silk_resampler_down3.c +++ b/silk/resampler_down3.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" #define ORDER_FIR 6 diff --git a/silk/silk_resampler_private.h b/silk/resampler_private.h index d5425109..de4adcaa 100644 --- a/silk/silk_resampler_private.h +++ b/silk/resampler_private.h @@ -32,9 +32,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. extern "C" { #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_structs.h" -#include "silk_resampler_rom.h" +#include "SigProc_FIX.h" +#include "resampler_structs.h" +#include "resampler_rom.h" /* Number of input samples to process in the inner loop */ #define RESAMPLER_MAX_BATCH_SIZE_IN 480 diff --git a/silk/silk_resampler_private_AR2.c b/silk/resampler_private_AR2.c index b0db7890..5c5b3f1f 100644 --- a/silk/silk_resampler_private_AR2.c +++ b/silk/resampler_private_AR2.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" /* Second order AR filter with single delay elements */ void silk_resampler_private_AR2( diff --git a/silk/silk_resampler_private_ARMA4.c b/silk/resampler_private_ARMA4.c index 1690ce30..73bcf59b 100644 --- a/silk/silk_resampler_private_ARMA4.c +++ b/silk/resampler_private_ARMA4.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" /* Fourth order ARMA filter */ /* Internally operates as two biquad filters in sequence. */ diff --git a/silk/silk_resampler_private_IIR_FIR.c b/silk/resampler_private_IIR_FIR.c index 8becba38..e6049f4e 100644 --- a/silk/silk_resampler_private_IIR_FIR.c +++ b/silk/resampler_private_IIR_FIR.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" static inline opus_int16 *silk_resampler_private_IIR_FIR_INTERPOL( opus_int16 * out, opus_int16 * buf, opus_int32 max_index_Q16 , opus_int32 index_increment_Q16 ){ diff --git a/silk/silk_resampler_private_copy.c b/silk/resampler_private_copy.c index 4bc7bb86..1d253e12 100644 --- a/silk/silk_resampler_private_copy.c +++ b/silk/resampler_private_copy.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" /* Copy */ void silk_resampler_private_copy( diff --git a/silk/silk_resampler_private_down4.c b/silk/resampler_private_down4.c index cb63d297..daa1770a 100644 --- a/silk/silk_resampler_private_down4.c +++ b/silk/resampler_private_down4.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" /* Downsample by a factor 4. Note: very low quality, only use with input sampling rates above 96 kHz. */ void silk_resampler_private_down4( diff --git a/silk/silk_resampler_private_down_FIR.c b/silk/resampler_private_down_FIR.c index 010c8409..028a200e 100644 --- a/silk/silk_resampler_private_down_FIR.c +++ b/silk/resampler_private_down_FIR.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" static inline opus_int16 *silk_resampler_private_down_FIR_INTERPOL0( opus_int16 *out, opus_int32 *buf2, const opus_int16 *FIR_Coefs, opus_int32 max_index_Q16, opus_int32 index_increment_Q16){ diff --git a/silk/silk_resampler_private_up2_HQ.c b/silk/resampler_private_up2_HQ.c index 23836ce0..e02ee5e6 100644 --- a/silk/silk_resampler_private_up2_HQ.c +++ b/silk/resampler_private_up2_HQ.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" /* Upsample by a factor 2, high quality */ /* Uses 2nd order allpass filters for the 2x upsampling, followed by a */ diff --git a/silk/silk_resampler_private_up4.c b/silk/resampler_private_up4.c index c9e9dda1..3b22a8c6 100644 --- a/silk/silk_resampler_private_up4.c +++ b/silk/resampler_private_up4.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_private.h" +#include "SigProc_FIX.h" +#include "resampler_private.h" /* Upsample by a factor 4, Note: low quality, only use with output sampling rates above 96 kHz. */ void silk_resampler_private_up4( diff --git a/silk/silk_resampler_rom.c b/silk/resampler_rom.c index 02b79bf6..a4b6cdae 100644 --- a/silk/silk_resampler_rom.c +++ b/silk/resampler_rom.c @@ -32,7 +32,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* Filter coefficients for IIR/FIR polyphase resampling * * Total size: < 600 Words (1.2 kB) */ -#include "silk_resampler_private.h" +#include "resampler_private.h" /* Tables for 2x downsampler */ const opus_int16 silk_resampler_down2_0 = 9872; diff --git a/silk/silk_resampler_rom.h b/silk/resampler_rom.h index d3eebcf3..4cd13d91 100644 --- a/silk/silk_resampler_rom.h +++ b/silk/resampler_rom.h @@ -33,8 +33,8 @@ extern "C" { #endif -#include "silk_typedef.h" -#include "silk_resampler_structs.h" +#include "typedef.h" +#include "resampler_structs.h" #define RESAMPLER_DOWN_ORDER_FIR 16 #define RESAMPLER_ORDER_FIR_144 6 diff --git a/silk/silk_resampler_structs.h b/silk/resampler_structs.h index aa5aecd3..aa5aecd3 100644 --- a/silk/silk_resampler_structs.h +++ b/silk/resampler_structs.h diff --git a/silk/silk_resampler_up2.c b/silk/resampler_up2.c index 5cb6973b..7dd31df3 100644 --- a/silk/silk_resampler_up2.c +++ b/silk/resampler_up2.c @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" -#include "silk_resampler_rom.h" +#include "SigProc_FIX.h" +#include "resampler_rom.h" /* Upsample by a factor 2, low quality */ void silk_resampler_up2( diff --git a/silk/silk_scale_copy_vector16.c b/silk/scale_copy_vector16.c index 6eff9aba..cb521449 100644 --- a/silk/silk_scale_copy_vector16.c +++ b/silk/scale_copy_vector16.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Copy and multiply a vector by a constant */ void silk_scale_copy_vector16( diff --git a/silk/silk_scale_vector.c b/silk/scale_vector.c index 2596e712..09224dec 100644 --- a/silk/silk_scale_vector.c +++ b/silk/scale_vector.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Multiply a vector by a constant */ void silk_scale_vector32_Q26_lshift_18( diff --git a/silk/silk_schur.c b/silk/schur.c index ad4d3efc..8f4e700e 100644 --- a/silk/silk_schur.c +++ b/silk/schur.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Faster than schur64(), but much less accurate. */ /* uses SMLAWB(), requiring armv5E and higher. */ diff --git a/silk/silk_schur64.c b/silk/schur64.c index e8be5b72..5ee04b45 100644 --- a/silk/silk_schur64.c +++ b/silk/schur64.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Slower than schur(), but more accurate. */ /* Uses SMULL(), available on armv4 */ diff --git a/silk/silk_shell_coder.c b/silk/shell_coder.c index c96131a5..2793887e 100644 --- a/silk/silk_shell_coder.c +++ b/silk/shell_coder.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* shell coder; pulse-subframe length is hardcoded */ diff --git a/silk/silk_sigm_Q15.c b/silk/sigm_Q15.c index d4979cb3..7181d29f 100644 --- a/silk/silk_sigm_Q15.c +++ b/silk/sigm_Q15.c @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* Approximate sigmoid function */ -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* fprintf(1, '%d, ', round(1024 * ([1 ./ (1 + exp(-(1:5))), 1] - 1 ./ (1 + exp(-(0:5)))))); */ static const opus_int32 sigm_LUT_slope_Q10[ 6 ] = { diff --git a/silk/silk_common.vcxproj b/silk/silk_common.vcxproj index a6fe9724..7123eea4 100644 --- a/silk/silk_common.vcxproj +++ b/silk/silk_common.vcxproj @@ -86,123 +86,123 @@ <None Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="silk_A2NLSF.c" />
- <ClCompile Include="silk_ana_filt_bank_1.c" />
- <ClCompile Include="silk_apply_sine_window.c" />
- <ClCompile Include="silk_array_maxabs.c" />
- <ClCompile Include="silk_autocorr.c" />
- <ClCompile Include="silk_biquad_alt.c" />
- <ClCompile Include="silk_burg_modified.c" />
- <ClCompile Include="silk_bwexpander.c" />
- <ClCompile Include="silk_bwexpander_32.c" />
- <ClCompile Include="silk_check_control_input.c" />
- <ClCompile Include="silk_CNG.c" />
- <ClCompile Include="silk_code_signs.c" />
- <ClCompile Include="silk_control_audio_bandwidth.c" />
- <ClCompile Include="silk_control_codec.c" />
- <ClCompile Include="silk_control_SNR.c" />
- <ClCompile Include="silk_create_init_destroy.c" />
- <ClCompile Include="silk_debug.c" />
- <ClCompile Include="silk_decoder_set_fs.c" />
- <ClCompile Include="silk_decode_core.c" />
- <ClCompile Include="silk_decode_frame.c" />
- <ClCompile Include="silk_decode_indices.c" />
- <ClCompile Include="silk_decode_parameters.c" />
- <ClCompile Include="silk_decode_pitch.c" />
- <ClCompile Include="silk_decode_pulses.c" />
- <ClCompile Include="silk_dec_API.c" />
- <ClCompile Include="silk_encode_indices.c" />
- <ClCompile Include="silk_encode_pulses.c" />
- <ClCompile Include="silk_enc_API.c" />
- <ClCompile Include="silk_gain_quant.c" />
- <ClCompile Include="silk_HP_variable_cutoff.c" />
- <ClCompile Include="silk_init_encoder.c" />
- <ClCompile Include="silk_inner_prod_aligned.c" />
- <ClCompile Include="silk_interpolate.c" />
- <ClCompile Include="silk_k2a.c" />
- <ClCompile Include="silk_k2a_Q16.c" />
- <ClCompile Include="silk_lin2log.c" />
- <ClCompile Include="silk_log2lin.c" />
- <ClCompile Include="silk_LPC_analysis_filter.c" />
- <ClCompile Include="silk_LPC_inv_pred_gain.c" />
- <ClCompile Include="silk_LP_variable_cutoff.c" />
- <ClCompile Include="silk_table_LSF_cos.c" />
- <ClCompile Include="silk_NLSF2A.c" />
- <ClCompile Include="silk_NLSF_decode.c" />
- <ClCompile Include="silk_NLSF_del_dec_quant.c" />
- <ClCompile Include="silk_NLSF_encode.c" />
- <ClCompile Include="silk_NLSF_stabilize.c" />
- <ClCompile Include="silk_NLSF_unpack.c" />
- <ClCompile Include="silk_NLSF_VQ.c" />
- <ClCompile Include="silk_NLSF_VQ_weights_laroia.c" />
- <ClCompile Include="silk_NSQ.c" />
- <ClCompile Include="silk_NSQ_del_dec.c" />
- <ClCompile Include="silk_pitch_analysis_core.c" />
- <ClCompile Include="silk_pitch_est_tables.c" />
- <ClCompile Include="silk_PLC.c" />
- <ClCompile Include="silk_process_NLSFs.c" />
- <ClCompile Include="silk_quant_LTP_gains.c" />
- <ClCompile Include="silk_resampler.c" />
- <ClCompile Include="silk_resampler_down2.c" />
- <ClCompile Include="silk_resampler_down2_3.c" />
- <ClCompile Include="silk_resampler_down3.c" />
- <ClCompile Include="silk_resampler_private_AR2.c" />
- <ClCompile Include="silk_resampler_private_ARMA4.c" />
- <ClCompile Include="silk_resampler_private_copy.c" />
- <ClCompile Include="silk_resampler_private_down4.c" />
- <ClCompile Include="silk_resampler_private_down_FIR.c" />
- <ClCompile Include="silk_resampler_private_IIR_FIR.c" />
- <ClCompile Include="silk_resampler_private_up2_HQ.c" />
- <ClCompile Include="silk_resampler_private_up4.c" />
- <ClCompile Include="silk_resampler_rom.c" />
- <ClCompile Include="silk_resampler_up2.c" />
- <ClCompile Include="silk_scale_copy_vector16.c" />
- <ClCompile Include="silk_scale_vector.c" />
- <ClCompile Include="silk_schur.c" />
- <ClCompile Include="silk_schur64.c" />
- <ClCompile Include="silk_shell_coder.c" />
- <ClCompile Include="silk_sigm_Q15.c" />
- <ClCompile Include="silk_sort.c" />
- <ClCompile Include="silk_stereo_decode_pred.c" />
- <ClCompile Include="silk_stereo_encode_pred.c" />
- <ClCompile Include="silk_stereo_find_predictor.c" />
- <ClCompile Include="silk_stereo_LR_to_MS.c" />
- <ClCompile Include="silk_stereo_MS_to_LR.c" />
- <ClCompile Include="silk_stereo_quant_pred.c" />
- <ClCompile Include="silk_sum_sqr_shift.c" />
- <ClCompile Include="silk_tables_gain.c" />
- <ClCompile Include="silk_tables_LTP.c" />
- <ClCompile Include="silk_tables_NLSF_CB_NB_MB.c" />
- <ClCompile Include="silk_tables_NLSF_CB_WB.c" />
- <ClCompile Include="silk_tables_other.c" />
- <ClCompile Include="silk_tables_pitch_lag.c" />
- <ClCompile Include="silk_tables_pulses_per_block.c" />
- <ClCompile Include="silk_VAD.c" />
- <ClCompile Include="silk_VQ_WMat_EC.c" />
+ <ClCompile Include="A2NLSF.c" />
+ <ClCompile Include="ana_filt_bank_1.c" />
+ <ClCompile Include="apply_sine_window.c" />
+ <ClCompile Include="array_maxabs.c" />
+ <ClCompile Include="autocorr.c" />
+ <ClCompile Include="biquad_alt.c" />
+ <ClCompile Include="burg_modified.c" />
+ <ClCompile Include="bwexpander.c" />
+ <ClCompile Include="bwexpander_32.c" />
+ <ClCompile Include="check_control_input.c" />
+ <ClCompile Include="CNG.c" />
+ <ClCompile Include="code_signs.c" />
+ <ClCompile Include="control_audio_bandwidth.c" />
+ <ClCompile Include="control_codec.c" />
+ <ClCompile Include="control_SNR.c" />
+ <ClCompile Include="create_init_destroy.c" />
+ <ClCompile Include="debug.c" />
+ <ClCompile Include="decoder_set_fs.c" />
+ <ClCompile Include="decode_core.c" />
+ <ClCompile Include="decode_frame.c" />
+ <ClCompile Include="decode_indices.c" />
+ <ClCompile Include="decode_parameters.c" />
+ <ClCompile Include="decode_pitch.c" />
+ <ClCompile Include="decode_pulses.c" />
+ <ClCompile Include="dec_API.c" />
+ <ClCompile Include="encode_indices.c" />
+ <ClCompile Include="encode_pulses.c" />
+ <ClCompile Include="enc_API.c" />
+ <ClCompile Include="gain_quant.c" />
+ <ClCompile Include="HP_variable_cutoff.c" />
+ <ClCompile Include="init_encoder.c" />
+ <ClCompile Include="inner_prod_aligned.c" />
+ <ClCompile Include="interpolate.c" />
+ <ClCompile Include="k2a.c" />
+ <ClCompile Include="k2a_Q16.c" />
+ <ClCompile Include="lin2log.c" />
+ <ClCompile Include="log2lin.c" />
+ <ClCompile Include="LPC_analysis_filter.c" />
+ <ClCompile Include="LPC_inv_pred_gain.c" />
+ <ClCompile Include="LP_variable_cutoff.c" />
+ <ClCompile Include="table_LSF_cos.c" />
+ <ClCompile Include="NLSF2A.c" />
+ <ClCompile Include="NLSF_decode.c" />
+ <ClCompile Include="NLSF_del_dec_quant.c" />
+ <ClCompile Include="NLSF_encode.c" />
+ <ClCompile Include="NLSF_stabilize.c" />
+ <ClCompile Include="NLSF_unpack.c" />
+ <ClCompile Include="NLSF_VQ.c" />
+ <ClCompile Include="NLSF_VQ_weights_laroia.c" />
+ <ClCompile Include="NSQ.c" />
+ <ClCompile Include="NSQ_del_dec.c" />
+ <ClCompile Include="pitch_analysis_core.c" />
+ <ClCompile Include="pitch_est_tables.c" />
+ <ClCompile Include="PLC.c" />
+ <ClCompile Include="process_NLSFs.c" />
+ <ClCompile Include="quant_LTP_gains.c" />
+ <ClCompile Include="resampler.c" />
+ <ClCompile Include="resampler_down2.c" />
+ <ClCompile Include="resampler_down2_3.c" />
+ <ClCompile Include="resampler_down3.c" />
+ <ClCompile Include="resampler_private_AR2.c" />
+ <ClCompile Include="resampler_private_ARMA4.c" />
+ <ClCompile Include="resampler_private_copy.c" />
+ <ClCompile Include="resampler_private_down4.c" />
+ <ClCompile Include="resampler_private_down_FIR.c" />
+ <ClCompile Include="resampler_private_IIR_FIR.c" />
+ <ClCompile Include="resampler_private_up2_HQ.c" />
+ <ClCompile Include="resampler_private_up4.c" />
+ <ClCompile Include="resampler_rom.c" />
+ <ClCompile Include="resampler_up2.c" />
+ <ClCompile Include="scale_copy_vector16.c" />
+ <ClCompile Include="scale_vector.c" />
+ <ClCompile Include="schur.c" />
+ <ClCompile Include="schur64.c" />
+ <ClCompile Include="shell_coder.c" />
+ <ClCompile Include="sigm_Q15.c" />
+ <ClCompile Include="sort.c" />
+ <ClCompile Include="stereo_decode_pred.c" />
+ <ClCompile Include="stereo_encode_pred.c" />
+ <ClCompile Include="stereo_find_predictor.c" />
+ <ClCompile Include="stereo_LR_to_MS.c" />
+ <ClCompile Include="stereo_MS_to_LR.c" />
+ <ClCompile Include="stereo_quant_pred.c" />
+ <ClCompile Include="sum_sqr_shift.c" />
+ <ClCompile Include="tables_gain.c" />
+ <ClCompile Include="tables_LTP.c" />
+ <ClCompile Include="tables_NLSF_CB_NB_MB.c" />
+ <ClCompile Include="tables_NLSF_CB_WB.c" />
+ <ClCompile Include="tables_other.c" />
+ <ClCompile Include="tables_pitch_lag.c" />
+ <ClCompile Include="tables_pulses_per_block.c" />
+ <ClCompile Include="VAD.c" />
+ <ClCompile Include="VQ_WMat_EC.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\win32\config.h" />
- <ClInclude Include="float\silk_main_FLP.h" />
- <ClInclude Include="silk_control.h" />
- <ClInclude Include="silk_debug.h" />
- <ClInclude Include="silk_define.h" />
- <ClInclude Include="silk_errors.h" />
- <ClInclude Include="silk_Inlines.h" />
- <ClInclude Include="silk_MacroCount.h" />
- <ClInclude Include="silk_MacroDebug.h" />
- <ClInclude Include="silk_macros.h" />
- <ClInclude Include="silk_main.h" />
- <ClInclude Include="silk_pitch_est_defines.h" />
- <ClInclude Include="silk_PLC.h" />
- <ClInclude Include="silk_resampler_private.h" />
- <ClInclude Include="silk_resampler_rom.h" />
- <ClInclude Include="silk_resampler_structs.h" />
- <ClInclude Include="silk_API.h" />
- <ClInclude Include="silk_SigProc_FIX.h" />
- <ClInclude Include="silk_structs.h" />
- <ClInclude Include="silk_tables.h" />
- <ClInclude Include="silk_tuning_parameters.h" />
- <ClInclude Include="silk_typedef.h" />
+ <ClInclude Include="float\main_FLP.h" />
+ <ClInclude Include="control.h" />
+ <ClInclude Include="debug.h" />
+ <ClInclude Include="define.h" />
+ <ClInclude Include="errors.h" />
+ <ClInclude Include="Inlines.h" />
+ <ClInclude Include="MacroCount.h" />
+ <ClInclude Include="MacroDebug.h" />
+ <ClInclude Include="macros.h" />
+ <ClInclude Include="main.h" />
+ <ClInclude Include="pitch_est_defines.h" />
+ <ClInclude Include="PLC.h" />
+ <ClInclude Include="resampler_private.h" />
+ <ClInclude Include="resampler_rom.h" />
+ <ClInclude Include="resampler_structs.h" />
+ <ClInclude Include="API.h" />
+ <ClInclude Include="SigProc_FIX.h" />
+ <ClInclude Include="structs.h" />
+ <ClInclude Include="tables.h" />
+ <ClInclude Include="tuning_parameters.h" />
+ <ClInclude Include="typedef.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/silk/silk_common.vcxproj.filters b/silk/silk_common.vcxproj.filters index 0068ec8a..4ba09ec7 100644 --- a/silk/silk_common.vcxproj.filters +++ b/silk/silk_common.vcxproj.filters @@ -18,283 +18,283 @@ <None Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="silk_A2NLSF.c">
+ <ClCompile Include="A2NLSF.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_ana_filt_bank_1.c">
+ <ClCompile Include="ana_filt_bank_1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_apply_sine_window.c">
+ <ClCompile Include="apply_sine_window.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_array_maxabs.c">
+ <ClCompile Include="array_maxabs.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_autocorr.c">
+ <ClCompile Include="autocorr.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_biquad_alt.c">
+ <ClCompile Include="biquad_alt.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_burg_modified.c">
+ <ClCompile Include="burg_modified.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_bwexpander.c">
+ <ClCompile Include="bwexpander.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_bwexpander_32.c">
+ <ClCompile Include="bwexpander_32.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_check_control_input.c">
+ <ClCompile Include="check_control_input.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_CNG.c">
+ <ClCompile Include="CNG.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_code_signs.c">
+ <ClCompile Include="code_signs.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_control_audio_bandwidth.c">
+ <ClCompile Include="control_audio_bandwidth.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_control_codec.c">
+ <ClCompile Include="control_codec.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_control_SNR.c">
+ <ClCompile Include="control_SNR.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_create_init_destroy.c">
+ <ClCompile Include="create_init_destroy.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_debug.c">
+ <ClCompile Include="debug.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_dec_API.c">
+ <ClCompile Include="dec_API.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_decode_core.c">
+ <ClCompile Include="decode_core.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_decode_frame.c">
+ <ClCompile Include="decode_frame.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_decode_indices.c">
+ <ClCompile Include="decode_indices.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_decode_parameters.c">
+ <ClCompile Include="decode_parameters.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_decode_pitch.c">
+ <ClCompile Include="decode_pitch.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_decode_pulses.c">
+ <ClCompile Include="decode_pulses.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_decoder_set_fs.c">
+ <ClCompile Include="decoder_set_fs.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_enc_API.c">
+ <ClCompile Include="enc_API.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_encode_indices.c">
+ <ClCompile Include="encode_indices.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_encode_pulses.c">
+ <ClCompile Include="encode_pulses.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_gain_quant.c">
+ <ClCompile Include="gain_quant.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_HP_variable_cutoff.c">
+ <ClCompile Include="HP_variable_cutoff.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_init_encoder.c">
+ <ClCompile Include="init_encoder.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_inner_prod_aligned.c">
+ <ClCompile Include="inner_prod_aligned.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_interpolate.c">
+ <ClCompile Include="interpolate.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_k2a.c">
+ <ClCompile Include="k2a.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_k2a_Q16.c">
+ <ClCompile Include="k2a_Q16.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_lin2log.c">
+ <ClCompile Include="lin2log.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_log2lin.c">
+ <ClCompile Include="log2lin.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_LP_variable_cutoff.c">
+ <ClCompile Include="LP_variable_cutoff.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_LPC_analysis_filter.c">
+ <ClCompile Include="LPC_analysis_filter.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_LPC_inv_pred_gain.c">
+ <ClCompile Include="LPC_inv_pred_gain.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_table_LSF_cos.c">
+ <ClCompile Include="table_LSF_cos.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NLSF2A.c">
+ <ClCompile Include="NLSF2A.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NLSF_decode.c">
+ <ClCompile Include="NLSF_decode.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NLSF_del_dec_quant.c">
+ <ClCompile Include="NLSF_del_dec_quant.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NLSF_encode.c">
+ <ClCompile Include="NLSF_encode.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NLSF_stabilize.c">
+ <ClCompile Include="NLSF_stabilize.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NLSF_unpack.c">
+ <ClCompile Include="NLSF_unpack.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NLSF_VQ.c">
+ <ClCompile Include="NLSF_VQ.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NLSF_VQ_weights_laroia.c">
+ <ClCompile Include="NLSF_VQ_weights_laroia.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NSQ.c">
+ <ClCompile Include="NSQ.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_NSQ_del_dec.c">
+ <ClCompile Include="NSQ_del_dec.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_pitch_analysis_core.c">
+ <ClCompile Include="pitch_analysis_core.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_pitch_est_tables.c">
+ <ClCompile Include="pitch_est_tables.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_PLC.c">
+ <ClCompile Include="PLC.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_process_NLSFs.c">
+ <ClCompile Include="process_NLSFs.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_quant_LTP_gains.c">
+ <ClCompile Include="quant_LTP_gains.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler.c">
+ <ClCompile Include="resampler.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_down2.c">
+ <ClCompile Include="resampler_down2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_down2_3.c">
+ <ClCompile Include="resampler_down2_3.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_down3.c">
+ <ClCompile Include="resampler_down3.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_private_AR2.c">
+ <ClCompile Include="resampler_private_AR2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_private_ARMA4.c">
+ <ClCompile Include="resampler_private_ARMA4.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_private_copy.c">
+ <ClCompile Include="resampler_private_copy.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_private_down4.c">
+ <ClCompile Include="resampler_private_down4.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_private_down_FIR.c">
+ <ClCompile Include="resampler_private_down_FIR.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_private_IIR_FIR.c">
+ <ClCompile Include="resampler_private_IIR_FIR.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_private_up2_HQ.c">
+ <ClCompile Include="resampler_private_up2_HQ.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_private_up4.c">
+ <ClCompile Include="resampler_private_up4.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_rom.c">
+ <ClCompile Include="resampler_rom.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_resampler_up2.c">
+ <ClCompile Include="resampler_up2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_scale_copy_vector16.c">
+ <ClCompile Include="scale_copy_vector16.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_scale_vector.c">
+ <ClCompile Include="scale_vector.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_schur.c">
+ <ClCompile Include="schur.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_schur64.c">
+ <ClCompile Include="schur64.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_shell_coder.c">
+ <ClCompile Include="shell_coder.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_sigm_Q15.c">
+ <ClCompile Include="sigm_Q15.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_sort.c">
+ <ClCompile Include="sort.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_stereo_decode_pred.c">
+ <ClCompile Include="stereo_decode_pred.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_stereo_encode_pred.c">
+ <ClCompile Include="stereo_encode_pred.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_stereo_find_predictor.c">
+ <ClCompile Include="stereo_find_predictor.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_stereo_LR_to_MS.c">
+ <ClCompile Include="stereo_LR_to_MS.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_stereo_MS_to_LR.c">
+ <ClCompile Include="stereo_MS_to_LR.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_stereo_quant_pred.c">
+ <ClCompile Include="stereo_quant_pred.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_sum_sqr_shift.c">
+ <ClCompile Include="sum_sqr_shift.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_tables_gain.c">
+ <ClCompile Include="tables_gain.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_tables_LTP.c">
+ <ClCompile Include="tables_LTP.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_tables_NLSF_CB_NB_MB.c">
+ <ClCompile Include="tables_NLSF_CB_NB_MB.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_tables_NLSF_CB_WB.c">
+ <ClCompile Include="tables_NLSF_CB_WB.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_tables_other.c">
+ <ClCompile Include="tables_other.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_tables_pitch_lag.c">
+ <ClCompile Include="tables_pitch_lag.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_tables_pulses_per_block.c">
+ <ClCompile Include="tables_pulses_per_block.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_VAD.c">
+ <ClCompile Include="VAD.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="silk_VQ_WMat_EC.c">
+ <ClCompile Include="VQ_WMat_EC.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -302,67 +302,67 @@ <ClInclude Include="..\win32\config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_control.h">
+ <ClInclude Include="control.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_define.h">
+ <ClInclude Include="define.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_errors.h">
+ <ClInclude Include="errors.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_Inlines.h">
+ <ClInclude Include="Inlines.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_MacroCount.h">
+ <ClInclude Include="MacroCount.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_MacroDebug.h">
+ <ClInclude Include="MacroDebug.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_macros.h">
+ <ClInclude Include="macros.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_main.h">
+ <ClInclude Include="main.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_pitch_est_defines.h">
+ <ClInclude Include="pitch_est_defines.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_PLC.h">
+ <ClInclude Include="PLC.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="float\silk_main_FLP.h">
+ <ClInclude Include="float\main_FLP.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_resampler_private.h">
+ <ClInclude Include="resampler_private.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_resampler_rom.h">
+ <ClInclude Include="resampler_rom.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_resampler_structs.h">
+ <ClInclude Include="resampler_structs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_structs.h">
+ <ClInclude Include="structs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_tables.h">
+ <ClInclude Include="tables.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_tuning_parameters.h">
+ <ClInclude Include="tuning_parameters.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_typedef.h">
+ <ClInclude Include="typedef.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_API.h">
+ <ClInclude Include="API.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_debug.h">
+ <ClInclude Include="debug.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="silk_SigProc_FIX.h">
+ <ClInclude Include="SigProc_FIX.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
diff --git a/silk/silk_sort.c b/silk/sort.c index 2c539caf..26d81715 100644 --- a/silk/silk_sort.c +++ b/silk/sort.c @@ -35,7 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* */ /* Shell short: http://en.wikipedia.org/wiki/Shell_sort */ -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" void silk_insertion_sort_increasing( opus_int32 *a, /* I/O: Unsorted / Sorted vector */ diff --git a/silk/silk_stereo_LR_to_MS.c b/silk/stereo_LR_to_MS.c index 1dc7434a..b27a4e25 100644 --- a/silk/silk_stereo_LR_to_MS.c +++ b/silk/stereo_LR_to_MS.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Convert Left/Right stereo signal to adaptive Mid/Side representation */ void silk_stereo_LR_to_MS( diff --git a/silk/silk_stereo_MS_to_LR.c b/silk/stereo_MS_to_LR.c index 133755a6..efd72c46 100644 --- a/silk/silk_stereo_MS_to_LR.c +++ b/silk/stereo_MS_to_LR.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Convert adaptive Mid/Side representation to Left/Right stereo signal */ void silk_stereo_MS_to_LR( diff --git a/silk/silk_stereo_decode_pred.c b/silk/stereo_decode_pred.c index e9bd5719..43886f1e 100644 --- a/silk/silk_stereo_decode_pred.c +++ b/silk/stereo_decode_pred.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Decode mid/side predictors */ void silk_stereo_decode_pred( diff --git a/silk/silk_stereo_encode_pred.c b/silk/stereo_encode_pred.c index ad83ab03..a6419f25 100644 --- a/silk/silk_stereo_encode_pred.c +++ b/silk/stereo_encode_pred.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Entropy code the mid/side quantization indices */ void silk_stereo_encode_pred( diff --git a/silk/silk_stereo_find_predictor.c b/silk/stereo_find_predictor.c index d4919562..73c307fe 100644 --- a/silk/silk_stereo_find_predictor.c +++ b/silk/stereo_find_predictor.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Find least-squares prediction gain for one signal based on another and quantize it */ opus_int32 silk_stereo_find_predictor( /* O Returns predictor in Q13 */ diff --git a/silk/silk_stereo_quant_pred.c b/silk/stereo_quant_pred.c index 3bd28368..2ffe3fa0 100644 --- a/silk/silk_stereo_quant_pred.c +++ b/silk/stereo_quant_pred.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_main.h" +#include "main.h" /* Quantize mid/side predictors */ void silk_stereo_quant_pred( diff --git a/silk/silk_structs.h b/silk/structs.h index e4fd1d75..eda8173b 100644 --- a/silk/silk_structs.h +++ b/silk/structs.h @@ -28,9 +28,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_STRUCTS_H #define SILK_STRUCTS_H -#include "silk_typedef.h" -#include "silk_SigProc_FIX.h" -#include "silk_define.h" +#include "typedef.h" +#include "SigProc_FIX.h" +#include "define.h" #include "entenc.h" #include "entdec.h" diff --git a/silk/silk_sum_sqr_shift.c b/silk/sum_sqr_shift.c index 0f2ed986..dcadf1b4 100644 --- a/silk/silk_sum_sqr_shift.c +++ b/silk/sum_sqr_shift.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_SigProc_FIX.h" +#include "SigProc_FIX.h" /* Compute number of bits to right shift the sum of squares of a vector */ /* of int16s to make it fit in an int32 */ diff --git a/silk/silk_table_LSF_cos.c b/silk/table_LSF_cos.c index adfb6209..7c9c747d 100644 --- a/silk/silk_table_LSF_cos.c +++ b/silk/table_LSF_cos.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_tables.h" +#include "tables.h" /* Cosine approximation table for LSF conversion */ /* Q12 values (even) */ diff --git a/silk/silk_tables.h b/silk/tables.h index d412152f..de1fd028 100644 --- a/silk/silk_tables.h +++ b/silk/tables.h @@ -28,8 +28,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_TABLES_H #define SILK_TABLES_H -#include "silk_define.h" -#include "silk_structs.h" +#include "define.h" +#include "structs.h" #ifdef __cplusplus extern "C" diff --git a/silk/silk_tables_LTP.c b/silk/tables_LTP.c index 990cc300..bc9c4e45 100644 --- a/silk/silk_tables_LTP.c +++ b/silk/tables_LTP.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_tables.h" +#include "tables.h" const opus_uint8 silk_LTP_per_index_iCDF[3] = { 179, 99, 0 diff --git a/silk/silk_tables_NLSF_CB_NB_MB.c b/silk/tables_NLSF_CB_NB_MB.c index d33a169a..8890a613 100644 --- a/silk/silk_tables_NLSF_CB_NB_MB.c +++ b/silk/tables_NLSF_CB_NB_MB.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_tables.h" +#include "tables.h" const opus_uint8 silk_NLSF_CB1_NB_MB_Q8[ 320 ] = { 12, 35, 60, 83, 108, 132, 157, 180, diff --git a/silk/silk_tables_NLSF_CB_WB.c b/silk/tables_NLSF_CB_WB.c index e6f7bfd1..d980bca8 100644 --- a/silk/silk_tables_NLSF_CB_WB.c +++ b/silk/tables_NLSF_CB_WB.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_tables.h" +#include "tables.h" const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = { 7, 23, 38, 54, 69, 85, 100, 116, diff --git a/silk/silk_tables_gain.c b/silk/tables_gain.c index e9d1ee37..e0fb9838 100644 --- a/silk/silk_tables_gain.c +++ b/silk/tables_gain.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_tables.h" +#include "tables.h" #ifdef __cplusplus extern "C" diff --git a/silk/silk_tables_other.c b/silk/tables_other.c index de7ebc73..7e1dc99c 100644 --- a/silk/silk_tables_other.c +++ b/silk/tables_other.c @@ -29,9 +29,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_structs.h" -#include "silk_define.h" -#include "silk_tables.h" +#include "structs.h" +#include "define.h" +#include "tables.h" #ifdef __cplusplus extern "C" diff --git a/silk/silk_tables_pitch_lag.c b/silk/tables_pitch_lag.c index 68bf4de4..e0d87f2d 100644 --- a/silk/silk_tables_pitch_lag.c +++ b/silk/tables_pitch_lag.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_tables.h" +#include "tables.h" const opus_uint8 silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ] = { 253, 250, 244, 233, 212, 182, 150, 131, diff --git a/silk/silk_tables_pulses_per_block.c b/silk/tables_pulses_per_block.c index 752dfb77..51c9e554 100644 --- a/silk/silk_tables_pulses_per_block.c +++ b/silk/tables_pulses_per_block.c @@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -#include "silk_tables.h" +#include "tables.h" const opus_uint8 silk_max_pulses_table[ 4 ] = { 8, 10, 12, 16 diff --git a/silk/silk_tuning_parameters.h b/silk/tuning_parameters.h index 07d9379a..07d9379a 100644 --- a/silk/silk_tuning_parameters.h +++ b/silk/tuning_parameters.h diff --git a/silk/silk_typedef.h b/silk/typedef.h index 53bdc7c9..53bdc7c9 100644 --- a/silk/silk_typedef.h +++ b/silk/typedef.h diff --git a/silk_headers.txt b/silk_headers.txt index d0d5ade5..45c69853 100644 --- a/silk_headers.txt +++ b/silk_headers.txt @@ -1,26 +1,26 @@ SILK_HEAD = \ -silk/silk_debug.h \ -silk/silk_control.h \ -silk/silk_errors.h \ -silk/silk_API.h \ -silk/silk_typedef.h \ -silk/silk_define.h \ -silk/silk_main.h \ -silk/silk_PLC.h \ -silk/silk_structs.h \ -silk/silk_tables.h \ -silk/silk_tuning_parameters.h \ -silk/silk_Inlines.h \ -silk/silk_MacroCount.h \ -silk/silk_MacroDebug.h \ -silk/silk_macros.h \ -silk/silk_pitch_est_defines.h \ -silk/silk_resampler_private.h \ -silk/silk_resampler_rom.h \ -silk/silk_resampler_structs.h \ -silk/silk_SigProc_FIX.h \ -silk/fixed/silk_main_FIX.h \ -silk/fixed/silk_structs_FIX.h \ -silk/float/silk_main_FLP.h \ -silk/float/silk_structs_FLP.h \ -silk/float/silk_SigProc_FLP.h +silk/debug.h \ +silk/control.h \ +silk/errors.h \ +silk/API.h \ +silk/typedef.h \ +silk/define.h \ +silk/main.h \ +silk/PLC.h \ +silk/structs.h \ +silk/tables.h \ +silk/tuning_parameters.h \ +silk/Inlines.h \ +silk/MacroCount.h \ +silk/MacroDebug.h \ +silk/macros.h \ +silk/pitch_est_defines.h \ +silk/resampler_private.h \ +silk/resampler_rom.h \ +silk/resampler_structs.h \ +silk/SigProc_FIX.h \ +silk/fixed/main_FIX.h \ +silk/fixed/structs_FIX.h \ +silk/float/main_FLP.h \ +silk/float/structs_FLP.h \ +silk/float/SigProc_FLP.h diff --git a/silk_sources.mk b/silk_sources.mk index 2e3151f3..87facf08 100644 --- a/silk_sources.mk +++ b/silk_sources.mk @@ -1,146 +1,146 @@ SILK_SOURCES = \ -silk/silk_CNG.c \ -silk/silk_code_signs.c \ -silk/silk_create_init_destroy.c \ -silk/silk_decode_core.c \ -silk/silk_decode_frame.c \ -silk/silk_decode_parameters.c \ -silk/silk_decode_indices.c \ -silk/silk_decode_pulses.c \ -silk/silk_decoder_set_fs.c \ -silk/silk_dec_API.c \ -silk/silk_enc_API.c \ -silk/silk_encode_indices.c \ -silk/silk_encode_pulses.c \ -silk/silk_gain_quant.c \ -silk/silk_interpolate.c \ -silk/silk_LP_variable_cutoff.c \ -silk/silk_NLSF_decode.c \ -silk/silk_NSQ.c \ -silk/silk_NSQ_del_dec.c \ -silk/silk_PLC.c \ -silk/silk_shell_coder.c \ -silk/silk_tables_gain.c \ -silk/silk_tables_LTP.c \ -silk/silk_tables_NLSF_CB_NB_MB.c \ -silk/silk_tables_NLSF_CB_WB.c \ -silk/silk_tables_other.c \ -silk/silk_tables_pitch_lag.c \ -silk/silk_tables_pulses_per_block.c \ -silk/silk_VAD.c \ -silk/silk_control_audio_bandwidth.c \ -silk/silk_quant_LTP_gains.c \ -silk/silk_VQ_WMat_EC.c \ -silk/silk_HP_variable_cutoff.c \ -silk/silk_NLSF_encode.c \ -silk/silk_NLSF_VQ.c \ -silk/silk_NLSF_unpack.c \ -silk/silk_NLSF_del_dec_quant.c \ -silk/silk_process_NLSFs.c \ -silk/silk_stereo_LR_to_MS.c \ -silk/silk_stereo_MS_to_LR.c \ -silk/silk_check_control_input.c \ -silk/silk_control_SNR.c \ -silk/silk_init_encoder.c \ -silk/silk_control_codec.c \ -silk/silk_A2NLSF.c \ -silk/silk_ana_filt_bank_1.c \ -silk/silk_apply_sine_window.c \ -silk/silk_array_maxabs.c \ -silk/silk_autocorr.c \ -silk/silk_biquad_alt.c \ -silk/silk_burg_modified.c \ -silk/silk_bwexpander_32.c \ -silk/silk_bwexpander.c \ -silk/silk_debug.c \ -silk/silk_decode_pitch.c \ -silk/silk_inner_prod_aligned.c \ -silk/silk_k2a.c \ -silk/silk_k2a_Q16.c \ -silk/silk_lin2log.c \ -silk/silk_log2lin.c \ -silk/silk_LPC_analysis_filter.c \ -silk/silk_LPC_inv_pred_gain.c \ -silk/silk_table_LSF_cos.c \ -silk/silk_NLSF2A.c \ -silk/silk_NLSF_stabilize.c \ -silk/silk_NLSF_VQ_weights_laroia.c \ -silk/silk_pitch_analysis_core.c \ -silk/silk_pitch_est_tables.c \ -silk/silk_resampler.c \ -silk/silk_resampler_down2_3.c \ -silk/silk_resampler_down2.c \ -silk/silk_resampler_down3.c \ -silk/silk_resampler_private_AR2.c \ -silk/silk_resampler_private_ARMA4.c \ -silk/silk_resampler_private_copy.c \ -silk/silk_resampler_private_down4.c \ -silk/silk_resampler_private_down_FIR.c \ -silk/silk_resampler_private_IIR_FIR.c \ -silk/silk_resampler_private_up2_HQ.c \ -silk/silk_resampler_private_up4.c \ -silk/silk_resampler_rom.c \ -silk/silk_resampler_up2.c \ -silk/silk_scale_copy_vector16.c \ -silk/silk_scale_vector.c \ -silk/silk_schur64.c \ -silk/silk_schur.c \ -silk/silk_sigm_Q15.c \ -silk/silk_sort.c \ -silk/silk_sum_sqr_shift.c \ -silk/silk_stereo_decode_pred.c \ -silk/silk_stereo_encode_pred.c \ -silk/silk_stereo_find_predictor.c \ -silk/silk_stereo_quant_pred.c +silk/CNG.c \ +silk/code_signs.c \ +silk/create_init_destroy.c \ +silk/decode_core.c \ +silk/decode_frame.c \ +silk/decode_parameters.c \ +silk/decode_indices.c \ +silk/decode_pulses.c \ +silk/decoder_set_fs.c \ +silk/dec_API.c \ +silk/enc_API.c \ +silk/encode_indices.c \ +silk/encode_pulses.c \ +silk/gain_quant.c \ +silk/interpolate.c \ +silk/LP_variable_cutoff.c \ +silk/NLSF_decode.c \ +silk/NSQ.c \ +silk/NSQ_del_dec.c \ +silk/PLC.c \ +silk/shell_coder.c \ +silk/tables_gain.c \ +silk/tables_LTP.c \ +silk/tables_NLSF_CB_NB_MB.c \ +silk/tables_NLSF_CB_WB.c \ +silk/tables_other.c \ +silk/tables_pitch_lag.c \ +silk/tables_pulses_per_block.c \ +silk/VAD.c \ +silk/control_audio_bandwidth.c \ +silk/quant_LTP_gains.c \ +silk/VQ_WMat_EC.c \ +silk/HP_variable_cutoff.c \ +silk/NLSF_encode.c \ +silk/NLSF_VQ.c \ +silk/NLSF_unpack.c \ +silk/NLSF_del_dec_quant.c \ +silk/process_NLSFs.c \ +silk/stereo_LR_to_MS.c \ +silk/stereo_MS_to_LR.c \ +silk/check_control_input.c \ +silk/control_SNR.c \ +silk/init_encoder.c \ +silk/control_codec.c \ +silk/A2NLSF.c \ +silk/ana_filt_bank_1.c \ +silk/apply_sine_window.c \ +silk/array_maxabs.c \ +silk/autocorr.c \ +silk/biquad_alt.c \ +silk/burg_modified.c \ +silk/bwexpander_32.c \ +silk/bwexpander.c \ +silk/debug.c \ +silk/decode_pitch.c \ +silk/inner_prod_aligned.c \ +silk/k2a.c \ +silk/k2a_Q16.c \ +silk/lin2log.c \ +silk/log2lin.c \ +silk/LPC_analysis_filter.c \ +silk/LPC_inv_pred_gain.c \ +silk/table_LSF_cos.c \ +silk/NLSF2A.c \ +silk/NLSF_stabilize.c \ +silk/NLSF_VQ_weights_laroia.c \ +silk/pitch_analysis_core.c \ +silk/pitch_est_tables.c \ +silk/resampler.c \ +silk/resampler_down2_3.c \ +silk/resampler_down2.c \ +silk/resampler_down3.c \ +silk/resampler_private_AR2.c \ +silk/resampler_private_ARMA4.c \ +silk/resampler_private_copy.c \ +silk/resampler_private_down4.c \ +silk/resampler_private_down_FIR.c \ +silk/resampler_private_IIR_FIR.c \ +silk/resampler_private_up2_HQ.c \ +silk/resampler_private_up4.c \ +silk/resampler_rom.c \ +silk/resampler_up2.c \ +silk/scale_copy_vector16.c \ +silk/scale_vector.c \ +silk/schur64.c \ +silk/schur.c \ +silk/sigm_Q15.c \ +silk/sort.c \ +silk/sum_sqr_shift.c \ +silk/stereo_decode_pred.c \ +silk/stereo_encode_pred.c \ +silk/stereo_find_predictor.c \ +silk/stereo_quant_pred.c SILK_SOURCES_FIXED = \ -silk/fixed/silk_LTP_analysis_filter_FIX.c \ -silk/fixed/silk_LTP_scale_ctrl_FIX.c \ -silk/fixed/silk_corrMatrix_FIX.c \ -silk/fixed/silk_encode_frame_FIX.c \ -silk/fixed/silk_find_LPC_FIX.c \ -silk/fixed/silk_find_LTP_FIX.c \ -silk/fixed/silk_find_pitch_lags_FIX.c \ -silk/fixed/silk_find_pred_coefs_FIX.c \ -silk/fixed/silk_noise_shape_analysis_FIX.c \ -silk/fixed/silk_prefilter_FIX.c \ -silk/fixed/silk_process_gains_FIX.c \ -silk/fixed/silk_regularize_correlations_FIX.c \ -silk/fixed/silk_residual_energy16_FIX.c \ -silk/fixed/silk_residual_energy_FIX.c \ -silk/fixed/silk_solve_LS_FIX.c \ -silk/fixed/silk_warped_autocorrelation_FIX.c +silk/fixed/LTP_analysis_filter_FIX.c \ +silk/fixed/LTP_scale_ctrl_FIX.c \ +silk/fixed/corrMatrix_FIX.c \ +silk/fixed/encode_frame_FIX.c \ +silk/fixed/find_LPC_FIX.c \ +silk/fixed/find_LTP_FIX.c \ +silk/fixed/find_pitch_lags_FIX.c \ +silk/fixed/find_pred_coefs_FIX.c \ +silk/fixed/noise_shape_analysis_FIX.c \ +silk/fixed/prefilter_FIX.c \ +silk/fixed/process_gains_FIX.c \ +silk/fixed/regularize_correlations_FIX.c \ +silk/fixed/residual_energy16_FIX.c \ +silk/fixed/residual_energy_FIX.c \ +silk/fixed/solve_LS_FIX.c \ +silk/fixed/warped_autocorrelation_FIX.c SILK_SOURCES_FLOAT = \ -silk/float/silk_apply_sine_window_FLP.c \ -silk/float/silk_corrMatrix_FLP.c \ -silk/float/silk_encode_frame_FLP.c \ -silk/float/silk_find_LPC_FLP.c \ -silk/float/silk_find_LTP_FLP.c \ -silk/float/silk_find_pitch_lags_FLP.c \ -silk/float/silk_find_pred_coefs_FLP.c \ -silk/float/silk_LPC_analysis_filter_FLP.c \ -silk/float/silk_LTP_analysis_filter_FLP.c \ -silk/float/silk_LTP_scale_ctrl_FLP.c \ -silk/float/silk_noise_shape_analysis_FLP.c \ -silk/float/silk_prefilter_FLP.c \ -silk/float/silk_process_gains_FLP.c \ -silk/float/silk_regularize_correlations_FLP.c \ -silk/float/silk_residual_energy_FLP.c \ -silk/float/silk_solve_LS_FLP.c \ -silk/float/silk_warped_autocorrelation_FLP.c \ -silk/float/silk_wrappers_FLP.c \ -silk/float/silk_autocorrelation_FLP.c \ -silk/float/silk_burg_modified_FLP.c \ -silk/float/silk_bwexpander_FLP.c \ -silk/float/silk_energy_FLP.c \ -silk/float/silk_inner_product_FLP.c \ -silk/float/silk_k2a_FLP.c \ -silk/float/silk_levinsondurbin_FLP.c \ -silk/float/silk_LPC_inv_pred_gain_FLP.c \ -silk/float/silk_pitch_analysis_core_FLP.c \ -silk/float/silk_scale_copy_vector_FLP.c \ -silk/float/silk_scale_vector_FLP.c \ -silk/float/silk_schur_FLP.c \ -silk/float/silk_sort_FLP.c +silk/float/apply_sine_window_FLP.c \ +silk/float/corrMatrix_FLP.c \ +silk/float/encode_frame_FLP.c \ +silk/float/find_LPC_FLP.c \ +silk/float/find_LTP_FLP.c \ +silk/float/find_pitch_lags_FLP.c \ +silk/float/find_pred_coefs_FLP.c \ +silk/float/LPC_analysis_filter_FLP.c \ +silk/float/LTP_analysis_filter_FLP.c \ +silk/float/LTP_scale_ctrl_FLP.c \ +silk/float/noise_shape_analysis_FLP.c \ +silk/float/prefilter_FLP.c \ +silk/float/process_gains_FLP.c \ +silk/float/regularize_correlations_FLP.c \ +silk/float/residual_energy_FLP.c \ +silk/float/solve_LS_FLP.c \ +silk/float/warped_autocorrelation_FLP.c \ +silk/float/wrappers_FLP.c \ +silk/float/autocorrelation_FLP.c \ +silk/float/burg_modified_FLP.c \ +silk/float/bwexpander_FLP.c \ +silk/float/energy_FLP.c \ +silk/float/inner_product_FLP.c \ +silk/float/k2a_FLP.c \ +silk/float/levinsondurbin_FLP.c \ +silk/float/LPC_inv_pred_gain_FLP.c \ +silk/float/pitch_analysis_core_FLP.c \ +silk/float/scale_copy_vector_FLP.c \ +silk/float/scale_vector_FLP.c \ +silk/float/schur_FLP.c \ +silk/float/sort_FLP.c diff --git a/src/opus_decoder.c b/src/opus_decoder.c index 5b4d2cfa..c607edfe 100644 --- a/src/opus_decoder.c +++ b/src/opus_decoder.c @@ -34,13 +34,13 @@ #include "opus.h" #include "entdec.h" #include "modes.h" -#include "silk_API.h" +#include "API.h" #include "stack_alloc.h" #include "float_cast.h" #include "opus_private.h" #include "os_support.h" -#include "silk_structs.h" -#include "silk_define.h" +#include "structs.h" +#include "define.h" struct OpusDecoder { int celt_dec_offset; diff --git a/src/opus_encoder.c b/src/opus_encoder.c index 0a47440d..d1b48562 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -33,7 +33,7 @@ #include "celt.h" #include "entenc.h" #include "modes.h" -#include "silk_API.h" +#include "API.h" #include "stack_alloc.h" #include "float_cast.h" #include "opus.h" @@ -41,11 +41,11 @@ #include "opus_private.h" #include "os_support.h" -#include "silk_tuning_parameters.h" +#include "tuning_parameters.h" #ifdef FIXED_POINT -#include "fixed/silk_structs_FIX.h" +#include "fixed/structs_FIX.h" #else -#include "float/silk_structs_FLP.h" +#include "float/structs_FLP.h" #endif #define MAX_ENCODER_BUFFER 480 diff --git a/src/test_opus.c b/src/test_opus.c index 23d32555..27e315a5 100644 --- a/src/test_opus.c +++ b/src/test_opus.c @@ -35,7 +35,7 @@ #include <math.h> #include <string.h> #include "opus.h" -#include "silk_debug.h" +#include "debug.h" #include "opus_types.h" #define MAX_PACKET 1500 |