diff --git a/common_audio/signal_processing/splitting_filter.c b/common_audio/signal_processing/splitting_filter.c index 399433f0fb..b0d83f1388 100644 --- a/common_audio/signal_processing/splitting_filter.c +++ b/common_audio/signal_processing/splitting_filter.c @@ -44,9 +44,11 @@ static const uint16_t WebRtcSpl_kAllPassFilter2[3] = {21333, 49062, 63010}; // |data_length| // -void WebRtcSpl_AllPassQMF(int32_t* in_data, size_t data_length, - int32_t* out_data, const uint16_t* filter_coefficients, - int32_t* filter_state) +static void WebRtcSpl_AllPassQMF(int32_t* in_data, + size_t data_length, + int32_t* out_data, + const uint16_t* filter_coefficients, + int32_t* filter_state) { // The procedure is to filter the input with three first order all pass filters // (cascade operations). diff --git a/modules/audio_coding/codecs/ilbc/abs_quant.c b/modules/audio_coding/codecs/ilbc/abs_quant.c index 308902f574..77da78ba7f 100644 --- a/modules/audio_coding/codecs/ilbc/abs_quant.c +++ b/modules/audio_coding/codecs/ilbc/abs_quant.c @@ -16,9 +16,11 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/abs_quant.h" + #include "modules/audio_coding/codecs/ilbc/abs_quant_loop.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/abs_quant.h b/modules/audio_coding/codecs/ilbc/abs_quant.h index 331921cc63..c72e29cf29 100644 --- a/modules/audio_coding/codecs/ilbc/abs_quant.h +++ b/modules/audio_coding/codecs/ilbc/abs_quant.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_H_ +#include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/abs_quant_loop.c b/modules/audio_coding/codecs/ilbc/abs_quant_loop.c index 2d8a9980eb..cf9266299d 100644 --- a/modules/audio_coding/codecs/ilbc/abs_quant_loop.c +++ b/modules/audio_coding/codecs/ilbc/abs_quant_loop.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/abs_quant_loop.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/sort_sq.h" void WebRtcIlbcfix_AbsQuantLoop(int16_t *syntOutIN, int16_t *in_weightedIN, diff --git a/modules/audio_coding/codecs/ilbc/abs_quant_loop.h b/modules/audio_coding/codecs/ilbc/abs_quant_loop.h index a193a07cda..841d73b9fb 100644 --- a/modules/audio_coding/codecs/ilbc/abs_quant_loop.h +++ b/modules/audio_coding/codecs/ilbc/abs_quant_loop.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_LOOP_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ABS_QUANT_LOOP_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * predictive noise shaping encoding of scaled start state diff --git a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h index d73ef0da59..c2d62ed2d1 100644 --- a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h +++ b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h @@ -13,6 +13,7 @@ #include #include + #include #include "api/audio_codecs/audio_decoder.h" diff --git a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h index fe3e32980e..05a900e3c4 100644 --- a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h +++ b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h @@ -11,6 +11,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ +#include +#include + #include #include "absl/types/optional.h" diff --git a/modules/audio_coding/codecs/ilbc/augmented_cb_corr.c b/modules/audio_coding/codecs/ilbc/augmented_cb_corr.c index 77b0f7f733..c915a2f9f0 100644 --- a/modules/audio_coding/codecs/ilbc/augmented_cb_corr.c +++ b/modules/audio_coding/codecs/ilbc/augmented_cb_corr.c @@ -16,10 +16,11 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" #include "modules/audio_coding/codecs/ilbc/augmented_cb_corr.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" + void WebRtcIlbcfix_AugmentedCbCorr( int16_t *target, /* (i) Target vector */ int16_t *buffer, /* (i) Memory buffer */ diff --git a/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h b/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h index 646e5649b9..2e9612e51a 100644 --- a/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h +++ b/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_AUGMENTED_CB_CORR_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_AUGMENTED_CB_CORR_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * Calculate correlation between target and Augmented codebooks diff --git a/modules/audio_coding/codecs/ilbc/bw_expand.c b/modules/audio_coding/codecs/ilbc/bw_expand.c index 566af7dd33..1a9b882adf 100644 --- a/modules/audio_coding/codecs/ilbc/bw_expand.c +++ b/modules/audio_coding/codecs/ilbc/bw_expand.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/bw_expand.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/bw_expand.h b/modules/audio_coding/codecs/ilbc/bw_expand.h index d25325c7f2..ff9b0b302e 100644 --- a/modules/audio_coding/codecs/ilbc/bw_expand.h +++ b/modules/audio_coding/codecs/ilbc/bw_expand.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_BW_EXPAND_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_BW_EXPAND_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * lpc bandwidth expansion diff --git a/modules/audio_coding/codecs/ilbc/cb_construct.h b/modules/audio_coding/codecs/ilbc/cb_construct.h index f4df38728c..0a4a47aa06 100644 --- a/modules/audio_coding/codecs/ilbc/cb_construct.h +++ b/modules/audio_coding/codecs/ilbc/cb_construct.h @@ -20,6 +20,7 @@ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_CONSTRUCT_H_ #include +#include #include #include "modules/audio_coding/codecs/ilbc/defines.h" diff --git a/modules/audio_coding/codecs/ilbc/cb_mem_energy.c b/modules/audio_coding/codecs/ilbc/cb_mem_energy.c index 9304a91680..21e4197607 100644 --- a/modules/audio_coding/codecs/ilbc/cb_mem_energy.c +++ b/modules/audio_coding/codecs/ilbc/cb_mem_energy.c @@ -16,9 +16,11 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/cb_mem_energy.h" + #include "modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * Function WebRtcIlbcfix_CbMemEnergy computes the energy of all diff --git a/modules/audio_coding/codecs/ilbc/cb_mem_energy.h b/modules/audio_coding/codecs/ilbc/cb_mem_energy.h index 894f5d051c..17ec337dc6 100644 --- a/modules/audio_coding/codecs/ilbc/cb_mem_energy.h +++ b/modules/audio_coding/codecs/ilbc/cb_mem_energy.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_H_ +#include +#include + void WebRtcIlbcfix_CbMemEnergy( size_t range, int16_t* CB, /* (i) The CB memory (1:st section) */ diff --git a/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c b/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c index df9ff45be9..0619bbe422 100644 --- a/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c +++ b/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" void WebRtcIlbcfix_CbMemEnergyAugmentation( int16_t *interpSamples, /* (i) The interpolated samples */ diff --git a/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h b/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h index b7b972f911..d7b7a0d97e 100644 --- a/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h +++ b/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_AUGMENTATION_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_AUGMENTATION_H_ +#include +#include + void WebRtcIlbcfix_CbMemEnergyAugmentation( int16_t* interpSamples, /* (i) The interpolated samples */ int16_t* CBmem, /* (i) The CB memory */ diff --git a/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c b/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c index 35d3ce4bc0..58c0c5fe6d 100644 --- a/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c +++ b/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /* Compute the energy of the rest of the cb memory diff --git a/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h b/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h index 5511ef1f3f..1d1e8d62b9 100644 --- a/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h +++ b/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_CALC_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_MEM_ENERGY_CALC_H_ +#include +#include + void WebRtcIlbcfix_CbMemEnergyCalc( int32_t energy, /* (i) input start energy */ size_t range, /* (i) number of iterations */ diff --git a/modules/audio_coding/codecs/ilbc/cb_search.c b/modules/audio_coding/codecs/ilbc/cb_search.c index 88b2f01f99..24b5292354 100644 --- a/modules/audio_coding/codecs/ilbc/cb_search.c +++ b/modules/audio_coding/codecs/ilbc/cb_search.c @@ -16,18 +16,20 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/gain_quant.h" -#include "modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/cb_search.h" + +#include "modules/audio_coding/codecs/ilbc/augmented_cb_corr.h" #include "modules/audio_coding/codecs/ilbc/cb_mem_energy.h" -#include "modules/audio_coding/codecs/ilbc/interpolate_samples.h" #include "modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h" #include "modules/audio_coding/codecs/ilbc/cb_search_core.h" -#include "modules/audio_coding/codecs/ilbc/energy_inverse.h" -#include "modules/audio_coding/codecs/ilbc/augmented_cb_corr.h" #include "modules/audio_coding/codecs/ilbc/cb_update_best_index.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" #include "modules/audio_coding/codecs/ilbc/create_augmented_vec.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/energy_inverse.h" +#include "modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h" +#include "modules/audio_coding/codecs/ilbc/gain_quant.h" +#include "modules/audio_coding/codecs/ilbc/interpolate_samples.h" /*----------------------------------------------------------------* * Search routine for codebook encoding and gain quantization. diff --git a/modules/audio_coding/codecs/ilbc/cb_search.h b/modules/audio_coding/codecs/ilbc/cb_search.h index 393a2de126..84a52c7868 100644 --- a/modules/audio_coding/codecs/ilbc/cb_search.h +++ b/modules/audio_coding/codecs/ilbc/cb_search.h @@ -19,6 +19,11 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_H_ +#include +#include + +#include "modules/audio_coding/codecs/ilbc/defines.h" + void WebRtcIlbcfix_CbSearch( IlbcEncoder* iLBCenc_inst, /* (i) the encoder state structure */ diff --git a/modules/audio_coding/codecs/ilbc/cb_search_core.c b/modules/audio_coding/codecs/ilbc/cb_search_core.c index 09d26d35d9..a75e5b0ab8 100644 --- a/modules/audio_coding/codecs/ilbc/cb_search_core.c +++ b/modules/audio_coding/codecs/ilbc/cb_search_core.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/cb_search_core.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" void WebRtcIlbcfix_CbSearchCore( int32_t *cDot, /* (i) Cross Correlation */ diff --git a/modules/audio_coding/codecs/ilbc/cb_search_core.h b/modules/audio_coding/codecs/ilbc/cb_search_core.h index af5a1db5e0..5da70e0988 100644 --- a/modules/audio_coding/codecs/ilbc/cb_search_core.h +++ b/modules/audio_coding/codecs/ilbc/cb_search_core.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_CORE_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_SEARCH_CORE_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include void WebRtcIlbcfix_CbSearchCore( int32_t* cDot, /* (i) Cross Correlation */ diff --git a/modules/audio_coding/codecs/ilbc/cb_update_best_index.c b/modules/audio_coding/codecs/ilbc/cb_update_best_index.c index ed20c468e4..d6fa4d93d4 100644 --- a/modules/audio_coding/codecs/ilbc/cb_update_best_index.c +++ b/modules/audio_coding/codecs/ilbc/cb_update_best_index.c @@ -16,9 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/cb_update_best_index.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" void WebRtcIlbcfix_CbUpdateBestIndex( int32_t CritNew, /* (i) New Potentially best Criteria */ diff --git a/modules/audio_coding/codecs/ilbc/cb_update_best_index.h b/modules/audio_coding/codecs/ilbc/cb_update_best_index.h index 3f57d4845f..1a95d531e9 100644 --- a/modules/audio_coding/codecs/ilbc/cb_update_best_index.h +++ b/modules/audio_coding/codecs/ilbc/cb_update_best_index.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_UPDATE_BEST_INDEX_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_UPDATE_BEST_INDEX_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include void WebRtcIlbcfix_CbUpdateBestIndex( int32_t CritNew, /* (i) New Potentially best Criteria */ diff --git a/modules/audio_coding/codecs/ilbc/chebyshev.c b/modules/audio_coding/codecs/ilbc/chebyshev.c index 38a3069d9e..b4eee66219 100644 --- a/modules/audio_coding/codecs/ilbc/chebyshev.c +++ b/modules/audio_coding/codecs/ilbc/chebyshev.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/chebyshev.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*------------------------------------------------------------------* * Calculate the Chevyshev polynomial series diff --git a/modules/audio_coding/codecs/ilbc/chebyshev.h b/modules/audio_coding/codecs/ilbc/chebyshev.h index 64b2f49079..7e7742c5cc 100644 --- a/modules/audio_coding/codecs/ilbc/chebyshev.h +++ b/modules/audio_coding/codecs/ilbc/chebyshev.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CHEBYSHEV_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CHEBYSHEV_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*------------------------------------------------------------------* * Calculate the Chevyshev polynomial series diff --git a/modules/audio_coding/codecs/ilbc/comp_corr.c b/modules/audio_coding/codecs/ilbc/comp_corr.c index b43f2fc10f..452bc78e3b 100644 --- a/modules/audio_coding/codecs/ilbc/comp_corr.c +++ b/modules/audio_coding/codecs/ilbc/comp_corr.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/comp_corr.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/comp_corr.h b/modules/audio_coding/codecs/ilbc/comp_corr.h index 1e6b296eab..010c6a1ce5 100644 --- a/modules/audio_coding/codecs/ilbc/comp_corr.h +++ b/modules/audio_coding/codecs/ilbc/comp_corr.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_COMP_CORR_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_COMP_CORR_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * Compute cross correlation and pitch gain for pitch prediction diff --git a/modules/audio_coding/codecs/ilbc/constants.c b/modules/audio_coding/codecs/ilbc/constants.c index 8efa6aea9c..22f2acb330 100644 --- a/modules/audio_coding/codecs/ilbc/constants.c +++ b/modules/audio_coding/codecs/ilbc/constants.c @@ -16,9 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" + /* HP Filters {b[0] b[1] b[2] -a[1] -a[2]} */ const int16_t WebRtcIlbcfix_kHpInCoefs[5] = {3798, -7596, 3798, 7807, -3733}; diff --git a/modules/audio_coding/codecs/ilbc/constants.h b/modules/audio_coding/codecs/ilbc/constants.h index 07369a39e0..a8645c00db 100644 --- a/modules/audio_coding/codecs/ilbc/constants.h +++ b/modules/audio_coding/codecs/ilbc/constants.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_ +#include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /* high pass filters */ diff --git a/modules/audio_coding/codecs/ilbc/create_augmented_vec.c b/modules/audio_coding/codecs/ilbc/create_augmented_vec.c index 6a4d058eb7..8033c959b5 100644 --- a/modules/audio_coding/codecs/ilbc/create_augmented_vec.c +++ b/modules/audio_coding/codecs/ilbc/create_augmented_vec.c @@ -16,10 +16,12 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" -#include "rtc_base/sanitizer.h" +#include "modules/audio_coding/codecs/ilbc/create_augmented_vec.h" + #include "common_audio/signal_processing/include/signal_processing_library.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "rtc_base/sanitizer.h" /*----------------------------------------------------------------* * Recreate a specific codebook vector from the augmented part. diff --git a/modules/audio_coding/codecs/ilbc/create_augmented_vec.h b/modules/audio_coding/codecs/ilbc/create_augmented_vec.h index 28c940006e..d7e5be1c2f 100644 --- a/modules/audio_coding/codecs/ilbc/create_augmented_vec.h +++ b/modules/audio_coding/codecs/ilbc/create_augmented_vec.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CREATE_AUGMENTED_VEC_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CREATE_AUGMENTED_VEC_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * Recreate a specific codebook vector from the augmented part. diff --git a/modules/audio_coding/codecs/ilbc/decode.c b/modules/audio_coding/codecs/ilbc/decode.c index 3848bc7d7b..d7621d5b65 100644 --- a/modules/audio_coding/codecs/ilbc/decode.c +++ b/modules/audio_coding/codecs/ilbc/decode.c @@ -16,22 +16,23 @@ ******************************************************************/ -// Defines WEBRTC_ARCH_BIG_ENDIAN, used below. +#include "modules/audio_coding/codecs/ilbc/decode.h" + +#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/decode_residual.h" +#include "modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/do_plc.h" +#include "modules/audio_coding/codecs/ilbc/enhancer_interface.h" +#include "modules/audio_coding/codecs/ilbc/hp_output.h" +#include "modules/audio_coding/codecs/ilbc/index_conv_dec.h" +#include "modules/audio_coding/codecs/ilbc/init_decode.h" +#include "modules/audio_coding/codecs/ilbc/lsf_check.h" +#include "modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h" +#include "modules/audio_coding/codecs/ilbc/unpack_bits.h" +#include "modules/audio_coding/codecs/ilbc/xcorr_coef.h" #include "rtc_base/system/arch.h" -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h" -#include "modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h" -#include "modules/audio_coding/codecs/ilbc/index_conv_dec.h" -#include "modules/audio_coding/codecs/ilbc/do_plc.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" -#include "modules/audio_coding/codecs/ilbc/enhancer_interface.h" -#include "modules/audio_coding/codecs/ilbc/xcorr_coef.h" -#include "modules/audio_coding/codecs/ilbc/lsf_check.h" -#include "modules/audio_coding/codecs/ilbc/decode_residual.h" -#include "modules/audio_coding/codecs/ilbc/unpack_bits.h" -#include "modules/audio_coding/codecs/ilbc/hp_output.h" -#include "modules/audio_coding/codecs/ilbc/init_decode.h" #ifndef WEBRTC_ARCH_BIG_ENDIAN #include "modules/audio_coding/codecs/ilbc/swap_bytes.h" #endif diff --git a/modules/audio_coding/codecs/ilbc/decode_residual.c b/modules/audio_coding/codecs/ilbc/decode_residual.c index 3c113aeb25..a9668e2889 100644 --- a/modules/audio_coding/codecs/ilbc/decode_residual.c +++ b/modules/audio_coding/codecs/ilbc/decode_residual.c @@ -20,15 +20,15 @@ #include -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/state_construct.h" #include "modules/audio_coding/codecs/ilbc/cb_construct.h" -#include "modules/audio_coding/codecs/ilbc/index_conv_dec.h" -#include "modules/audio_coding/codecs/ilbc/do_plc.h" #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/do_plc.h" #include "modules/audio_coding/codecs/ilbc/enhancer_interface.h" -#include "modules/audio_coding/codecs/ilbc/xcorr_coef.h" +#include "modules/audio_coding/codecs/ilbc/index_conv_dec.h" #include "modules/audio_coding/codecs/ilbc/lsf_check.h" +#include "modules/audio_coding/codecs/ilbc/state_construct.h" +#include "modules/audio_coding/codecs/ilbc/xcorr_coef.h" /*----------------------------------------------------------------* * frame residual decoder function (subrutine to iLBC_decode) diff --git a/modules/audio_coding/codecs/ilbc/decode_residual.h b/modules/audio_coding/codecs/ilbc/decode_residual.h index d54aada29a..30eb35f82b 100644 --- a/modules/audio_coding/codecs/ilbc/decode_residual.h +++ b/modules/audio_coding/codecs/ilbc/decode_residual.h @@ -20,6 +20,7 @@ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_RESIDUAL_H_ #include +#include #include #include "modules/audio_coding/codecs/ilbc/defines.h" diff --git a/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c b/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c index 8413a73766..d96bb9b2e9 100644 --- a/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c +++ b/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c @@ -16,10 +16,12 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h" +#include "modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h" + #include "modules/audio_coding/codecs/ilbc/bw_expand.h" -#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h" /*----------------------------------------------------------------* * obtain synthesis and weighting filters form lsf coefficients diff --git a/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h b/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h index 48d43ec2fa..8b08114467 100644 --- a/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h +++ b/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODER_INTERPOLATE_LSF_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODER_INTERPOLATE_LSF_H_ +#include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/defines.h b/modules/audio_coding/codecs/ilbc/defines.h index 43948a20c2..64135c4887 100644 --- a/modules/audio_coding/codecs/ilbc/defines.h +++ b/modules/audio_coding/codecs/ilbc/defines.h @@ -18,6 +18,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_ +#include #include #include "common_audio/signal_processing/include/signal_processing_library.h" diff --git a/modules/audio_coding/codecs/ilbc/do_plc.c b/modules/audio_coding/codecs/ilbc/do_plc.c index 26ec03f80b..9ca6ca48e9 100644 --- a/modules/audio_coding/codecs/ilbc/do_plc.c +++ b/modules/audio_coding/codecs/ilbc/do_plc.c @@ -16,10 +16,12 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" -#include "modules/audio_coding/codecs/ilbc/comp_corr.h" +#include "modules/audio_coding/codecs/ilbc/do_plc.h" + #include "modules/audio_coding/codecs/ilbc/bw_expand.h" +#include "modules/audio_coding/codecs/ilbc/comp_corr.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * Packet loss concealment routine. Conceals a residual signal diff --git a/modules/audio_coding/codecs/ilbc/do_plc.h b/modules/audio_coding/codecs/ilbc/do_plc.h index 2fbae1de83..c19c4eca32 100644 --- a/modules/audio_coding/codecs/ilbc/do_plc.h +++ b/modules/audio_coding/codecs/ilbc/do_plc.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DO_PLC_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DO_PLC_H_ +#include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/encode.c b/modules/audio_coding/codecs/ilbc/encode.c index 912e23ca8b..8e536221cd 100644 --- a/modules/audio_coding/codecs/ilbc/encode.c +++ b/modules/audio_coding/codecs/ilbc/encode.c @@ -16,28 +16,29 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/encode.h" + #include -// Defines WEBRTC_ARCH_BIG_ENDIAN, used below. -#include "rtc_base/system/arch.h" - -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/lpc_encode.h" -#include "modules/audio_coding/codecs/ilbc/frame_classify.h" -#include "modules/audio_coding/codecs/ilbc/state_search.h" -#include "modules/audio_coding/codecs/ilbc/state_construct.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" -#include "modules/audio_coding/codecs/ilbc/cb_search.h" #include "modules/audio_coding/codecs/ilbc/cb_construct.h" -#include "modules/audio_coding/codecs/ilbc/index_conv_enc.h" -#include "modules/audio_coding/codecs/ilbc/pack_bits.h" +#include "modules/audio_coding/codecs/ilbc/cb_search.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/frame_classify.h" #include "modules/audio_coding/codecs/ilbc/hp_input.h" +#include "modules/audio_coding/codecs/ilbc/index_conv_enc.h" +#include "modules/audio_coding/codecs/ilbc/lpc_encode.h" +#include "modules/audio_coding/codecs/ilbc/pack_bits.h" +#include "modules/audio_coding/codecs/ilbc/state_construct.h" +#include "modules/audio_coding/codecs/ilbc/state_search.h" #include "rtc_base/checks.h" +#include "rtc_base/system/arch.h" #ifdef SPLIT_10MS #include "modules/audio_coding/codecs/ilbc/unpack_bits.h" #include "modules/audio_coding/codecs/ilbc/index_conv_dec.h" #endif + #ifndef WEBRTC_ARCH_BIG_ENDIAN #include "modules/audio_coding/codecs/ilbc/swap_bytes.h" #endif diff --git a/modules/audio_coding/codecs/ilbc/encode.h b/modules/audio_coding/codecs/ilbc/encode.h index db00e2c46e..bc3e187d92 100644 --- a/modules/audio_coding/codecs/ilbc/encode.h +++ b/modules/audio_coding/codecs/ilbc/encode.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENCODE_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENCODE_H_ +#include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/energy_inverse.h b/modules/audio_coding/codecs/ilbc/energy_inverse.h index 359a9e2012..15391cf230 100644 --- a/modules/audio_coding/codecs/ilbc/energy_inverse.h +++ b/modules/audio_coding/codecs/ilbc/energy_inverse.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENERGY_INVERSE_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENERGY_INVERSE_H_ +#include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /* Inverses the in vector in into Q29 domain */ diff --git a/modules/audio_coding/codecs/ilbc/enh_upsample.c b/modules/audio_coding/codecs/ilbc/enh_upsample.c index 0a5f044dbc..cd3d0a4db1 100644 --- a/modules/audio_coding/codecs/ilbc/enh_upsample.c +++ b/modules/audio_coding/codecs/ilbc/enh_upsample.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/enh_upsample.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * upsample finite array assuming zeros outside bounds diff --git a/modules/audio_coding/codecs/ilbc/enhancer.c b/modules/audio_coding/codecs/ilbc/enhancer.c index d5cd977ea0..bd4e60015c 100644 --- a/modules/audio_coding/codecs/ilbc/enhancer.c +++ b/modules/audio_coding/codecs/ilbc/enhancer.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/enhancer.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/get_sync_seq.h" #include "modules/audio_coding/codecs/ilbc/smooth.h" diff --git a/modules/audio_coding/codecs/ilbc/enhancer.h b/modules/audio_coding/codecs/ilbc/enhancer.h index 1a6131b91a..386949347a 100644 --- a/modules/audio_coding/codecs/ilbc/enhancer.h +++ b/modules/audio_coding/codecs/ilbc/enhancer.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * perform enhancement on idata+centerStartPos through diff --git a/modules/audio_coding/codecs/ilbc/enhancer_interface.c b/modules/audio_coding/codecs/ilbc/enhancer_interface.c index 74dfebb47d..55a4105561 100644 --- a/modules/audio_coding/codecs/ilbc/enhancer_interface.c +++ b/modules/audio_coding/codecs/ilbc/enhancer_interface.c @@ -16,13 +16,15 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/enhancer_interface.h" + #include -#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/constants.h" -#include "modules/audio_coding/codecs/ilbc/xcorr_coef.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/enhancer.h" #include "modules/audio_coding/codecs/ilbc/hp_output.h" +#include "modules/audio_coding/codecs/ilbc/xcorr_coef.h" diff --git a/modules/audio_coding/codecs/ilbc/enhancer_interface.h b/modules/audio_coding/codecs/ilbc/enhancer_interface.h index de4571514f..5022a47c3a 100644 --- a/modules/audio_coding/codecs/ilbc/enhancer_interface.h +++ b/modules/audio_coding/codecs/ilbc/enhancer_interface.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_INTERFACE_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_ENHANCER_INTERFACE_H_ +#include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c b/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c index 4624211912..6b4f30c96b 100644 --- a/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c +++ b/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * Construct an additional codebook vector by filtering the diff --git a/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h b/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h index c51ac39a43..661262e42e 100644 --- a/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h +++ b/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FILTERED_CB_VECS_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FILTERED_CB_VECS_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * Construct an additional codebook vector by filtering the diff --git a/modules/audio_coding/codecs/ilbc/frame_classify.c b/modules/audio_coding/codecs/ilbc/frame_classify.c index 6edf921650..c1084b1645 100644 --- a/modules/audio_coding/codecs/ilbc/frame_classify.c +++ b/modules/audio_coding/codecs/ilbc/frame_classify.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/frame_classify.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * Classification of subframes to localize start state diff --git a/modules/audio_coding/codecs/ilbc/frame_classify.h b/modules/audio_coding/codecs/ilbc/frame_classify.h index 43c6e57a5d..7615106d70 100644 --- a/modules/audio_coding/codecs/ilbc/frame_classify.h +++ b/modules/audio_coding/codecs/ilbc/frame_classify.h @@ -19,6 +19,11 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FRAME_CLASSIFY_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_FRAME_CLASSIFY_H_ +#include +#include + +#include "modules/audio_coding/codecs/ilbc/defines.h" + size_t WebRtcIlbcfix_FrameClassify( /* (o) Index to the max-energy sub frame */ IlbcEncoder* iLBCenc_inst, diff --git a/modules/audio_coding/codecs/ilbc/gain_dequant.c b/modules/audio_coding/codecs/ilbc/gain_dequant.c index cb405aebb3..1357dece33 100644 --- a/modules/audio_coding/codecs/ilbc/gain_dequant.c +++ b/modules/audio_coding/codecs/ilbc/gain_dequant.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/gain_dequant.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * decoder for quantized gains in the gain-shape coding of diff --git a/modules/audio_coding/codecs/ilbc/gain_dequant.h b/modules/audio_coding/codecs/ilbc/gain_dequant.h index 86cc787070..2b97550b6c 100644 --- a/modules/audio_coding/codecs/ilbc/gain_dequant.h +++ b/modules/audio_coding/codecs/ilbc/gain_dequant.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_DEQUANT_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_DEQUANT_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * decoder for quantized gains in the gain-shape coding of diff --git a/modules/audio_coding/codecs/ilbc/gain_quant.c b/modules/audio_coding/codecs/ilbc/gain_quant.c index 2472239ad1..9a6d49d51a 100644 --- a/modules/audio_coding/codecs/ilbc/gain_quant.c +++ b/modules/audio_coding/codecs/ilbc/gain_quant.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/gain_quant.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * quantizer for the gain in the gain-shape coding of residual diff --git a/modules/audio_coding/codecs/ilbc/gain_quant.h b/modules/audio_coding/codecs/ilbc/gain_quant.h index 51c0bc9a5c..761f7d2f79 100644 --- a/modules/audio_coding/codecs/ilbc/gain_quant.h +++ b/modules/audio_coding/codecs/ilbc/gain_quant.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_QUANT_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GAIN_QUANT_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * quantizer for the gain in the gain-shape coding of residual diff --git a/modules/audio_coding/codecs/ilbc/get_cd_vec.c b/modules/audio_coding/codecs/ilbc/get_cd_vec.c index d3479ec0bc..145cb964d7 100644 --- a/modules/audio_coding/codecs/ilbc/get_cd_vec.c +++ b/modules/audio_coding/codecs/ilbc/get_cd_vec.c @@ -18,9 +18,9 @@ #include "modules/audio_coding/codecs/ilbc/get_cd_vec.h" -#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/constants.h" #include "modules/audio_coding/codecs/ilbc/create_augmented_vec.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * Construct codebook vector for given index. diff --git a/modules/audio_coding/codecs/ilbc/get_lsp_poly.c b/modules/audio_coding/codecs/ilbc/get_lsp_poly.c index ecf57701ab..e0fb21caf0 100644 --- a/modules/audio_coding/codecs/ilbc/get_lsp_poly.c +++ b/modules/audio_coding/codecs/ilbc/get_lsp_poly.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/get_lsp_poly.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/get_lsp_poly.h b/modules/audio_coding/codecs/ilbc/get_lsp_poly.h index d469409af9..70c9c4d4b4 100644 --- a/modules/audio_coding/codecs/ilbc/get_lsp_poly.h +++ b/modules/audio_coding/codecs/ilbc/get_lsp_poly.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_LSP_POLY_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_LSP_POLY_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * Construct the polynomials F1(z) and F2(z) from the LSP diff --git a/modules/audio_coding/codecs/ilbc/get_sync_seq.c b/modules/audio_coding/codecs/ilbc/get_sync_seq.c index c5b11f14dd..68a569a40a 100644 --- a/modules/audio_coding/codecs/ilbc/get_sync_seq.c +++ b/modules/audio_coding/codecs/ilbc/get_sync_seq.c @@ -16,10 +16,12 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/get_sync_seq.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" -#include "modules/audio_coding/codecs/ilbc/refiner.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/nearest_neighbor.h" +#include "modules/audio_coding/codecs/ilbc/refiner.h" /*----------------------------------------------------------------* * get the pitch-synchronous sample sequence diff --git a/modules/audio_coding/codecs/ilbc/get_sync_seq.h b/modules/audio_coding/codecs/ilbc/get_sync_seq.h index 2281b06726..90962fa063 100644 --- a/modules/audio_coding/codecs/ilbc/get_sync_seq.h +++ b/modules/audio_coding/codecs/ilbc/get_sync_seq.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_SYNC_SEQ_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_SYNC_SEQ_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * get the pitch-synchronous sample sequence diff --git a/modules/audio_coding/codecs/ilbc/hp_input.c b/modules/audio_coding/codecs/ilbc/hp_input.c index dd6e20b8ae..be582f2e23 100644 --- a/modules/audio_coding/codecs/ilbc/hp_input.c +++ b/modules/audio_coding/codecs/ilbc/hp_input.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/hp_input.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/hp_input.h b/modules/audio_coding/codecs/ilbc/hp_input.h index 682441ac22..9143d8efed 100644 --- a/modules/audio_coding/codecs/ilbc/hp_input.h +++ b/modules/audio_coding/codecs/ilbc/hp_input.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_INPUT_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_INPUT_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include // clang-format off // Bad job here. https://bugs.llvm.org/show_bug.cgi?id=34274 diff --git a/modules/audio_coding/codecs/ilbc/hp_output.c b/modules/audio_coding/codecs/ilbc/hp_output.c index 0628e58746..cc5f6dcd37 100644 --- a/modules/audio_coding/codecs/ilbc/hp_output.c +++ b/modules/audio_coding/codecs/ilbc/hp_output.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/hp_output.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/hp_output.h b/modules/audio_coding/codecs/ilbc/hp_output.h index 54d976309f..6d1bd3cd88 100644 --- a/modules/audio_coding/codecs/ilbc/hp_output.h +++ b/modules/audio_coding/codecs/ilbc/hp_output.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_OUTPUT_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_HP_OUTPUT_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include // clang-format off // Bad job here. https://bugs.llvm.org/show_bug.cgi?id=34274 diff --git a/modules/audio_coding/codecs/ilbc/ilbc.c b/modules/audio_coding/codecs/ilbc/ilbc.c index 8ebe513082..ba6c3e46c3 100644 --- a/modules/audio_coding/codecs/ilbc/ilbc.c +++ b/modules/audio_coding/codecs/ilbc/ilbc.c @@ -16,14 +16,15 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/ilbc.h" + #include -#include "modules/audio_coding/codecs/ilbc/ilbc.h" +#include "modules/audio_coding/codecs/ilbc/decode.h" #include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/init_encode.h" #include "modules/audio_coding/codecs/ilbc/encode.h" #include "modules/audio_coding/codecs/ilbc/init_decode.h" -#include "modules/audio_coding/codecs/ilbc/decode.h" +#include "modules/audio_coding/codecs/ilbc/init_encode.h" #include "rtc_base/checks.h" int16_t WebRtcIlbcfix_EncoderAssign(IlbcEncoderInstance** iLBC_encinst, diff --git a/modules/audio_coding/codecs/ilbc/index_conv_dec.c b/modules/audio_coding/codecs/ilbc/index_conv_dec.c index ad12cee39c..d78f81a897 100644 --- a/modules/audio_coding/codecs/ilbc/index_conv_dec.c +++ b/modules/audio_coding/codecs/ilbc/index_conv_dec.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/index_conv_dec.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" void WebRtcIlbcfix_IndexConvDec( diff --git a/modules/audio_coding/codecs/ilbc/index_conv_enc.c b/modules/audio_coding/codecs/ilbc/index_conv_enc.c index 6cf164e7ee..83144150b4 100644 --- a/modules/audio_coding/codecs/ilbc/index_conv_enc.c +++ b/modules/audio_coding/codecs/ilbc/index_conv_enc.c @@ -16,7 +16,10 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/index_conv_enc.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" + /*----------------------------------------------------------------* * Convert the codebook indexes to make the search easier *---------------------------------------------------------------*/ diff --git a/modules/audio_coding/codecs/ilbc/index_conv_enc.h b/modules/audio_coding/codecs/ilbc/index_conv_enc.h index f89949949c..4fbf98084e 100644 --- a/modules/audio_coding/codecs/ilbc/index_conv_enc.h +++ b/modules/audio_coding/codecs/ilbc/index_conv_enc.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_ENC_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INDEX_CONV_ENC_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * Convert the codebook indexes to make the search easier diff --git a/modules/audio_coding/codecs/ilbc/init_decode.c b/modules/audio_coding/codecs/ilbc/init_decode.c index c63cc7ce81..3eb41e33b0 100644 --- a/modules/audio_coding/codecs/ilbc/init_decode.c +++ b/modules/audio_coding/codecs/ilbc/init_decode.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/init_decode.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * Initiation of decoder instance. diff --git a/modules/audio_coding/codecs/ilbc/init_decode.h b/modules/audio_coding/codecs/ilbc/init_decode.h index fdcf9f0b1a..a2b7b91287 100644 --- a/modules/audio_coding/codecs/ilbc/init_decode.h +++ b/modules/audio_coding/codecs/ilbc/init_decode.h @@ -19,6 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_DECODE_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_DECODE_H_ +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/init_encode.c b/modules/audio_coding/codecs/ilbc/init_encode.c index b21f77efa6..aa858e94bb 100644 --- a/modules/audio_coding/codecs/ilbc/init_encode.c +++ b/modules/audio_coding/codecs/ilbc/init_encode.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/init_encode.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * Initiation of encoder instance. diff --git a/modules/audio_coding/codecs/ilbc/init_encode.h b/modules/audio_coding/codecs/ilbc/init_encode.h index f91a9b0add..4ada6a30c8 100644 --- a/modules/audio_coding/codecs/ilbc/init_encode.h +++ b/modules/audio_coding/codecs/ilbc/init_encode.h @@ -19,6 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_ENCODE_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INIT_ENCODE_H_ +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/interpolate.c b/modules/audio_coding/codecs/ilbc/interpolate.c index 3ce480eaa6..17ed244bd4 100644 --- a/modules/audio_coding/codecs/ilbc/interpolate.c +++ b/modules/audio_coding/codecs/ilbc/interpolate.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/interpolate.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * interpolation between vectors diff --git a/modules/audio_coding/codecs/ilbc/interpolate.h b/modules/audio_coding/codecs/ilbc/interpolate.h index 9f0323649b..892082b75c 100644 --- a/modules/audio_coding/codecs/ilbc/interpolate.h +++ b/modules/audio_coding/codecs/ilbc/interpolate.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * interpolation between vectors diff --git a/modules/audio_coding/codecs/ilbc/interpolate_samples.c b/modules/audio_coding/codecs/ilbc/interpolate_samples.c index 9ca38a4a34..6dddd6fb86 100644 --- a/modules/audio_coding/codecs/ilbc/interpolate_samples.c +++ b/modules/audio_coding/codecs/ilbc/interpolate_samples.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/interpolate_samples.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" void WebRtcIlbcfix_InterpolateSamples( int16_t *interpSamples, /* (o) The interpolated samples */ diff --git a/modules/audio_coding/codecs/ilbc/interpolate_samples.h b/modules/audio_coding/codecs/ilbc/interpolate_samples.h index 264a101aa4..bc665d7854 100644 --- a/modules/audio_coding/codecs/ilbc/interpolate_samples.h +++ b/modules/audio_coding/codecs/ilbc/interpolate_samples.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_SAMPLES_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_INTERPOLATE_SAMPLES_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * Construct the interpolated samples for the Augmented CB diff --git a/modules/audio_coding/codecs/ilbc/lpc_encode.c b/modules/audio_coding/codecs/ilbc/lpc_encode.c index 9b2a0c0d41..89f6d29724 100644 --- a/modules/audio_coding/codecs/ilbc/lpc_encode.c +++ b/modules/audio_coding/codecs/ilbc/lpc_encode.c @@ -16,12 +16,14 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h" -#include "modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h" -#include "modules/audio_coding/codecs/ilbc/simple_lsf_quant.h" -#include "modules/audio_coding/codecs/ilbc/lsf_check.h" +#include "modules/audio_coding/codecs/ilbc/lpc_encode.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/lsf_check.h" +#include "modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h" +#include "modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h" +#include "modules/audio_coding/codecs/ilbc/simple_lsf_quant.h" /*----------------------------------------------------------------* * lpc encoder diff --git a/modules/audio_coding/codecs/ilbc/lpc_encode.h b/modules/audio_coding/codecs/ilbc/lpc_encode.h index 256fa492bb..a67b77acbf 100644 --- a/modules/audio_coding/codecs/ilbc/lpc_encode.h +++ b/modules/audio_coding/codecs/ilbc/lpc_encode.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LPC_ENCODE_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LPC_ENCODE_H_ +#include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/lsf_check.c b/modules/audio_coding/codecs/ilbc/lsf_check.c index 684b2ce8ce..9f0e19a2d9 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_check.c +++ b/modules/audio_coding/codecs/ilbc/lsf_check.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/lsf_check.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * check for stability of lsf coefficients diff --git a/modules/audio_coding/codecs/ilbc/lsf_check.h b/modules/audio_coding/codecs/ilbc/lsf_check.h index d367c1d09f..9ba90a31e6 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_check.h +++ b/modules/audio_coding/codecs/ilbc/lsf_check.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_CHECK_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_CHECK_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * check for stability of lsf coefficients diff --git a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c index e501f3cb6e..04de5e7e6c 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c +++ b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c @@ -16,9 +16,11 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h" + +#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/interpolate.h" #include "modules/audio_coding/codecs/ilbc/lsf_to_poly.h" -#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * interpolation of lsf coefficients for the decoder diff --git a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h index 016897a144..6cc9d9746d 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h +++ b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_DEC_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_DEC_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * interpolation of lsf coefficients for the decoder diff --git a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c index a660c4f2ff..618821216c 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c +++ b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/interpolate.h" #include "modules/audio_coding/codecs/ilbc/lsf_to_poly.h" diff --git a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h index 9cb0dd9f42..b278a10f4b 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h +++ b/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_ENC_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_INTERPOLATE_TO_POLY_ENC_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * lsf interpolator and conversion from lsf to a coefficients diff --git a/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c b/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c index 8767e2dec2..ee8292f394 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c +++ b/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/lsf_to_lsp.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * conversion from lsf to lsp coefficients diff --git a/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h b/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h index 921101ac9e..6bc6c44dbd 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h +++ b/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_LSP_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_LSP_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * conversion from lsf to lsp coefficients diff --git a/modules/audio_coding/codecs/ilbc/lsf_to_poly.c b/modules/audio_coding/codecs/ilbc/lsf_to_poly.c index 4dbf96dc0b..8ca91d82f8 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_to_poly.c +++ b/modules/audio_coding/codecs/ilbc/lsf_to_poly.c @@ -16,10 +16,12 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/lsf_to_lsp.h" -#include "modules/audio_coding/codecs/ilbc/get_lsp_poly.h" +#include "modules/audio_coding/codecs/ilbc/lsf_to_poly.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/get_lsp_poly.h" +#include "modules/audio_coding/codecs/ilbc/lsf_to_lsp.h" void WebRtcIlbcfix_Lsf2Poly( int16_t *a, /* (o) predictor coefficients (order = 10) in Q12 */ diff --git a/modules/audio_coding/codecs/ilbc/lsf_to_poly.h b/modules/audio_coding/codecs/ilbc/lsf_to_poly.h index e551836f52..f26d3a8d2d 100644 --- a/modules/audio_coding/codecs/ilbc/lsf_to_poly.h +++ b/modules/audio_coding/codecs/ilbc/lsf_to_poly.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_POLY_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSF_TO_POLY_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * Convert from LSF coefficients to A coefficients diff --git a/modules/audio_coding/codecs/ilbc/lsp_to_lsf.c b/modules/audio_coding/codecs/ilbc/lsp_to_lsf.c index db11cfed2e..227f4d45b4 100644 --- a/modules/audio_coding/codecs/ilbc/lsp_to_lsf.c +++ b/modules/audio_coding/codecs/ilbc/lsp_to_lsf.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/lsp_to_lsf.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * conversion from LSP coefficients to LSF coefficients diff --git a/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h b/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h index 358786e752..c2f4b7692d 100644 --- a/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h +++ b/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSP_TO_LSF_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_LSP_TO_LSF_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * conversion from LSP coefficients to LSF coefficients diff --git a/modules/audio_coding/codecs/ilbc/my_corr.c b/modules/audio_coding/codecs/ilbc/my_corr.c index 2f2a058874..9b870e0ef0 100644 --- a/modules/audio_coding/codecs/ilbc/my_corr.c +++ b/modules/audio_coding/codecs/ilbc/my_corr.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/my_corr.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/my_corr.h b/modules/audio_coding/codecs/ilbc/my_corr.h index 21deea5231..c0c2fa4a48 100644 --- a/modules/audio_coding/codecs/ilbc/my_corr.h +++ b/modules/audio_coding/codecs/ilbc/my_corr.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_MY_CORR_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_MY_CORR_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * compute cross correlation between sequences diff --git a/modules/audio_coding/codecs/ilbc/nearest_neighbor.c b/modules/audio_coding/codecs/ilbc/nearest_neighbor.c index 9d78528ba8..1ecdd96d5a 100644 --- a/modules/audio_coding/codecs/ilbc/nearest_neighbor.c +++ b/modules/audio_coding/codecs/ilbc/nearest_neighbor.c @@ -16,7 +16,7 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/nearest_neighbor.h" void WebRtcIlbcfix_NearestNeighbor(size_t* index, const size_t* array, diff --git a/modules/audio_coding/codecs/ilbc/nearest_neighbor.h b/modules/audio_coding/codecs/ilbc/nearest_neighbor.h index 68b5c59b40..704cf2a37d 100644 --- a/modules/audio_coding/codecs/ilbc/nearest_neighbor.h +++ b/modules/audio_coding/codecs/ilbc/nearest_neighbor.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_NEAREST_NEIGHBOR_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_NEAREST_NEIGHBOR_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * Find index in array such that the array element with said diff --git a/modules/audio_coding/codecs/ilbc/pack_bits.c b/modules/audio_coding/codecs/ilbc/pack_bits.c index 507e25e3ea..dd44eb8fb6 100644 --- a/modules/audio_coding/codecs/ilbc/pack_bits.c +++ b/modules/audio_coding/codecs/ilbc/pack_bits.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/pack_bits.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/poly_to_lsf.c b/modules/audio_coding/codecs/ilbc/poly_to_lsf.c index 92aa16538d..7192eaab49 100644 --- a/modules/audio_coding/codecs/ilbc/poly_to_lsf.c +++ b/modules/audio_coding/codecs/ilbc/poly_to_lsf.c @@ -16,10 +16,11 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/poly_to_lsf.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" -#include "modules/audio_coding/codecs/ilbc/poly_to_lsp.h" #include "modules/audio_coding/codecs/ilbc/lsp_to_lsf.h" +#include "modules/audio_coding/codecs/ilbc/poly_to_lsp.h" void WebRtcIlbcfix_Poly2Lsf( int16_t *lsf, /* (o) lsf coefficients (Q13) */ diff --git a/modules/audio_coding/codecs/ilbc/poly_to_lsf.h b/modules/audio_coding/codecs/ilbc/poly_to_lsf.h index 8a68d07d65..363e392bb2 100644 --- a/modules/audio_coding/codecs/ilbc/poly_to_lsf.h +++ b/modules/audio_coding/codecs/ilbc/poly_to_lsf.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSF_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSF_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * conversion from lpc coefficients to lsf coefficients diff --git a/modules/audio_coding/codecs/ilbc/poly_to_lsp.c b/modules/audio_coding/codecs/ilbc/poly_to_lsp.c index 88df6396e4..ad0ecd70ab 100644 --- a/modules/audio_coding/codecs/ilbc/poly_to_lsp.c +++ b/modules/audio_coding/codecs/ilbc/poly_to_lsp.c @@ -16,9 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/poly_to_lsp.h" + #include "modules/audio_coding/codecs/ilbc/chebyshev.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" /*----------------------------------------------------------------* * conversion from lpc coefficients to lsp coefficients diff --git a/modules/audio_coding/codecs/ilbc/poly_to_lsp.h b/modules/audio_coding/codecs/ilbc/poly_to_lsp.h index 76378f2934..928ee4efdb 100644 --- a/modules/audio_coding/codecs/ilbc/poly_to_lsp.h +++ b/modules/audio_coding/codecs/ilbc/poly_to_lsp.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSP_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_POLY_TO_LSP_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * conversion from lpc coefficients to lsp coefficients diff --git a/modules/audio_coding/codecs/ilbc/refiner.c b/modules/audio_coding/codecs/ilbc/refiner.c index d8a9bfb579..5bdab7a4b0 100644 --- a/modules/audio_coding/codecs/ilbc/refiner.c +++ b/modules/audio_coding/codecs/ilbc/refiner.c @@ -16,7 +16,8 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/refiner.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" #include "modules/audio_coding/codecs/ilbc/enh_upsample.h" #include "modules/audio_coding/codecs/ilbc/my_corr.h" diff --git a/modules/audio_coding/codecs/ilbc/refiner.h b/modules/audio_coding/codecs/ilbc/refiner.h index 87d0de7816..564c9d96e6 100644 --- a/modules/audio_coding/codecs/ilbc/refiner.h +++ b/modules/audio_coding/codecs/ilbc/refiner.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_REFINER_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_REFINER_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * find segment starting near idata+estSegPos that has highest diff --git a/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c b/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c index df41b281b9..7343530a5e 100644 --- a/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c +++ b/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c @@ -16,10 +16,12 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h" +#include "modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h" + #include "modules/audio_coding/codecs/ilbc/bw_expand.h" #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h" /*----------------------------------------------------------------* * lsf interpolator (subrutine to LPCencode) diff --git a/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h b/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h index 317f613d6c..ee53e4bd08 100644 --- a/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h +++ b/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h @@ -19,6 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_INTERPOLATE_LSF_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_INTERPOLATE_LSF_H_ +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c b/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c index 09e64ac6dc..fdc4553d95 100644 --- a/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c +++ b/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c @@ -16,11 +16,13 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/window32_w32.h" +#include "modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h" + #include "modules/audio_coding/codecs/ilbc/bw_expand.h" -#include "modules/audio_coding/codecs/ilbc/poly_to_lsf.h" #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/poly_to_lsf.h" +#include "modules/audio_coding/codecs/ilbc/window32_w32.h" /*----------------------------------------------------------------* * lpc analysis (subrutine to LPCencode) diff --git a/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h b/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h index 3b0548d057..b5c839ba2a 100644 --- a/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h +++ b/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h @@ -19,6 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LPC_ANALYSIS_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LPC_ANALYSIS_H_ +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c b/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c index 90673a2a8b..e7494ceb59 100644 --- a/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c +++ b/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * obtain dequantized lsf coefficients from quantization index diff --git a/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h b/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h index ee18486440..6d97d3df33 100644 --- a/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h +++ b/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_DEQUANT_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_DEQUANT_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * obtain dequantized lsf coefficients from quantization index diff --git a/modules/audio_coding/codecs/ilbc/simple_lsf_quant.c b/modules/audio_coding/codecs/ilbc/simple_lsf_quant.c index 45373a943b..1291d1442e 100644 --- a/modules/audio_coding/codecs/ilbc/simple_lsf_quant.c +++ b/modules/audio_coding/codecs/ilbc/simple_lsf_quant.c @@ -16,9 +16,11 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/simple_lsf_quant.h" + +#include "modules/audio_coding/codecs/ilbc/constants.h" #include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/split_vq.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" /*----------------------------------------------------------------* * lsf quantizer (subrutine to LPCencode) diff --git a/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h b/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h index 74fb0be597..66b553213a 100644 --- a/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h +++ b/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_QUANT_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SIMPLE_LSF_QUANT_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * lsf quantizer (subrutine to LPCencode) diff --git a/modules/audio_coding/codecs/ilbc/smooth.c b/modules/audio_coding/codecs/ilbc/smooth.c index edafb0c935..631b2f432a 100644 --- a/modules/audio_coding/codecs/ilbc/smooth.c +++ b/modules/audio_coding/codecs/ilbc/smooth.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/smooth.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/smooth_out_data.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/smooth.h b/modules/audio_coding/codecs/ilbc/smooth.h index 52e7ff97b6..c8752be64f 100644 --- a/modules/audio_coding/codecs/ilbc/smooth.h +++ b/modules/audio_coding/codecs/ilbc/smooth.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * find the smoothed output data diff --git a/modules/audio_coding/codecs/ilbc/smooth_out_data.c b/modules/audio_coding/codecs/ilbc/smooth_out_data.c index 72b3a47790..9f952bfb93 100644 --- a/modules/audio_coding/codecs/ilbc/smooth_out_data.c +++ b/modules/audio_coding/codecs/ilbc/smooth_out_data.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/smooth_out_data.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" #include "rtc_base/sanitizer.h" // An s32 + s32 -> s32 addition that's allowed to overflow. (It's still diff --git a/modules/audio_coding/codecs/ilbc/smooth_out_data.h b/modules/audio_coding/codecs/ilbc/smooth_out_data.h index df946e3a72..318e7b04a2 100644 --- a/modules/audio_coding/codecs/ilbc/smooth_out_data.h +++ b/modules/audio_coding/codecs/ilbc/smooth_out_data.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_OUT_DATA_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SMOOTH_OUT_DATA_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * help function to WebRtcIlbcfix_Smooth() diff --git a/modules/audio_coding/codecs/ilbc/sort_sq.c b/modules/audio_coding/codecs/ilbc/sort_sq.c index dd3ca8057e..c3a24750f0 100644 --- a/modules/audio_coding/codecs/ilbc/sort_sq.c +++ b/modules/audio_coding/codecs/ilbc/sort_sq.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/sort_sq.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/sort_sq.h b/modules/audio_coding/codecs/ilbc/sort_sq.h index 1fe7fbf237..02028dae93 100644 --- a/modules/audio_coding/codecs/ilbc/sort_sq.h +++ b/modules/audio_coding/codecs/ilbc/sort_sq.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SORT_SQ_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SORT_SQ_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * scalar quantization diff --git a/modules/audio_coding/codecs/ilbc/split_vq.c b/modules/audio_coding/codecs/ilbc/split_vq.c index 2f218ed592..c1f04d2287 100644 --- a/modules/audio_coding/codecs/ilbc/split_vq.c +++ b/modules/audio_coding/codecs/ilbc/split_vq.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/split_vq.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" #include "modules/audio_coding/codecs/ilbc/vq3.h" #include "modules/audio_coding/codecs/ilbc/vq4.h" diff --git a/modules/audio_coding/codecs/ilbc/split_vq.h b/modules/audio_coding/codecs/ilbc/split_vq.h index 6bc2db67e3..e4b02a2bc2 100644 --- a/modules/audio_coding/codecs/ilbc/split_vq.h +++ b/modules/audio_coding/codecs/ilbc/split_vq.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SPLIT_VQ_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SPLIT_VQ_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include /*----------------------------------------------------------------* * split vector quantization diff --git a/modules/audio_coding/codecs/ilbc/state_construct.c b/modules/audio_coding/codecs/ilbc/state_construct.c index 753415b9c8..c58086c03b 100644 --- a/modules/audio_coding/codecs/ilbc/state_construct.c +++ b/modules/audio_coding/codecs/ilbc/state_construct.c @@ -16,8 +16,10 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/state_construct.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * decoding of the start state diff --git a/modules/audio_coding/codecs/ilbc/state_construct.h b/modules/audio_coding/codecs/ilbc/state_construct.h index 0dadf48868..4c3011937d 100644 --- a/modules/audio_coding/codecs/ilbc/state_construct.h +++ b/modules/audio_coding/codecs/ilbc/state_construct.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_CONSTRUCT_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_CONSTRUCT_H_ +#include +#include + /*----------------------------------------------------------------* * Generate the start state from the quantized indexes *---------------------------------------------------------------*/ diff --git a/modules/audio_coding/codecs/ilbc/state_search.c b/modules/audio_coding/codecs/ilbc/state_search.c index 5e8a2f55ab..7227ac9d45 100644 --- a/modules/audio_coding/codecs/ilbc/state_search.c +++ b/modules/audio_coding/codecs/ilbc/state_search.c @@ -16,9 +16,11 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" -#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/state_search.h" + #include "modules/audio_coding/codecs/ilbc/abs_quant.h" +#include "modules/audio_coding/codecs/ilbc/constants.h" +#include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* * encoding of start state diff --git a/modules/audio_coding/codecs/ilbc/state_search.h b/modules/audio_coding/codecs/ilbc/state_search.h index 1ad27cec02..6469138a0e 100644 --- a/modules/audio_coding/codecs/ilbc/state_search.h +++ b/modules/audio_coding/codecs/ilbc/state_search.h @@ -19,6 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_SEARCH_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_STATE_SEARCH_H_ +#include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/swap_bytes.c b/modules/audio_coding/codecs/ilbc/swap_bytes.c index 806cc2a39a..bbafc1a2ed 100644 --- a/modules/audio_coding/codecs/ilbc/swap_bytes.c +++ b/modules/audio_coding/codecs/ilbc/swap_bytes.c @@ -16,7 +16,7 @@ ******************************************************************/ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include "modules/audio_coding/codecs/ilbc/swap_bytes.h" /*----------------------------------------------------------------* * Swap bytes (to simplify operations on Little Endian machines) diff --git a/modules/audio_coding/codecs/ilbc/swap_bytes.h b/modules/audio_coding/codecs/ilbc/swap_bytes.h index 381b73ae4f..c59bf3068a 100644 --- a/modules/audio_coding/codecs/ilbc/swap_bytes.h +++ b/modules/audio_coding/codecs/ilbc/swap_bytes.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SWAP_BYTES_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_SWAP_BYTES_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * Swap bytes (to simplify operations on Little Endian machines) diff --git a/modules/audio_coding/codecs/ilbc/unpack_bits.c b/modules/audio_coding/codecs/ilbc/unpack_bits.c index ad6a7ee1da..a9a0147b9d 100644 --- a/modules/audio_coding/codecs/ilbc/unpack_bits.c +++ b/modules/audio_coding/codecs/ilbc/unpack_bits.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/unpack_bits.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/unpack_bits.h b/modules/audio_coding/codecs/ilbc/unpack_bits.h index 4fd0a80b4b..1a63280e6b 100644 --- a/modules/audio_coding/codecs/ilbc/unpack_bits.h +++ b/modules/audio_coding/codecs/ilbc/unpack_bits.h @@ -19,6 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_UNPACK_BITS_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_UNPACK_BITS_H_ +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/vq3.c b/modules/audio_coding/codecs/ilbc/vq3.c index b63a7a8479..d9375fb995 100644 --- a/modules/audio_coding/codecs/ilbc/vq3.c +++ b/modules/audio_coding/codecs/ilbc/vq3.c @@ -17,6 +17,7 @@ ******************************************************************/ #include "modules/audio_coding/codecs/ilbc/vq3.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/vq4.c b/modules/audio_coding/codecs/ilbc/vq4.c index 2522ac28e6..c9a65aec2a 100644 --- a/modules/audio_coding/codecs/ilbc/vq4.c +++ b/modules/audio_coding/codecs/ilbc/vq4.c @@ -17,6 +17,7 @@ ******************************************************************/ #include "modules/audio_coding/codecs/ilbc/vq4.h" + #include "modules/audio_coding/codecs/ilbc/constants.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/window32_w32.c b/modules/audio_coding/codecs/ilbc/window32_w32.c index fe19de6850..e82d167220 100644 --- a/modules/audio_coding/codecs/ilbc/window32_w32.c +++ b/modules/audio_coding/codecs/ilbc/window32_w32.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/window32_w32.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/window32_w32.h b/modules/audio_coding/codecs/ilbc/window32_w32.h index 0cef0848f8..15d72c5ba2 100644 --- a/modules/audio_coding/codecs/ilbc/window32_w32.h +++ b/modules/audio_coding/codecs/ilbc/window32_w32.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_WINDOW32_W32_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_WINDOW32_W32_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * window multiplication diff --git a/modules/audio_coding/codecs/ilbc/xcorr_coef.c b/modules/audio_coding/codecs/ilbc/xcorr_coef.c index f6375dfbff..9dc880b37e 100644 --- a/modules/audio_coding/codecs/ilbc/xcorr_coef.c +++ b/modules/audio_coding/codecs/ilbc/xcorr_coef.c @@ -16,6 +16,8 @@ ******************************************************************/ +#include "modules/audio_coding/codecs/ilbc/xcorr_coef.h" + #include "modules/audio_coding/codecs/ilbc/defines.h" /*----------------------------------------------------------------* diff --git a/modules/audio_coding/codecs/ilbc/xcorr_coef.h b/modules/audio_coding/codecs/ilbc/xcorr_coef.h index e6c3d3f606..3be5a296b5 100644 --- a/modules/audio_coding/codecs/ilbc/xcorr_coef.h +++ b/modules/audio_coding/codecs/ilbc/xcorr_coef.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_XCORR_COEF_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_XCORR_COEF_H_ -#include "modules/audio_coding/codecs/ilbc/defines.h" +#include +#include /*----------------------------------------------------------------* * cross correlation which finds the optimal lag for the