From fc0c4c617538d6fa33808f3acacd9897046bd3d0 Mon Sep 17 00:00:00 2001 From: George Marques Date: Fri, 27 Nov 2015 19:29:48 -0200 Subject: Remove Opus extra includes Remove the extra directories to include that were needed by the Opus library. Now the lib includes more specific paths to avoid those. --- drivers/opus/silk/A2NLSF.c | 6 +++--- drivers/opus/silk/API.h | 10 +++++----- drivers/opus/silk/CNG.c | 6 +++--- drivers/opus/silk/HP_variable_cutoff.c | 8 ++++---- drivers/opus/silk/LPC_analysis_filter.c | 6 +++--- drivers/opus/silk/LPC_inv_pred_gain.c | 4 ++-- drivers/opus/silk/LP_variable_cutoff.c | 4 ++-- drivers/opus/silk/NLSF2A.c | 6 +++--- drivers/opus/silk/NLSF_VQ.c | 4 ++-- drivers/opus/silk/NLSF_VQ_weights_laroia.c | 6 +++--- drivers/opus/silk/NLSF_decode.c | 4 ++-- drivers/opus/silk/NLSF_del_dec_quant.c | 4 ++-- drivers/opus/silk/NLSF_encode.c | 6 +++--- drivers/opus/silk/NLSF_stabilize.c | 4 ++-- drivers/opus/silk/NLSF_unpack.c | 4 ++-- drivers/opus/silk/NSQ.c | 6 +++--- drivers/opus/silk/NSQ_del_dec.c | 6 +++--- drivers/opus/silk/PLC.c | 8 ++++---- drivers/opus/silk/PLC.h | 2 +- drivers/opus/silk/SigProc_FIX.h | 12 ++++++------ drivers/opus/silk/VAD.c | 6 +++--- drivers/opus/silk/VQ_WMat_EC.c | 4 ++-- drivers/opus/silk/ana_filt_bank_1.c | 4 ++-- drivers/opus/silk/biquad_alt.c | 4 ++-- drivers/opus/silk/bwexpander.c | 4 ++-- drivers/opus/silk/bwexpander_32.c | 4 ++-- drivers/opus/silk/check_control_input.c | 8 ++++---- drivers/opus/silk/code_signs.c | 4 ++-- drivers/opus/silk/control.h | 2 +- drivers/opus/silk/control_SNR.c | 6 +++--- drivers/opus/silk/control_audio_bandwidth.c | 6 +++--- drivers/opus/silk/control_codec.c | 12 ++++++------ drivers/opus/silk/debug.c | 6 +++--- drivers/opus/silk/debug.h | 2 +- drivers/opus/silk/dec_API.c | 8 ++++---- drivers/opus/silk/decode_core.c | 6 +++--- drivers/opus/silk/decode_frame.c | 8 ++++---- drivers/opus/silk/decode_indices.c | 4 ++-- drivers/opus/silk/decode_parameters.c | 4 ++-- drivers/opus/silk/decode_pitch.c | 6 +++--- drivers/opus/silk/decode_pulses.c | 4 ++-- drivers/opus/silk/decoder_set_fs.c | 4 ++-- drivers/opus/silk/define.h | 4 ++-- drivers/opus/silk/enc_API.c | 20 ++++++++++---------- drivers/opus/silk/encode_indices.c | 4 ++-- drivers/opus/silk/encode_pulses.c | 6 +++--- drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c | 4 ++-- drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c | 4 ++-- drivers/opus/silk/fixed/apply_sine_window_FIX.c | 4 ++-- drivers/opus/silk/fixed/autocorr_FIX.c | 6 +++--- drivers/opus/silk/fixed/burg_modified_FIX.c | 10 +++++----- drivers/opus/silk/fixed/corrMatrix_FIX.c | 4 ++-- drivers/opus/silk/fixed/encode_frame_FIX.c | 8 ++++---- drivers/opus/silk/fixed/find_LPC_FIX.c | 8 ++++---- drivers/opus/silk/fixed/find_LTP_FIX.c | 6 +++--- drivers/opus/silk/fixed/find_pitch_lags_FIX.c | 8 ++++---- drivers/opus/silk/fixed/find_pred_coefs_FIX.c | 6 +++--- drivers/opus/silk/fixed/k2a_FIX.c | 4 ++-- drivers/opus/silk/fixed/k2a_Q16_FIX.c | 4 ++-- drivers/opus/silk/fixed/main_FIX.h | 14 +++++++------- drivers/opus/silk/fixed/noise_shape_analysis_FIX.c | 8 ++++---- drivers/opus/silk/fixed/pitch_analysis_core_FIX.c | 12 ++++++------ drivers/opus/silk/fixed/prefilter_FIX.c | 8 ++++---- drivers/opus/silk/fixed/process_gains_FIX.c | 6 +++--- .../opus/silk/fixed/regularize_correlations_FIX.c | 4 ++-- drivers/opus/silk/fixed/residual_energy16_FIX.c | 4 ++-- drivers/opus/silk/fixed/residual_energy_FIX.c | 6 +++--- drivers/opus/silk/fixed/schur64_FIX.c | 4 ++-- drivers/opus/silk/fixed/schur_FIX.c | 4 ++-- drivers/opus/silk/fixed/solve_LS_FIX.c | 8 ++++---- drivers/opus/silk/fixed/structs_FIX.h | 6 +++--- drivers/opus/silk/fixed/vector_ops_FIX.c | 4 ++-- drivers/opus/silk/fixed/warped_autocorrelation_FIX.c | 4 ++-- drivers/opus/silk/float/LPC_analysis_filter_FLP.c | 4 ++-- drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c | 6 +++--- drivers/opus/silk/float/LTP_analysis_filter_FLP.c | 4 ++-- drivers/opus/silk/float/LTP_scale_ctrl_FLP.c | 4 ++-- drivers/opus/silk/float/SigProc_FLP.h | 4 ++-- drivers/opus/silk/float/apply_sine_window_FLP.c | 4 ++-- drivers/opus/silk/float/autocorrelation_FLP.c | 6 +++--- drivers/opus/silk/float/burg_modified_FLP.c | 8 ++++---- drivers/opus/silk/float/bwexpander_FLP.c | 4 ++-- drivers/opus/silk/float/corrMatrix_FLP.c | 4 ++-- drivers/opus/silk/float/encode_frame_FLP.c | 6 +++--- drivers/opus/silk/float/energy_FLP.c | 4 ++-- drivers/opus/silk/float/find_LPC_FLP.c | 8 ++++---- drivers/opus/silk/float/find_LTP_FLP.c | 6 +++--- drivers/opus/silk/float/find_pitch_lags_FLP.c | 6 +++--- drivers/opus/silk/float/find_pred_coefs_FLP.c | 4 ++-- drivers/opus/silk/float/inner_product_FLP.c | 4 ++-- drivers/opus/silk/float/k2a_FLP.c | 4 ++-- drivers/opus/silk/float/levinsondurbin_FLP.c | 4 ++-- drivers/opus/silk/float/main_FLP.h | 14 +++++++------- drivers/opus/silk/float/noise_shape_analysis_FLP.c | 6 +++--- drivers/opus/silk/float/pitch_analysis_core_FLP.c | 10 +++++----- drivers/opus/silk/float/prefilter_FLP.c | 6 +++--- drivers/opus/silk/float/process_gains_FLP.c | 6 +++--- .../opus/silk/float/regularize_correlations_FLP.c | 4 ++-- drivers/opus/silk/float/residual_energy_FLP.c | 4 ++-- drivers/opus/silk/float/scale_copy_vector_FLP.c | 4 ++-- drivers/opus/silk/float/scale_vector_FLP.c | 4 ++-- drivers/opus/silk/float/schur_FLP.c | 4 ++-- drivers/opus/silk/float/solve_LS_FLP.c | 6 +++--- drivers/opus/silk/float/sort_FLP.c | 6 +++--- drivers/opus/silk/float/structs_FLP.h | 6 +++--- drivers/opus/silk/float/warped_autocorrelation_FLP.c | 4 ++-- drivers/opus/silk/float/wrappers_FLP.c | 4 ++-- drivers/opus/silk/gain_quant.c | 4 ++-- drivers/opus/silk/init_decoder.c | 4 ++-- drivers/opus/silk/init_encoder.c | 10 +++++----- drivers/opus/silk/inner_prod_aligned.c | 4 ++-- drivers/opus/silk/interpolate.c | 4 ++-- drivers/opus/silk/lin2log.c | 4 ++-- drivers/opus/silk/log2lin.c | 4 ++-- drivers/opus/silk/macros.h | 8 ++++---- drivers/opus/silk/pitch_est_defines.h | 2 +- drivers/opus/silk/pitch_est_tables.c | 6 +++--- drivers/opus/silk/process_NLSFs.c | 4 ++-- drivers/opus/silk/quant_LTP_gains.c | 6 +++--- drivers/opus/silk/resampler.c | 4 ++-- drivers/opus/silk/resampler_down2.c | 6 +++--- drivers/opus/silk/resampler_down2_3.c | 8 ++++---- drivers/opus/silk/resampler_private.h | 6 +++--- drivers/opus/silk/resampler_private_AR2.c | 6 +++--- drivers/opus/silk/resampler_private_IIR_FIR.c | 8 ++++---- drivers/opus/silk/resampler_private_down_FIR.c | 8 ++++---- drivers/opus/silk/resampler_private_up2_HQ.c | 6 +++--- drivers/opus/silk/resampler_rom.c | 4 ++-- drivers/opus/silk/resampler_rom.h | 4 ++-- drivers/opus/silk/shell_coder.c | 4 ++-- drivers/opus/silk/sigm_Q15.c | 4 ++-- drivers/opus/silk/silk_main.h | 18 +++++++++--------- drivers/opus/silk/sort.c | 4 ++-- drivers/opus/silk/stereo_LR_to_MS.c | 6 +++--- drivers/opus/silk/stereo_MS_to_LR.c | 4 ++-- drivers/opus/silk/stereo_decode_pred.c | 4 ++-- drivers/opus/silk/stereo_encode_pred.c | 4 ++-- drivers/opus/silk/stereo_find_predictor.c | 4 ++-- drivers/opus/silk/stereo_quant_pred.c | 4 ++-- drivers/opus/silk/structs.h | 10 +++++----- drivers/opus/silk/sum_sqr_shift.c | 4 ++-- drivers/opus/silk/table_LSF_cos.c | 4 ++-- drivers/opus/silk/tables.h | 4 ++-- drivers/opus/silk/tables_LTP.c | 4 ++-- drivers/opus/silk/tables_NLSF_CB_NB_MB.c | 4 ++-- drivers/opus/silk/tables_NLSF_CB_WB.c | 4 ++-- drivers/opus/silk/tables_gain.c | 4 ++-- drivers/opus/silk/tables_other.c | 8 ++++---- drivers/opus/silk/tables_pitch_lag.c | 4 ++-- drivers/opus/silk/tables_pulses_per_block.c | 4 ++-- drivers/opus/silk/typedef.h | 4 ++-- 151 files changed, 425 insertions(+), 425 deletions(-) (limited to 'drivers/opus/silk') diff --git a/drivers/opus/silk/A2NLSF.c b/drivers/opus/silk/A2NLSF.c index cec53a5cd8..bc7d7f4f1d 100644 --- a/drivers/opus/silk/A2NLSF.c +++ b/drivers/opus/silk/A2NLSF.c @@ -32,11 +32,11 @@ POSSIBILITY OF SUCH DAMAGE. /* functions are accurate inverses of each other */ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "tables.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/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/drivers/opus/silk/API.h b/drivers/opus/silk/API.h index f0601bcf6b..70f81a0c44 100644 --- a/drivers/opus/silk/API.h +++ b/drivers/opus/silk/API.h @@ -28,11 +28,11 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_API_H #define SILK_API_H -#include "control.h" -#include "typedef.h" -#include "errors.h" -#include "entenc.h" -#include "entdec.h" +#include "opus/silk/control.h" +#include "opus/silk/typedef.h" +#include "opus/silk/errors.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/CNG.c b/drivers/opus/silk/CNG.c index 8b8dbf882c..6f566d467c 100644 --- a/drivers/opus/silk/CNG.c +++ b/drivers/opus/silk/CNG.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /* Generates excitation for CNG LPC synthesis */ static OPUS_INLINE void silk_CNG_exc( diff --git a/drivers/opus/silk/HP_variable_cutoff.c b/drivers/opus/silk/HP_variable_cutoff.c index 379752bb19..36e4cb9595 100644 --- a/drivers/opus/silk/HP_variable_cutoff.c +++ b/drivers/opus/silk/HP_variable_cutoff.c @@ -26,14 +26,14 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif #ifdef OPUS_FIXED_POINT -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #else -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #endif -#include "tuning_parameters.h" +#include "opus/silk/tuning_parameters.h" /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */ void silk_HP_variable_cutoff( diff --git a/drivers/opus/silk/LPC_analysis_filter.c b/drivers/opus/silk/LPC_analysis_filter.c index 98ef509e4e..3140f76b6c 100644 --- a/drivers/opus/silk/LPC_analysis_filter.c +++ b/drivers/opus/silk/LPC_analysis_filter.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "celt_lpc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/celt/celt_lpc.h" /*******************************************/ /* LPC analysis filter */ diff --git a/drivers/opus/silk/LPC_inv_pred_gain.c b/drivers/opus/silk/LPC_inv_pred_gain.c index 6dc9a49861..ec3486f3ed 100644 --- a/drivers/opus/silk/LPC_inv_pred_gain.c +++ b/drivers/opus/silk/LPC_inv_pred_gain.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" #define QA 24 #define A_LIMIT SILK_FIX_CONST( 0.99975, QA ) diff --git a/drivers/opus/silk/LP_variable_cutoff.c b/drivers/opus/silk/LP_variable_cutoff.c index 098c19d34f..59a14ad06b 100644 --- a/drivers/opus/silk/LP_variable_cutoff.c +++ b/drivers/opus/silk/LP_variable_cutoff.c @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /* @@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE. [0.95 : 0.15 : 0.35] normalized cut off frequencies. */ -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Helper function, interpolates the filter taps */ static OPUS_INLINE void silk_LP_interpolate_filter_taps( diff --git a/drivers/opus/silk/NLSF2A.c b/drivers/opus/silk/NLSF2A.c index 2b6f685f49..0a780cdbc9 100644 --- a/drivers/opus/silk/NLSF2A.c +++ b/drivers/opus/silk/NLSF2A.c @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /* conversion between prediction filter coefficients and LSFs */ @@ -35,8 +35,8 @@ POSSIBILITY OF SUCH DAMAGE. /* therefore the result is not accurate LSFs, but the two */ /* functions are accurate inverses of each other */ -#include "SigProc_FIX.h" -#include "tables.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/tables.h" #define QA 16 diff --git a/drivers/opus/silk/NLSF_VQ.c b/drivers/opus/silk/NLSF_VQ.c index e4ca79fbfe..fcec6897b9 100644 --- a/drivers/opus/silk/NLSF_VQ.c +++ b/drivers/opus/silk/NLSF_VQ.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */ void silk_NLSF_VQ( diff --git a/drivers/opus/silk/NLSF_VQ_weights_laroia.c b/drivers/opus/silk/NLSF_VQ_weights_laroia.c index f461ba01c0..6ef457e999 100644 --- a/drivers/opus/silk/NLSF_VQ_weights_laroia.c +++ b/drivers/opus/silk/NLSF_VQ_weights_laroia.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "define.h" -#include "SigProc_FIX.h" +#include "opus/silk/define.h" +#include "opus/silk/SigProc_FIX.h" /* R. Laroia, N. Phamdo and N. Farvardin, "Robust and Efficient Quantization of Speech LSP diff --git a/drivers/opus/silk/NLSF_decode.c b/drivers/opus/silk/NLSF_decode.c index 786a62d278..46472df8a7 100644 --- a/drivers/opus/silk/NLSF_decode.c +++ b/drivers/opus/silk/NLSF_decode.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Predictive dequantizer for NLSF residuals */ static OPUS_INLINE void silk_NLSF_residual_dequant( /* O Returns RD value in Q30 */ diff --git a/drivers/opus/silk/NLSF_del_dec_quant.c b/drivers/opus/silk/NLSF_del_dec_quant.c index b74585370c..26c4b2ae0b 100644 --- a/drivers/opus/silk/NLSF_del_dec_quant.c +++ b/drivers/opus/silk/NLSF_del_dec_quant.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Delayed-decision quantizer for NLSF residuals */ opus_int32 silk_NLSF_del_dec_quant( /* O Returns RD value in Q25 */ diff --git a/drivers/opus/silk/NLSF_encode.c b/drivers/opus/silk/NLSF_encode.c index bf67bd5cf1..4c89760a8c 100644 --- a/drivers/opus/silk/NLSF_encode.c +++ b/drivers/opus/silk/NLSF_encode.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /***********************/ /* NLSF vector encoder */ diff --git a/drivers/opus/silk/NLSF_stabilize.c b/drivers/opus/silk/NLSF_stabilize.c index a1bf20b8d4..e985ac464a 100644 --- a/drivers/opus/silk/NLSF_stabilize.c +++ b/drivers/opus/silk/NLSF_stabilize.c @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /* NLSF stabilizer: */ @@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. /* - Output are sorted NLSF coefficients */ /* */ -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Constant Definitions */ #define MAX_LOOPS 20 diff --git a/drivers/opus/silk/NLSF_unpack.c b/drivers/opus/silk/NLSF_unpack.c index 60242a3b52..089618cad6 100644 --- a/drivers/opus/silk/NLSF_unpack.c +++ b/drivers/opus/silk/NLSF_unpack.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Unpack predictor values and indices for entropy coding tables */ void silk_NLSF_unpack( diff --git a/drivers/opus/silk/NSQ.c b/drivers/opus/silk/NSQ.c index a08e34e893..c1c9f17ef8 100644 --- a/drivers/opus/silk/NSQ.c +++ b/drivers/opus/silk/NSQ.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" static OPUS_INLINE void silk_nsq_scale_states( const silk_encoder_state *psEncC, /* I Encoder State */ diff --git a/drivers/opus/silk/NSQ_del_dec.c b/drivers/opus/silk/NSQ_del_dec.c index 8ac6311b11..5e53690113 100644 --- a/drivers/opus/silk/NSQ_del_dec.c +++ b/drivers/opus/silk/NSQ_del_dec.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" typedef struct { opus_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ]; diff --git a/drivers/opus/silk/PLC.c b/drivers/opus/silk/PLC.c index 9fc11adda9..c07d95eb8d 100644 --- a/drivers/opus/silk/PLC.c +++ b/drivers/opus/silk/PLC.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" -#include "PLC.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/PLC.h" #define NB_ATT 2 static const opus_int16 HARM_ATT_Q15[NB_ATT] = { 32440, 31130 }; /* 0.99, 0.95 */ diff --git a/drivers/opus/silk/PLC.h b/drivers/opus/silk/PLC.h index f531cda950..ae573fc00c 100644 --- a/drivers/opus/silk/PLC.h +++ b/drivers/opus/silk/PLC.h @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_PLC_H #define SILK_PLC_H -#include "silk_main.h" +#include "opus/silk/silk_main.h" #define BWE_COEF 0.99 #define V_PITCH_GAIN_START_MIN_Q14 11469 /* 0.7 in Q14 */ diff --git a/drivers/opus/silk/SigProc_FIX.h b/drivers/opus/silk/SigProc_FIX.h index 1b58057910..f4db0fa9a4 100644 --- a/drivers/opus/silk/SigProc_FIX.h +++ b/drivers/opus/silk/SigProc_FIX.h @@ -38,9 +38,9 @@ extern "C" #define SILK_MAX_ORDER_LPC 16 /* max order of the LPC analysis in schur() and k2a() */ #include /* for memset(), memcpy(), memmove() */ -#include "typedef.h" -#include "resampler_structs.h" -#include "macros.h" +#include "opus/silk/typedef.h" +#include "opus/silk/resampler_structs.h" +#include "opus/silk/macros.h" /********************************************************************/ @@ -575,9 +575,9 @@ static OPUS_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 "Inlines.h" -#include "MacroCount.h" -#include "MacroDebug.h" +#include "opus/silk/Inlines.h" +#include "opus/silk/MacroCount.h" +#include "opus/silk/MacroDebug.h" #ifdef OPUS_ARM_INLINE_ASM #include "arm/SigProc_FIX_armv4.h" diff --git a/drivers/opus/silk/VAD.c b/drivers/opus/silk/VAD.c index 3a5c566627..c4f524e3a5 100644 --- a/drivers/opus/silk/VAD.c +++ b/drivers/opus/silk/VAD.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /* Silk VAD noise level estimation */ static OPUS_INLINE void silk_VAD_GetNoiseLevels( diff --git a/drivers/opus/silk/VQ_WMat_EC.c b/drivers/opus/silk/VQ_WMat_EC.c index 28c5fc7e6f..7e2175ccb9 100644 --- a/drivers/opus/silk/VQ_WMat_EC.c +++ b/drivers/opus/silk/VQ_WMat_EC.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_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/drivers/opus/silk/ana_filt_bank_1.c b/drivers/opus/silk/ana_filt_bank_1.c index 387dcd87e7..6e2de0b5ba 100644 --- a/drivers/opus/silk/ana_filt_bank_1.c +++ b/drivers/opus/silk/ana_filt_bank_1.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Coefficients for 2-band filter bank based on first-order allpass filters */ static opus_int16 A_fb1_20 = 5394 << 1; diff --git a/drivers/opus/silk/biquad_alt.c b/drivers/opus/silk/biquad_alt.c index 5f1d6d25c3..9cc1e6c4fa 100644 --- a/drivers/opus/silk/biquad_alt.c +++ b/drivers/opus/silk/biquad_alt.c @@ -33,10 +33,10 @@ POSSIBILITY OF SUCH DAMAGE. * */ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Second order ARMA filter, alternative implementation */ void silk_biquad_alt( diff --git a/drivers/opus/silk/bwexpander.c b/drivers/opus/silk/bwexpander.c index d757483872..f7256dd04d 100644 --- a/drivers/opus/silk/bwexpander.c +++ b/drivers/opus/silk/bwexpander.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Chirp (bandwidth expand) LP AR filter */ void silk_bwexpander( diff --git a/drivers/opus/silk/bwexpander_32.c b/drivers/opus/silk/bwexpander_32.c index 8a60767c0d..9408219903 100644 --- a/drivers/opus/silk/bwexpander_32.c +++ b/drivers/opus/silk/bwexpander_32.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Chirp (bandwidth expand) LP AR filter */ void silk_bwexpander_32( diff --git a/drivers/opus/silk/check_control_input.c b/drivers/opus/silk/check_control_input.c index 0e02fff22d..eb6742efd3 100644 --- a/drivers/opus/silk/check_control_input.c +++ b/drivers/opus/silk/check_control_input.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "control.h" -#include "errors.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/control.h" +#include "opus/silk/errors.h" /* Check encoder control struct */ opus_int check_control_input( diff --git a/drivers/opus/silk/code_signs.c b/drivers/opus/silk/code_signs.c index 8bcc6ecde1..5151efdc48 100644 --- a/drivers/opus/silk/code_signs.c +++ b/drivers/opus/silk/code_signs.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /*#define silk_enc_map(a) ((a) > 0 ? 1 : 0)*/ /*#define silk_dec_map(a) ((a) > 0 ? 1 : -1)*/ diff --git a/drivers/opus/silk/control.h b/drivers/opus/silk/control.h index 747e5426a0..4b20c4a8b8 100644 --- a/drivers/opus/silk/control.h +++ b/drivers/opus/silk/control.h @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_CONTROL_H #define SILK_CONTROL_H -#include "typedef.h" +#include "opus/silk/typedef.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/control_SNR.c b/drivers/opus/silk/control_SNR.c index ae6351798b..e584e43eef 100644 --- a/drivers/opus/silk/control_SNR.c +++ b/drivers/opus/silk/control_SNR.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "tuning_parameters.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/tuning_parameters.h" /* Control SNR of redidual quantizer */ opus_int silk_control_SNR( diff --git a/drivers/opus/silk/control_audio_bandwidth.c b/drivers/opus/silk/control_audio_bandwidth.c index 6f060bbd29..f1da038c6f 100644 --- a/drivers/opus/silk/control_audio_bandwidth.c +++ b/drivers/opus/silk/control_audio_bandwidth.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "tuning_parameters.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/tuning_parameters.h" /* Control internal sampling rate */ opus_int silk_control_audio_bandwidth( diff --git a/drivers/opus/silk/control_codec.c b/drivers/opus/silk/control_codec.c index 2d7b10e9b7..7746a6512f 100644 --- a/drivers/opus/silk/control_codec.c +++ b/drivers/opus/silk/control_codec.c @@ -26,18 +26,18 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif #ifdef OPUS_FIXED_POINT -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #define silk_encoder_state_Fxx silk_encoder_state_FIX #else -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #define silk_encoder_state_Fxx silk_encoder_state_FLP #endif -#include "stack_alloc.h" -#include "tuning_parameters.h" -#include "pitch_est_defines.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" +#include "opus/silk/pitch_est_defines.h" static opus_int silk_setup_resamplers( silk_encoder_state_Fxx *psEnc, /* I/O */ diff --git a/drivers/opus/silk/debug.c b/drivers/opus/silk/debug.c index 2230813fae..ecfcb39ae6 100644 --- a/drivers/opus/silk/debug.c +++ b/drivers/opus/silk/debug.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "debug.h" -#include "SigProc_FIX.h" +#include "opus/silk/debug.h" +#include "opus/silk/SigProc_FIX.h" #if SILK_TIC_TOC diff --git a/drivers/opus/silk/debug.h b/drivers/opus/silk/debug.h index efb6d3e99e..d2eccfa1e4 100644 --- a/drivers/opus/silk/debug.h +++ b/drivers/opus/silk/debug.h @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_DEBUG_H #define SILK_DEBUG_H -#include "typedef.h" +#include "opus/silk/typedef.h" #include /* file writing */ #include /* strcpy, strcmp */ diff --git a/drivers/opus/silk/dec_API.c b/drivers/opus/silk/dec_API.c index cd72115a20..c877417858 100644 --- a/drivers/opus/silk/dec_API.c +++ b/drivers/opus/silk/dec_API.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "API.h" -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/API.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /************************/ /* Decoder Super Struct */ diff --git a/drivers/opus/silk/decode_core.c b/drivers/opus/silk/decode_core.c index 8f801ea7ad..18e655ceb2 100644 --- a/drivers/opus/silk/decode_core.c +++ b/drivers/opus/silk/decode_core.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /**********************************************************/ /* Core decoder. Performs inverse NSQ operation LTP + LPC */ diff --git a/drivers/opus/silk/decode_frame.c b/drivers/opus/silk/decode_frame.c index 38500227c2..21461f92aa 100644 --- a/drivers/opus/silk/decode_frame.c +++ b/drivers/opus/silk/decode_frame.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" -#include "PLC.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/PLC.h" /****************/ /* Decode frame */ diff --git a/drivers/opus/silk/decode_indices.c b/drivers/opus/silk/decode_indices.c index c2aaad2606..ec3fec2486 100644 --- a/drivers/opus/silk/decode_indices.c +++ b/drivers/opus/silk/decode_indices.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Decode side-information parameters from payload */ void silk_decode_indices( diff --git a/drivers/opus/silk/decode_parameters.c b/drivers/opus/silk/decode_parameters.c index 72df4fcdb2..458d319deb 100644 --- a/drivers/opus/silk/decode_parameters.c +++ b/drivers/opus/silk/decode_parameters.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Decode parameters from payload */ void silk_decode_parameters( diff --git a/drivers/opus/silk/decode_pitch.c b/drivers/opus/silk/decode_pitch.c index 3e1dd2d35b..d84b0721e2 100644 --- a/drivers/opus/silk/decode_pitch.c +++ b/drivers/opus/silk/decode_pitch.c @@ -26,14 +26,14 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /*********************************************************** * Pitch analyser function ********************************************************** */ -#include "SigProc_FIX.h" -#include "pitch_est_defines.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/pitch_est_defines.h" void silk_decode_pitch( opus_int16 lagIndex, /* I */ diff --git a/drivers/opus/silk/decode_pulses.c b/drivers/opus/silk/decode_pulses.c index 13772f8a57..bd016e93cf 100644 --- a/drivers/opus/silk/decode_pulses.c +++ b/drivers/opus/silk/decode_pulses.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /*********************************************/ /* Decode quantization indices of excitation */ diff --git a/drivers/opus/silk/decoder_set_fs.c b/drivers/opus/silk/decoder_set_fs.c index 6d2de56647..dec74a205d 100644 --- a/drivers/opus/silk/decoder_set_fs.c +++ b/drivers/opus/silk/decoder_set_fs.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Set decoder sampling rate */ opus_int silk_decoder_set_fs( diff --git a/drivers/opus/silk/define.h b/drivers/opus/silk/define.h index c47aca9f58..a38564c835 100644 --- a/drivers/opus/silk/define.h +++ b/drivers/opus/silk/define.h @@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_DEFINE_H #define SILK_DEFINE_H -#include "errors.h" -#include "typedef.h" +#include "opus/silk/errors.h" +#include "opus/silk/typedef.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/enc_API.c b/drivers/opus/silk/enc_API.c index 66a9bb67de..0246334090 100644 --- a/drivers/opus/silk/enc_API.c +++ b/drivers/opus/silk/enc_API.c @@ -26,19 +26,19 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "define.h" -#include "API.h" -#include "control.h" -#include "typedef.h" -#include "stack_alloc.h" -#include "structs.h" -#include "tuning_parameters.h" +#include "opus/silk/define.h" +#include "opus/silk/API.h" +#include "opus/silk/control.h" +#include "opus/silk/typedef.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/structs.h" +#include "opus/silk/tuning_parameters.h" #ifdef OPUS_FIXED_POINT -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #else -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #endif /***************************************/ diff --git a/drivers/opus/silk/encode_indices.c b/drivers/opus/silk/encode_indices.c index c6679b34f6..190c6c4752 100644 --- a/drivers/opus/silk/encode_indices.c +++ b/drivers/opus/silk/encode_indices.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Encode side-information parameters to payload */ void silk_encode_indices( diff --git a/drivers/opus/silk/encode_pulses.c b/drivers/opus/silk/encode_pulses.c index d148b9d1e6..7bc965fb3d 100644 --- a/drivers/opus/silk/encode_pulses.c +++ b/drivers/opus/silk/encode_pulses.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /*********************************************/ /* Encode quantization indices of excitation */ diff --git a/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c b/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c index 1df4b01d20..58887acd99 100644 --- a/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c +++ b/drivers/opus/silk/fixed/LTP_analysis_filter_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/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/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c b/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c index ab6923c5c9..15286bc1d2 100644 --- a/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c +++ b/drivers/opus/silk/fixed/LTP_scale_ctrl_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" /* Calculation of LTP state scaling */ void silk_LTP_scale_ctrl_FIX( diff --git a/drivers/opus/silk/fixed/apply_sine_window_FIX.c b/drivers/opus/silk/fixed/apply_sine_window_FIX.c index 0998b49eca..e5b844fd1f 100644 --- a/drivers/opus/silk/fixed/apply_sine_window_FIX.c +++ b/drivers/opus/silk/fixed/apply_sine_window_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Apply sine window to signal vector. */ /* Window types: */ diff --git a/drivers/opus/silk/fixed/autocorr_FIX.c b/drivers/opus/silk/fixed/autocorr_FIX.c index 438b42f85b..b57990faf0 100644 --- a/drivers/opus/silk/fixed/autocorr_FIX.c +++ b/drivers/opus/silk/fixed/autocorr_FIX.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "celt_lpc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/celt/celt_lpc.h" /* Compute autocorrelation */ void silk_autocorr( diff --git a/drivers/opus/silk/fixed/burg_modified_FIX.c b/drivers/opus/silk/fixed/burg_modified_FIX.c index ce2a560e6d..b621e23031 100644 --- a/drivers/opus/silk/fixed/burg_modified_FIX.c +++ b/drivers/opus/silk/fixed/burg_modified_FIX.c @@ -26,13 +26,13 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "define.h" -#include "tuning_parameters.h" -#include "pitch.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/define.h" +#include "opus/silk/tuning_parameters.h" +#include "opus/celt/pitch.h" #define MAX_FRAME_SIZE 384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384 */ diff --git a/drivers/opus/silk/fixed/corrMatrix_FIX.c b/drivers/opus/silk/fixed/corrMatrix_FIX.c index 28543fc204..90edf9229c 100644 --- a/drivers/opus/silk/fixed/corrMatrix_FIX.c +++ b/drivers/opus/silk/fixed/corrMatrix_FIX.c @@ -26,14 +26,14 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /********************************************************************** * Correlation Matrix Computations for LS estimate. **********************************************************************/ -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" /* Calculates correlation vector X'*t */ void silk_corrVector_FIX( diff --git a/drivers/opus/silk/fixed/encode_frame_FIX.c b/drivers/opus/silk/fixed/encode_frame_FIX.c index 2d80ca3583..e49367c212 100644 --- a/drivers/opus/silk/fixed/encode_frame_FIX.c +++ b/drivers/opus/silk/fixed/encode_frame_FIX.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate */ static OPUS_INLINE void silk_LBRR_encode_FIX( diff --git a/drivers/opus/silk/fixed/find_LPC_FIX.c b/drivers/opus/silk/fixed/find_LPC_FIX.c index a46cdb7515..812cfbacad 100644 --- a/drivers/opus/silk/fixed/find_LPC_FIX.c +++ b/drivers/opus/silk/fixed/find_LPC_FIX.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /* Finds LPC vector from correlations, and converts to NLSF */ void silk_find_LPC_FIX( diff --git a/drivers/opus/silk/fixed/find_LTP_FIX.c b/drivers/opus/silk/fixed/find_LTP_FIX.c index a1d152eee4..a2b877afff 100644 --- a/drivers/opus/silk/fixed/find_LTP_FIX.c +++ b/drivers/opus/silk/fixed/find_LTP_FIX.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/silk/tuning_parameters.h" /* Head room for correlations */ #define LTP_CORRS_HEAD_ROOM 2 diff --git a/drivers/opus/silk/fixed/find_pitch_lags_FIX.c b/drivers/opus/silk/fixed/find_pitch_lags_FIX.c index 0598477cd1..a4cf60d5ed 100644 --- a/drivers/opus/silk/fixed/find_pitch_lags_FIX.c +++ b/drivers/opus/silk/fixed/find_pitch_lags_FIX.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /* Find pitch lags */ void silk_find_pitch_lags_FIX( diff --git a/drivers/opus/silk/fixed/find_pred_coefs_FIX.c b/drivers/opus/silk/fixed/find_pred_coefs_FIX.c index 0ab70df09d..9950b16485 100644 --- a/drivers/opus/silk/fixed/find_pred_coefs_FIX.c +++ b/drivers/opus/silk/fixed/find_pred_coefs_FIX.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" void silk_find_pred_coefs_FIX( silk_encoder_state_FIX *psEnc, /* I/O encoder state */ diff --git a/drivers/opus/silk/fixed/k2a_FIX.c b/drivers/opus/silk/fixed/k2a_FIX.c index 848666ee3b..3a8ada81a8 100644 --- a/drivers/opus/silk/fixed/k2a_FIX.c +++ b/drivers/opus/silk/fixed/k2a_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Step up function, converts reflection coefficients to prediction coefficients */ void silk_k2a( diff --git a/drivers/opus/silk/fixed/k2a_Q16_FIX.c b/drivers/opus/silk/fixed/k2a_Q16_FIX.c index f7e62e95fe..2ee9a9eb8f 100644 --- a/drivers/opus/silk/fixed/k2a_Q16_FIX.c +++ b/drivers/opus/silk/fixed/k2a_Q16_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Step up function, converts reflection coefficients to prediction coefficients */ void silk_k2a_Q16( diff --git a/drivers/opus/silk/fixed/main_FIX.h b/drivers/opus/silk/fixed/main_FIX.h index fb47ffe700..71a560ef0e 100644 --- a/drivers/opus/silk/fixed/main_FIX.h +++ b/drivers/opus/silk/fixed/main_FIX.h @@ -28,13 +28,13 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MAIN_FIX_H #define SILK_MAIN_FIX_H -#include "SigProc_FIX.h" -#include "structs_FIX.h" -#include "control.h" -#include "silk_main.h" -#include "PLC.h" -#include "debug.h" -#include "entenc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/fixed/structs_FIX.h" +#include "opus/silk/control.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/PLC.h" +#include "opus/silk/debug.h" +#include "opus/celt/entenc.h" #ifndef FORCE_CPP_BUILD #ifdef __cplusplus diff --git a/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c b/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c index 420cbeedfc..6cd797f6b9 100644 --- a/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c +++ b/drivers/opus/silk/fixed/noise_shape_analysis_FIX.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/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/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c b/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c index 4d65c09d1d..cdad2a9dbd 100644 --- a/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c +++ b/drivers/opus/silk/fixed/pitch_analysis_core_FIX.c @@ -26,17 +26,17 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /*********************************************************** * Pitch analyser function ********************************************************** */ -#include "SigProc_FIX.h" -#include "pitch_est_defines.h" -#include "stack_alloc.h" -#include "debug.h" -#include "pitch.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/pitch_est_defines.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/debug.h" +#include "opus/celt/pitch.h" #define SCRATCH_SIZE 22 #define SF_LENGTH_4KHZ ( PE_SUBFR_LENGTH_MS * 4 ) diff --git a/drivers/opus/silk/fixed/prefilter_FIX.c b/drivers/opus/silk/fixed/prefilter_FIX.c index 0b027eb836..c190ea9bd8 100644 --- a/drivers/opus/silk/fixed/prefilter_FIX.c +++ b/drivers/opus/silk/fixed/prefilter_FIX.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /* Prefilter for finding Quantizer input signal */ static OPUS_INLINE void silk_prefilt_FIX( diff --git a/drivers/opus/silk/fixed/process_gains_FIX.c b/drivers/opus/silk/fixed/process_gains_FIX.c index 3a78c475bb..ecb068453b 100644 --- a/drivers/opus/silk/fixed/process_gains_FIX.c +++ b/drivers/opus/silk/fixed/process_gains_FIX.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/silk/tuning_parameters.h" /* Processing of gains */ void silk_process_gains_FIX( diff --git a/drivers/opus/silk/fixed/regularize_correlations_FIX.c b/drivers/opus/silk/fixed/regularize_correlations_FIX.c index a3378fdd17..e7ddd7445d 100644 --- a/drivers/opus/silk/fixed/regularize_correlations_FIX.c +++ b/drivers/opus/silk/fixed/regularize_correlations_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" /* Add noise to matrix diagonal */ void silk_regularize_correlations_FIX( diff --git a/drivers/opus/silk/fixed/residual_energy16_FIX.c b/drivers/opus/silk/fixed/residual_energy16_FIX.c index 39bdff2a72..f65e068ee3 100644 --- a/drivers/opus/silk/fixed/residual_energy16_FIX.c +++ b/drivers/opus/silk/fixed/residual_energy16_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */ opus_int32 silk_residual_energy16_covar_FIX( diff --git a/drivers/opus/silk/fixed/residual_energy_FIX.c b/drivers/opus/silk/fixed/residual_energy_FIX.c index 13dbc51e39..fb0adb1856 100644 --- a/drivers/opus/silk/fixed/residual_energy_FIX.c +++ b/drivers/opus/silk/fixed/residual_energy_FIX.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" /* Calculates residual energies of input subframes where all subframes have LPC_order */ /* of preceding samples */ diff --git a/drivers/opus/silk/fixed/schur64_FIX.c b/drivers/opus/silk/fixed/schur64_FIX.c index 22c0952ffd..8176ea790c 100644 --- a/drivers/opus/silk/fixed/schur64_FIX.c +++ b/drivers/opus/silk/fixed/schur64_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Slower than schur(), but more accurate. */ /* Uses SMULL(), available on armv4 */ diff --git a/drivers/opus/silk/fixed/schur_FIX.c b/drivers/opus/silk/fixed/schur_FIX.c index e8b24cf068..8e9f8aaac4 100644 --- a/drivers/opus/silk/fixed/schur_FIX.c +++ b/drivers/opus/silk/fixed/schur_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Faster than schur64(), but much less accurate. */ /* uses SMLAWB(), requiring armv5E and higher. */ diff --git a/drivers/opus/silk/fixed/solve_LS_FIX.c b/drivers/opus/silk/fixed/solve_LS_FIX.c index 5d09284935..79f1f0639e 100644 --- a/drivers/opus/silk/fixed/solve_LS_FIX.c +++ b/drivers/opus/silk/fixed/solve_LS_FIX.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" -#include "stack_alloc.h" -#include "tuning_parameters.h" +#include "opus/silk/fixed/main_FIX.h" +#include "opus/celt/stack_alloc.h" +#include "opus/silk/tuning_parameters.h" /*****************************/ /* Internal function headers */ diff --git a/drivers/opus/silk/fixed/structs_FIX.h b/drivers/opus/silk/fixed/structs_FIX.h index 0284dfa27a..21eab05f0f 100644 --- a/drivers/opus/silk/fixed/structs_FIX.h +++ b/drivers/opus/silk/fixed/structs_FIX.h @@ -28,9 +28,9 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_STRUCTS_FIX_H #define SILK_STRUCTS_FIX_H -#include "typedef.h" -#include "silk_main.h" -#include "structs.h" +#include "opus/silk/typedef.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/structs.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/fixed/vector_ops_FIX.c b/drivers/opus/silk/fixed/vector_ops_FIX.c index b1e422eb91..884c3d74b1 100644 --- a/drivers/opus/silk/fixed/vector_ops_FIX.c +++ b/drivers/opus/silk/fixed/vector_ops_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Copy and multiply a vector by a constant */ void silk_scale_copy_vector16( diff --git a/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c b/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c index 3f04df775c..6b32171a8f 100644 --- a/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c +++ b/drivers/opus/silk/fixed/warped_autocorrelation_FIX.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #define QC 10 #define QS 14 diff --git a/drivers/opus/silk/float/LPC_analysis_filter_FLP.c b/drivers/opus/silk/float/LPC_analysis_filter_FLP.c index 8d26c093bf..d0a7237e80 100644 --- a/drivers/opus/silk/float/LPC_analysis_filter_FLP.c +++ b/drivers/opus/silk/float/LPC_analysis_filter_FLP.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif #include -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /************************************************/ /* LPC analysis filter */ diff --git a/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c b/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c index 968edfb189..094529ec05 100644 --- a/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c +++ b/drivers/opus/silk/float/LPC_inv_pred_gain_FLP.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "SigProc_FLP.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/float/SigProc_FLP.h" #define RC_THRESHOLD 0.9999f diff --git a/drivers/opus/silk/float/LTP_analysis_filter_FLP.c b/drivers/opus/silk/float/LTP_analysis_filter_FLP.c index fc729e99b1..8610541c3f 100644 --- a/drivers/opus/silk/float/LTP_analysis_filter_FLP.c +++ b/drivers/opus/silk/float/LTP_analysis_filter_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/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/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c b/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c index 60e1119d5a..199ba91ef2 100644 --- a/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c +++ b/drivers/opus/silk/float/LTP_scale_ctrl_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" void silk_LTP_scale_ctrl_FLP( silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ diff --git a/drivers/opus/silk/float/SigProc_FLP.h b/drivers/opus/silk/float/SigProc_FLP.h index f0cb3733be..9b14f24f21 100644 --- a/drivers/opus/silk/float/SigProc_FLP.h +++ b/drivers/opus/silk/float/SigProc_FLP.h @@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_SIGPROC_FLP_H #define SILK_SIGPROC_FLP_H -#include "SigProc_FIX.h" -#include "float_cast.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/celt/float_cast.h" #include #ifdef __cplusplus diff --git a/drivers/opus/silk/float/apply_sine_window_FLP.c b/drivers/opus/silk/float/apply_sine_window_FLP.c index d904585d17..83866fd308 100644 --- a/drivers/opus/silk/float/apply_sine_window_FLP.c +++ b/drivers/opus/silk/float/apply_sine_window_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Apply sine window to signal vector */ /* Window types: */ diff --git a/drivers/opus/silk/float/autocorrelation_FLP.c b/drivers/opus/silk/float/autocorrelation_FLP.c index 192a001b16..4e91a1a39a 100644 --- a/drivers/opus/silk/float/autocorrelation_FLP.c +++ b/drivers/opus/silk/float/autocorrelation_FLP.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "typedef.h" -#include "SigProc_FLP.h" +#include "opus/silk/typedef.h" +#include "opus/silk/float/SigProc_FLP.h" /* compute autocorrelation */ void silk_autocorrelation_FLP( diff --git a/drivers/opus/silk/float/burg_modified_FLP.c b/drivers/opus/silk/float/burg_modified_FLP.c index 0f30ca2280..712b5c821c 100644 --- a/drivers/opus/silk/float/burg_modified_FLP.c +++ b/drivers/opus/silk/float/burg_modified_FLP.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" -#include "tuning_parameters.h" -#include "define.h" +#include "opus/silk/float/SigProc_FLP.h" +#include "opus/silk/tuning_parameters.h" +#include "opus/silk/define.h" #define MAX_FRAME_SIZE 384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384*/ diff --git a/drivers/opus/silk/float/bwexpander_FLP.c b/drivers/opus/silk/float/bwexpander_FLP.c index 86154dc3f1..e11f14c878 100644 --- a/drivers/opus/silk/float/bwexpander_FLP.c +++ b/drivers/opus/silk/float/bwexpander_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* Chirp (bw expand) LP AR filter */ void silk_bwexpander_FLP( diff --git a/drivers/opus/silk/float/corrMatrix_FLP.c b/drivers/opus/silk/float/corrMatrix_FLP.c index e193c98f11..cdf4ee3bd8 100644 --- a/drivers/opus/silk/float/corrMatrix_FLP.c +++ b/drivers/opus/silk/float/corrMatrix_FLP.c @@ -26,14 +26,14 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /********************************************************************** * Correlation matrix computations for LS estimate. **********************************************************************/ -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Calculates correlation vector X'*t */ void silk_corrVector_FLP( diff --git a/drivers/opus/silk/float/encode_frame_FLP.c b/drivers/opus/silk/float/encode_frame_FLP.c index 90e5357ced..3c474c3b77 100644 --- a/drivers/opus/silk/float/encode_frame_FLP.c +++ b/drivers/opus/silk/float/encode_frame_FLP.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate */ static OPUS_INLINE void silk_LBRR_encode_FLP( diff --git a/drivers/opus/silk/float/energy_FLP.c b/drivers/opus/silk/float/energy_FLP.c index d441526df3..2ea3e1785a 100644 --- a/drivers/opus/silk/float/energy_FLP.c +++ b/drivers/opus/silk/float/energy_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* sum of squares of a silk_float array, with result as double */ double silk_energy_FLP( diff --git a/drivers/opus/silk/float/find_LPC_FLP.c b/drivers/opus/silk/float/find_LPC_FLP.c index 212f2de3cd..b39b0eb20a 100644 --- a/drivers/opus/silk/float/find_LPC_FLP.c +++ b/drivers/opus/silk/float/find_LPC_FLP.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "define.h" -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/define.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /* LPC analysis */ void silk_find_LPC_FLP( diff --git a/drivers/opus/silk/float/find_LTP_FLP.c b/drivers/opus/silk/float/find_LTP_FLP.c index 5c62851f20..4ddab9dacf 100644 --- a/drivers/opus/silk/float/find_LTP_FLP.c +++ b/drivers/opus/silk/float/find_LTP_FLP.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" void silk_find_LTP_FLP( silk_float b[ MAX_NB_SUBFR * LTP_ORDER ], /* O LTP coefs */ diff --git a/drivers/opus/silk/float/find_pitch_lags_FLP.c b/drivers/opus/silk/float/find_pitch_lags_FLP.c index d74d5941b5..0aaf94b52b 100644 --- a/drivers/opus/silk/float/find_pitch_lags_FLP.c +++ b/drivers/opus/silk/float/find_pitch_lags_FLP.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif #include -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" void silk_find_pitch_lags_FLP( silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ diff --git a/drivers/opus/silk/float/find_pred_coefs_FLP.c b/drivers/opus/silk/float/find_pred_coefs_FLP.c index e0d8804cc9..d13d3ed0a6 100644 --- a/drivers/opus/silk/float/find_pred_coefs_FLP.c +++ b/drivers/opus/silk/float/find_pred_coefs_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Find LPC and LTP coefficients */ void silk_find_pred_coefs_FLP( diff --git a/drivers/opus/silk/float/inner_product_FLP.c b/drivers/opus/silk/float/inner_product_FLP.c index 57acf5ffba..01b750ec49 100644 --- a/drivers/opus/silk/float/inner_product_FLP.c +++ b/drivers/opus/silk/float/inner_product_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* inner product of two silk_float arrays, with result as double */ double silk_inner_product_FLP( diff --git a/drivers/opus/silk/float/k2a_FLP.c b/drivers/opus/silk/float/k2a_FLP.c index a668a32127..624fe55bc4 100644 --- a/drivers/opus/silk/float/k2a_FLP.c +++ b/drivers/opus/silk/float/k2a_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* step up function, converts reflection coefficients to prediction coefficients */ void silk_k2a_FLP( diff --git a/drivers/opus/silk/float/levinsondurbin_FLP.c b/drivers/opus/silk/float/levinsondurbin_FLP.c index 64aaf0fb29..3f9790f6d6 100644 --- a/drivers/opus/silk/float/levinsondurbin_FLP.c +++ b/drivers/opus/silk/float/levinsondurbin_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* Solve the normal equations using the Levinson-Durbin recursion */ silk_float silk_levinsondurbin_FLP( /* O prediction error energy */ diff --git a/drivers/opus/silk/float/main_FLP.h b/drivers/opus/silk/float/main_FLP.h index 92d6ec3df1..4ec8ddeefc 100644 --- a/drivers/opus/silk/float/main_FLP.h +++ b/drivers/opus/silk/float/main_FLP.h @@ -28,13 +28,13 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MAIN_FLP_H #define SILK_MAIN_FLP_H -#include "SigProc_FLP.h" -#include "SigProc_FIX.h" -#include "structs_FLP.h" -#include "silk_main.h" -#include "define.h" -#include "debug.h" -#include "entenc.h" +#include "opus/silk/float/SigProc_FLP.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/float/structs_FLP.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/define.h" +#include "opus/silk/debug.h" +#include "opus/celt/entenc.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/float/noise_shape_analysis_FLP.c b/drivers/opus/silk/float/noise_shape_analysis_FLP.c index f80e0b3d0e..b0839ac989 100644 --- a/drivers/opus/silk/float/noise_shape_analysis_FLP.c +++ b/drivers/opus/silk/float/noise_shape_analysis_FLP.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/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/drivers/opus/silk/float/pitch_analysis_core_FLP.c b/drivers/opus/silk/float/pitch_analysis_core_FLP.c index 2588094c49..b7b90480f2 100644 --- a/drivers/opus/silk/float/pitch_analysis_core_FLP.c +++ b/drivers/opus/silk/float/pitch_analysis_core_FLP.c @@ -26,16 +26,16 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /***************************************************************************** * Pitch analyser function ******************************************************************************/ -#include "SigProc_FLP.h" -#include "SigProc_FIX.h" -#include "pitch_est_defines.h" -#include "pitch.h" +#include "opus/silk/float/SigProc_FLP.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/pitch_est_defines.h" +#include "opus/celt/pitch.h" #define SCRATCH_SIZE 22 diff --git a/drivers/opus/silk/float/prefilter_FLP.c b/drivers/opus/silk/float/prefilter_FLP.c index aa43852ff1..60fd220f60 100644 --- a/drivers/opus/silk/float/prefilter_FLP.c +++ b/drivers/opus/silk/float/prefilter_FLP.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /* * Prefilter for finding Quantizer input signal diff --git a/drivers/opus/silk/float/process_gains_FLP.c b/drivers/opus/silk/float/process_gains_FLP.c index e83d05552a..d181952aca 100644 --- a/drivers/opus/silk/float/process_gains_FLP.c +++ b/drivers/opus/silk/float/process_gains_FLP.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /* Processing of gains */ void silk_process_gains_FLP( diff --git a/drivers/opus/silk/float/regularize_correlations_FLP.c b/drivers/opus/silk/float/regularize_correlations_FLP.c index f056eadc57..147df0faf9 100644 --- a/drivers/opus/silk/float/regularize_correlations_FLP.c +++ b/drivers/opus/silk/float/regularize_correlations_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Add noise to matrix diagonal */ void silk_regularize_correlations_FLP( diff --git a/drivers/opus/silk/float/residual_energy_FLP.c b/drivers/opus/silk/float/residual_energy_FLP.c index 011efcef04..2c7dcf3b0d 100644 --- a/drivers/opus/silk/float/residual_energy_FLP.c +++ b/drivers/opus/silk/float/residual_energy_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #define MAX_ITERATIONS_RESIDUAL_NRG 10 #define REGULARIZATION_FACTOR 1e-8f diff --git a/drivers/opus/silk/float/scale_copy_vector_FLP.c b/drivers/opus/silk/float/scale_copy_vector_FLP.c index 7578d44894..a44ad74f32 100644 --- a/drivers/opus/silk/float/scale_copy_vector_FLP.c +++ b/drivers/opus/silk/float/scale_copy_vector_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* copy and multiply a vector by a constant */ void silk_scale_copy_vector_FLP( diff --git a/drivers/opus/silk/float/scale_vector_FLP.c b/drivers/opus/silk/float/scale_vector_FLP.c index 03345d519d..bee5777944 100644 --- a/drivers/opus/silk/float/scale_vector_FLP.c +++ b/drivers/opus/silk/float/scale_vector_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" /* multiply a vector by a constant */ void silk_scale_vector_FLP( diff --git a/drivers/opus/silk/float/schur_FLP.c b/drivers/opus/silk/float/schur_FLP.c index 76b87f1304..9a6482d003 100644 --- a/drivers/opus/silk/float/schur_FLP.c +++ b/drivers/opus/silk/float/schur_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FLP.h" +#include "opus/silk/float/SigProc_FLP.h" silk_float silk_schur_FLP( /* O returns residual energy */ silk_float refl_coef[], /* O reflection coefficients (length order) */ diff --git a/drivers/opus/silk/float/solve_LS_FLP.c b/drivers/opus/silk/float/solve_LS_FLP.c index 9fd962b33d..0ce3ba8cf6 100644 --- a/drivers/opus/silk/float/solve_LS_FLP.c +++ b/drivers/opus/silk/float/solve_LS_FLP.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" -#include "tuning_parameters.h" +#include "opus/silk/float/main_FLP.h" +#include "opus/silk/tuning_parameters.h" /********************************************************************** * LDL Factorisation. Finds the upper triangular matrix L and the diagonal diff --git a/drivers/opus/silk/float/sort_FLP.c b/drivers/opus/silk/float/sort_FLP.c index 58ea485116..c95d82bbf4 100644 --- a/drivers/opus/silk/float/sort_FLP.c +++ b/drivers/opus/silk/float/sort_FLP.c @@ -26,15 +26,15 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /* Insertion sort (fast for already almost sorted arrays): */ /* Best case: O(n) for an already sorted array */ /* Worst case: O(n^2) for an inversely sorted array */ -#include "typedef.h" -#include "SigProc_FLP.h" +#include "opus/silk/typedef.h" +#include "opus/silk/float/SigProc_FLP.h" void silk_insertion_sort_decreasing_FLP( silk_float *a, /* I/O Unsorted / Sorted vector */ diff --git a/drivers/opus/silk/float/structs_FLP.h b/drivers/opus/silk/float/structs_FLP.h index 4082914d93..798aec2f43 100644 --- a/drivers/opus/silk/float/structs_FLP.h +++ b/drivers/opus/silk/float/structs_FLP.h @@ -28,9 +28,9 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_STRUCTS_FLP_H #define SILK_STRUCTS_FLP_H -#include "typedef.h" -#include "silk_main.h" -#include "structs.h" +#include "opus/silk/typedef.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/structs.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/float/warped_autocorrelation_FLP.c b/drivers/opus/silk/float/warped_autocorrelation_FLP.c index 6075dfe8d3..aad6bf57dd 100644 --- a/drivers/opus/silk/float/warped_autocorrelation_FLP.c +++ b/drivers/opus/silk/float/warped_autocorrelation_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Autocorrelations for a warped frequency axis */ void silk_warped_autocorrelation_FLP( diff --git a/drivers/opus/silk/float/wrappers_FLP.c b/drivers/opus/silk/float/wrappers_FLP.c index c4e34e5578..f903e6363c 100644 --- a/drivers/opus/silk/float/wrappers_FLP.c +++ b/drivers/opus/silk/float/wrappers_FLP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" /* Wrappers. Calls flp / fix code */ diff --git a/drivers/opus/silk/gain_quant.c b/drivers/opus/silk/gain_quant.c index e9467198eb..9ff513423f 100644 --- a/drivers/opus/silk/gain_quant.c +++ b/drivers/opus/silk/gain_quant.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_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/drivers/opus/silk/init_decoder.c b/drivers/opus/silk/init_decoder.c index 88c1ff7b43..5a8620027a 100644 --- a/drivers/opus/silk/init_decoder.c +++ b/drivers/opus/silk/init_decoder.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /************************/ /* Init Decoder State */ diff --git a/drivers/opus/silk/init_encoder.c b/drivers/opus/silk/init_encoder.c index baf97d49e7..31a2374441 100644 --- a/drivers/opus/silk/init_encoder.c +++ b/drivers/opus/silk/init_encoder.c @@ -26,15 +26,15 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif #ifdef OPUS_FIXED_POINT -#include "main_FIX.h" +#include "opus/silk/fixed/main_FIX.h" #else -#include "main_FLP.h" +#include "opus/silk/float/main_FLP.h" #endif -#include "tuning_parameters.h" -#include "cpu_support.h" +#include "opus/silk/tuning_parameters.h" +#include "opus/celt/cpu_support.h" /*********************************/ /* Initialize Silk Encoder state */ diff --git a/drivers/opus/silk/inner_prod_aligned.c b/drivers/opus/silk/inner_prod_aligned.c index d625001db7..50c43f8155 100644 --- a/drivers/opus/silk/inner_prod_aligned.c +++ b/drivers/opus/silk/inner_prod_aligned.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" opus_int32 silk_inner_prod_aligned_scale( const opus_int16 *const inVec1, /* I input vector 1 */ diff --git a/drivers/opus/silk/interpolate.c b/drivers/opus/silk/interpolate.c index d5df0feddb..f1abd723bb 100644 --- a/drivers/opus/silk/interpolate.c +++ b/drivers/opus/silk/interpolate.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Interpolate two vectors */ void silk_interpolate( diff --git a/drivers/opus/silk/lin2log.c b/drivers/opus/silk/lin2log.c index 77bfc8c8ab..301859301b 100644 --- a/drivers/opus/silk/lin2log.c +++ b/drivers/opus/silk/lin2log.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Approximation of 128 * log2() (very close inverse of silk_log2lin()) */ /* Convert input to a log scale */ opus_int32 silk_lin2log( diff --git a/drivers/opus/silk/log2lin.c b/drivers/opus/silk/log2lin.c index 0ed2a12efd..a55f3c53f1 100644 --- a/drivers/opus/silk/log2lin.c +++ b/drivers/opus/silk/log2lin.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /* Approximation of 2^() (very close inverse of silk_lin2log()) */ /* Convert input to a linear scale */ diff --git a/drivers/opus/silk/macros.h b/drivers/opus/silk/macros.h index 6cf2e93dbc..8986dc8f82 100644 --- a/drivers/opus/silk/macros.h +++ b/drivers/opus/silk/macros.h @@ -28,10 +28,10 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MACROS_H #define SILK_MACROS_H -#include "opus_config.h" +#include "opus/opus_config.h" -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" /* This is an OPUS_INLINE header file for general platform. */ @@ -77,7 +77,7 @@ POSSIBILITY OF SUCH DAMAGE. (( (a) & ((b)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a)-(b)) : \ ((((a)^0x80000000) & (b) & 0x80000000) ? silk_int32_MAX : (a)-(b)) ) -#include "ecintrin.h" +#include "opus/celt/ecintrin.h" static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16) { diff --git a/drivers/opus/silk/pitch_est_defines.h b/drivers/opus/silk/pitch_est_defines.h index e1e4b5d768..e2d9e517c4 100644 --- a/drivers/opus/silk/pitch_est_defines.h +++ b/drivers/opus/silk/pitch_est_defines.h @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_PE_DEFINES_H #define SILK_PE_DEFINES_H -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" /********************************************************/ /* Definitions for pitch estimator */ diff --git a/drivers/opus/silk/pitch_est_tables.c b/drivers/opus/silk/pitch_est_tables.c index 97ddbab010..0625439afd 100644 --- a/drivers/opus/silk/pitch_est_tables.c +++ b/drivers/opus/silk/pitch_est_tables.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "typedef.h" -#include "pitch_est_defines.h" +#include "opus/silk/typedef.h" +#include "opus/silk/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/drivers/opus/silk/process_NLSFs.c b/drivers/opus/silk/process_NLSFs.c index 0193fda1f1..5a1d057cbd 100644 --- a/drivers/opus/silk/process_NLSFs.c +++ b/drivers/opus/silk/process_NLSFs.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Limit, stabilize, convert and quantize NLSFs */ void silk_process_NLSFs( diff --git a/drivers/opus/silk/quant_LTP_gains.c b/drivers/opus/silk/quant_LTP_gains.c index 34bcd3acdb..be12d4a6b8 100644 --- a/drivers/opus/silk/quant_LTP_gains.c +++ b/drivers/opus/silk/quant_LTP_gains.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "tuning_parameters.h" +#include "opus/silk/silk_main.h" +#include "opus/silk/tuning_parameters.h" void silk_quant_LTP_gains( opus_int16 B_Q14[ MAX_NB_SUBFR * LTP_ORDER ], /* I/O (un)quantized LTP gains */ diff --git a/drivers/opus/silk/resampler.c b/drivers/opus/silk/resampler.c index 14b185c45e..f01518af52 100644 --- a/drivers/opus/silk/resampler.c +++ b/drivers/opus/silk/resampler.c @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /* @@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE. * AF -> AR2 filter followed by FIR interpolation */ -#include "resampler_private.h" +#include "opus/silk/resampler_private.h" /* Tables with delay compensation values to equalize total delay for different modes */ static const opus_int8 delay_matrix_enc[ 5 ][ 3 ] = { diff --git a/drivers/opus/silk/resampler_down2.c b/drivers/opus/silk/resampler_down2.c index 5c4b27759a..2b14698cf8 100644 --- a/drivers/opus/silk/resampler_down2.c +++ b/drivers/opus/silk/resampler_down2.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_rom.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_rom.h" /* Downsample by a factor 2 */ void silk_resampler_down2( diff --git a/drivers/opus/silk/resampler_down2_3.c b/drivers/opus/silk/resampler_down2_3.c index 2733072fe6..2a29a6d6b3 100644 --- a/drivers/opus/silk/resampler_down2_3.c +++ b/drivers/opus/silk/resampler_down2_3.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" -#include "stack_alloc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_private.h" +#include "opus/celt/stack_alloc.h" #define ORDER_FIR 4 diff --git a/drivers/opus/silk/resampler_private.h b/drivers/opus/silk/resampler_private.h index 422a7d9d95..5c0ee110fc 100644 --- a/drivers/opus/silk/resampler_private.h +++ b/drivers/opus/silk/resampler_private.h @@ -32,9 +32,9 @@ POSSIBILITY OF SUCH DAMAGE. extern "C" { #endif -#include "SigProc_FIX.h" -#include "resampler_structs.h" -#include "resampler_rom.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_structs.h" +#include "opus/silk/resampler_rom.h" /* Number of input samples to process in the inner loop */ #define RESAMPLER_MAX_BATCH_SIZE_MS 10 diff --git a/drivers/opus/silk/resampler_private_AR2.c b/drivers/opus/silk/resampler_private_AR2.c index 84157d17ba..9372b4ac5c 100644 --- a/drivers/opus/silk/resampler_private_AR2.c +++ b/drivers/opus/silk/resampler_private_AR2.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_private.h" /* Second order AR filter with single delay elements */ void silk_resampler_private_AR2( diff --git a/drivers/opus/silk/resampler_private_IIR_FIR.c b/drivers/opus/silk/resampler_private_IIR_FIR.c index f45c3e7413..6d90314e52 100644 --- a/drivers/opus/silk/resampler_private_IIR_FIR.c +++ b/drivers/opus/silk/resampler_private_IIR_FIR.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" -#include "stack_alloc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_private.h" +#include "opus/celt/stack_alloc.h" static OPUS_INLINE opus_int16 *silk_resampler_private_IIR_FIR_INTERPOL( opus_int16 *out, diff --git a/drivers/opus/silk/resampler_private_down_FIR.c b/drivers/opus/silk/resampler_private_down_FIR.c index f4de303546..a6012e8f4f 100644 --- a/drivers/opus/silk/resampler_private_down_FIR.c +++ b/drivers/opus/silk/resampler_private_down_FIR.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" -#include "stack_alloc.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/resampler_private.h" +#include "opus/celt/stack_alloc.h" static OPUS_INLINE opus_int16 *silk_resampler_private_down_FIR_INTERPOL( opus_int16 *out, diff --git a/drivers/opus/silk/resampler_private_up2_HQ.c b/drivers/opus/silk/resampler_private_up2_HQ.c index 39f4818454..c1c65a0e57 100644 --- a/drivers/opus/silk/resampler_private_up2_HQ.c +++ b/drivers/opus/silk/resampler_private_up2_HQ.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" -#include "resampler_private.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/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/drivers/opus/silk/resampler_rom.c b/drivers/opus/silk/resampler_rom.c index 0098e18ba8..f46264f8bc 100644 --- a/drivers/opus/silk/resampler_rom.c +++ b/drivers/opus/silk/resampler_rom.c @@ -26,13 +26,13 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /* Filter coefficients for IIR/FIR polyphase resampling * * Total size: 179 Words (358 Bytes) */ -#include "resampler_private.h" +#include "opus/silk/resampler_private.h" /* Matlab code for the notch filter coefficients: */ /* B = [1, 0.147, 1]; A = [1, 0.107, 0.89]; G = 0.93; freqz(G * B, A, 2^14, 16e3); axis([0, 8000, -10, 1]) */ diff --git a/drivers/opus/silk/resampler_rom.h b/drivers/opus/silk/resampler_rom.h index 490b3388dc..2fa586ebf2 100644 --- a/drivers/opus/silk/resampler_rom.h +++ b/drivers/opus/silk/resampler_rom.h @@ -33,8 +33,8 @@ extern "C" { #endif -#include "typedef.h" -#include "resampler_structs.h" +#include "opus/silk/typedef.h" +#include "opus/silk/resampler_structs.h" #define RESAMPLER_DOWN_ORDER_FIR0 18 #define RESAMPLER_DOWN_ORDER_FIR1 24 diff --git a/drivers/opus/silk/shell_coder.c b/drivers/opus/silk/shell_coder.c index 79e392bd98..d4c9544409 100644 --- a/drivers/opus/silk/shell_coder.c +++ b/drivers/opus/silk/shell_coder.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* shell coder; pulse-subframe length is hardcoded */ diff --git a/drivers/opus/silk/sigm_Q15.c b/drivers/opus/silk/sigm_Q15.c index 2df5b9695c..deff375445 100644 --- a/drivers/opus/silk/sigm_Q15.c +++ b/drivers/opus/silk/sigm_Q15.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /* Approximate sigmoid function */ -#include "SigProc_FIX.h" +#include "opus/silk/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/drivers/opus/silk/silk_main.h b/drivers/opus/silk/silk_main.h index 2bdf89784d..14671dcf72 100644 --- a/drivers/opus/silk/silk_main.h +++ b/drivers/opus/silk/silk_main.h @@ -28,15 +28,15 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_MAIN_H #define SILK_MAIN_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" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/define.h" +#include "opus/silk/structs.h" +#include "opus/silk/tables.h" +#include "opus/silk/PLC.h" +#include "opus/silk/control.h" +#include "opus/silk/debug.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" /* Convert Left/Right stereo signal to adaptive Mid/Side representation */ void silk_stereo_LR_to_MS( diff --git a/drivers/opus/silk/sort.c b/drivers/opus/silk/sort.c index 5e9ba08616..1b2cac4289 100644 --- a/drivers/opus/silk/sort.c +++ b/drivers/opus/silk/sort.c @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif /* Insertion sort (fast for already almost sorted arrays): */ @@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE. /* */ /* Shell short: http://en.wikipedia.org/wiki/Shell_sort */ -#include "SigProc_FIX.h" +#include "opus/silk/SigProc_FIX.h" void silk_insertion_sort_increasing( opus_int32 *a, /* I/O Unsorted / Sorted vector */ diff --git a/drivers/opus/silk/stereo_LR_to_MS.c b/drivers/opus/silk/stereo_LR_to_MS.c index 678f46984b..4bd6460b4a 100644 --- a/drivers/opus/silk/stereo_LR_to_MS.c +++ b/drivers/opus/silk/stereo_LR_to_MS.c @@ -26,11 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" -#include "stack_alloc.h" +#include "opus/silk/silk_main.h" +#include "opus/celt/stack_alloc.h" /* Convert Left/Right stereo signal to adaptive Mid/Side representation */ void silk_stereo_LR_to_MS( diff --git a/drivers/opus/silk/stereo_MS_to_LR.c b/drivers/opus/silk/stereo_MS_to_LR.c index 34f43cf795..beec3850fc 100644 --- a/drivers/opus/silk/stereo_MS_to_LR.c +++ b/drivers/opus/silk/stereo_MS_to_LR.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Convert adaptive Mid/Side representation to Left/Right stereo signal */ void silk_stereo_MS_to_LR( diff --git a/drivers/opus/silk/stereo_decode_pred.c b/drivers/opus/silk/stereo_decode_pred.c index 56d94e56fe..876044ed8d 100644 --- a/drivers/opus/silk/stereo_decode_pred.c +++ b/drivers/opus/silk/stereo_decode_pred.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Decode mid/side predictors */ void silk_stereo_decode_pred( diff --git a/drivers/opus/silk/stereo_encode_pred.c b/drivers/opus/silk/stereo_encode_pred.c index bfe75b08e4..8b13fab2ae 100644 --- a/drivers/opus/silk/stereo_encode_pred.c +++ b/drivers/opus/silk/stereo_encode_pred.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Entropy code the mid/side quantization indices */ void silk_stereo_encode_pred( diff --git a/drivers/opus/silk/stereo_find_predictor.c b/drivers/opus/silk/stereo_find_predictor.c index 266293dff3..3758e31b83 100644 --- a/drivers/opus/silk/stereo_find_predictor.c +++ b/drivers/opus/silk/stereo_find_predictor.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_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/drivers/opus/silk/stereo_quant_pred.c b/drivers/opus/silk/stereo_quant_pred.c index 834020d715..77ac9b1742 100644 --- a/drivers/opus/silk/stereo_quant_pred.c +++ b/drivers/opus/silk/stereo_quant_pred.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "silk_main.h" +#include "opus/silk/silk_main.h" /* Quantize mid/side predictors */ void silk_stereo_quant_pred( diff --git a/drivers/opus/silk/structs.h b/drivers/opus/silk/structs.h index 1826b36a80..c8c5dae844 100644 --- a/drivers/opus/silk/structs.h +++ b/drivers/opus/silk/structs.h @@ -28,11 +28,11 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_STRUCTS_H #define SILK_STRUCTS_H -#include "typedef.h" -#include "SigProc_FIX.h" -#include "define.h" -#include "entenc.h" -#include "entdec.h" +#include "opus/silk/typedef.h" +#include "opus/silk/SigProc_FIX.h" +#include "opus/silk/define.h" +#include "opus/celt/entenc.h" +#include "opus/celt/entdec.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/sum_sqr_shift.c b/drivers/opus/silk/sum_sqr_shift.c index 8ec27f8a03..0d3404715f 100644 --- a/drivers/opus/silk/sum_sqr_shift.c +++ b/drivers/opus/silk/sum_sqr_shift.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "SigProc_FIX.h" +#include "opus/silk/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/drivers/opus/silk/table_LSF_cos.c b/drivers/opus/silk/table_LSF_cos.c index 674b6a03e6..7c4c85e4c9 100644 --- a/drivers/opus/silk/table_LSF_cos.c +++ b/drivers/opus/silk/table_LSF_cos.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" /* Cosine approximation table for LSF conversion */ /* Q12 values (even) */ diff --git a/drivers/opus/silk/tables.h b/drivers/opus/silk/tables.h index a91431e854..0dc7c37545 100644 --- a/drivers/opus/silk/tables.h +++ b/drivers/opus/silk/tables.h @@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_TABLES_H #define SILK_TABLES_H -#include "define.h" -#include "structs.h" +#include "opus/silk/define.h" +#include "opus/silk/structs.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/tables_LTP.c b/drivers/opus/silk/tables_LTP.c index 56b672db8b..d03e70d7e6 100644 --- a/drivers/opus/silk/tables_LTP.c +++ b/drivers/opus/silk/tables_LTP.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" const opus_uint8 silk_LTP_per_index_iCDF[3] = { 179, 99, 0 diff --git a/drivers/opus/silk/tables_NLSF_CB_NB_MB.c b/drivers/opus/silk/tables_NLSF_CB_NB_MB.c index ded35eee74..db551cc20f 100644 --- a/drivers/opus/silk/tables_NLSF_CB_NB_MB.c +++ b/drivers/opus/silk/tables_NLSF_CB_NB_MB.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" static const opus_uint8 silk_NLSF_CB1_NB_MB_Q8[ 320 ] = { 12, 35, 60, 83, 108, 132, 157, 180, diff --git a/drivers/opus/silk/tables_NLSF_CB_WB.c b/drivers/opus/silk/tables_NLSF_CB_WB.c index d83567ea6f..4988f83c7c 100644 --- a/drivers/opus/silk/tables_NLSF_CB_WB.c +++ b/drivers/opus/silk/tables_NLSF_CB_WB.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" static const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = { 7, 23, 38, 54, 69, 85, 100, 116, diff --git a/drivers/opus/silk/tables_gain.c b/drivers/opus/silk/tables_gain.c index 6df980616b..c063cf0b6a 100644 --- a/drivers/opus/silk/tables_gain.c +++ b/drivers/opus/silk/tables_gain.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/tables_other.c b/drivers/opus/silk/tables_other.c index 246e960fa4..a896d6f887 100644 --- a/drivers/opus/silk/tables_other.c +++ b/drivers/opus/silk/tables_other.c @@ -26,12 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "structs.h" -#include "define.h" -#include "tables.h" +#include "opus/silk/structs.h" +#include "opus/silk/define.h" +#include "opus/silk/tables.h" #ifdef __cplusplus extern "C" diff --git a/drivers/opus/silk/tables_pitch_lag.c b/drivers/opus/silk/tables_pitch_lag.c index 0af5c5ace7..64ef060692 100644 --- a/drivers/opus/silk/tables_pitch_lag.c +++ b/drivers/opus/silk/tables_pitch_lag.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/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/drivers/opus/silk/tables_pulses_per_block.c b/drivers/opus/silk/tables_pulses_per_block.c index 05ba2318f8..949fd3f23a 100644 --- a/drivers/opus/silk/tables_pulses_per_block.c +++ b/drivers/opus/silk/tables_pulses_per_block.c @@ -26,10 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#include "opus/opus_config.h" #endif -#include "tables.h" +#include "opus/silk/tables.h" const opus_uint8 silk_max_pulses_table[ 4 ] = { 8, 10, 12, 16 diff --git a/drivers/opus/silk/typedef.h b/drivers/opus/silk/typedef.h index ca2361bc82..3e193b4a45 100644 --- a/drivers/opus/silk/typedef.h +++ b/drivers/opus/silk/typedef.h @@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_TYPEDEF_H #define SILK_TYPEDEF_H -#include "opus_types.h" -#include "opus_defines.h" +#include "opus/opus_types.h" +#include "opus/opus_defines.h" #ifndef OPUS_FIXED_POINT # include -- cgit v1.2.3