From 262e676a08fc29ee6c414f5858d68697be983515 Mon Sep 17 00:00:00 2001 From: "andresp@webrtc.org" Date: Thu, 4 Sep 2014 13:28:48 +0000 Subject: [PATCH] Reland rev 7041 with BUILD.gn files. Original description: Audio codecs to include webrtc/typedefs.h Will easy merge of webrtc/typedefs.h and webrtc/base/basictypes.h CL Generated with: $ git grep -l \"typedefs.h\" | xargs sed -i "s/typedefs.h/webrtc\/typedefs.h/g" BUG=3777 R=henrik.lundin@webrtc.org, tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/22569004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7061 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_coding/BUILD.gn | 18 +++++++++--------- .../audio_coding/codecs/cng/cng_helpfuns.c | 2 +- .../audio_coding/codecs/cng/cng_helpfuns.h | 2 +- .../codecs/cng/include/webrtc_cng.h | 2 +- webrtc/modules/audio_coding/codecs/g711/g711.c | 2 +- webrtc/modules/audio_coding/codecs/g711/g711.h | 2 +- .../audio_coding/codecs/g711/g711_interface.c | 2 +- .../codecs/g711/include/g711_interface.h | 2 +- .../audio_coding/codecs/g722/g722_decode.c | 5 ++--- .../audio_coding/codecs/g722/g722_enc_dec.h | 2 ++ .../audio_coding/codecs/g722/g722_encode.c | 4 ++-- .../audio_coding/codecs/g722/g722_interface.c | 5 ++--- .../codecs/g722/include/g722_interface.h | 2 +- .../audio_coding/codecs/g722/test/testG722.cc | 2 +- .../audio_coding/codecs/ilbc/constants.h | 2 +- .../modules/audio_coding/codecs/ilbc/defines.h | 4 ++-- .../audio_coding/codecs/ilbc/interface/ilbc.h | 2 +- webrtc/modules/audio_coding/codecs/ilbc/vq3.h | 2 +- webrtc/modules/audio_coding/codecs/ilbc/vq4.h | 2 +- .../codecs/isac/fix/interface/isacfix.h | 3 +-- .../isac/fix/source/entropy_coding_mips.c | 4 ++-- .../isac/fix/source/filterbank_internal.h | 2 +- .../codecs/isac/fix/source/filterbank_tables.h | 2 +- .../codecs/isac/fix/source/isacfix.c | 16 ++++++++-------- .../codecs/isac/fix/source/lattice_c.c | 2 +- .../codecs/isac/fix/source/lpc_tables.h | 3 +-- .../codecs/isac/fix/source/pitch_filter_c.c | 4 ++-- .../codecs/isac/fix/source/pitch_gain_tables.h | 3 +-- .../codecs/isac/fix/source/pitch_lag_tables.h | 4 +--- .../isac/fix/source/spectrum_ar_model_tables.h | 3 +-- .../codecs/isac/fix/source/structs.h | 6 +++--- .../audio_coding/codecs/isac/main/source/crc.h | 2 +- .../codecs/isac/main/source/encode_lpc_swb.c | 14 +++++++------- .../codecs/isac/main/source/encode_lpc_swb.h | 3 +-- .../isac/main/source/lpc_gain_swb_tables.c | 2 +- .../isac/main/source/lpc_gain_swb_tables.h | 2 +- .../isac/main/source/lpc_shape_swb12_tables.c | 2 +- .../isac/main/source/lpc_shape_swb12_tables.h | 2 +- .../isac/main/source/lpc_shape_swb16_tables.c | 2 +- .../isac/main/source/lpc_shape_swb16_tables.h | 3 +-- .../isac/main/source/os_specific_inline.h | 2 +- .../isac/main/source/pitch_gain_tables.h | 2 +- .../codecs/isac/main/source/pitch_lag_tables.h | 2 +- .../codecs/pcm16b/include/pcm16b.h | 2 +- .../audio_coding/codecs/pcm16b/pcm16b.c | 2 +- .../audio_coding/main/test/TimedTrace.h | 2 +- 46 files changed, 76 insertions(+), 84 deletions(-) diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn index 206445fe2..6e5a4ef8b 100644 --- a/webrtc/modules/audio_coding/BUILD.gn +++ b/webrtc/modules/audio_coding/BUILD.gn @@ -110,7 +110,7 @@ source_set("audio_coding") { config("cng_config") { include_dirs = [ - "../..", + "../../..", "codecs/cng/include", ] } @@ -130,7 +130,7 @@ source_set("cng") { config("g711_config") { include_dirs = [ - "../..", + "../../..", "codecs/g711/include", ] } @@ -148,7 +148,7 @@ source_set("g711") { config("g722_config") { include_dirs = [ - "../..", + "../../..", "codecs/g722/include", ] } @@ -167,7 +167,7 @@ source_set("g722") { config("ilbc_config") { include_dirs = [ - "../..", + "../../..", "codecs/ilbc/interface", ] } @@ -322,7 +322,7 @@ source_set("ilbc") { config("isac_config") { include_dirs = [ - "../..", + "../../..", "codecs/isac/main/interface", ] } @@ -393,7 +393,7 @@ source_set("isac") { config("isac_fix_config") { include_dirs = [ - "../..", + "../../..", "codecs/isac/fix/interface", ] } @@ -517,7 +517,7 @@ if (build_armv7_neon) { ] include_dirs = [ - "../..", + "../../..", ] # Disable LTO in audio_processing_neon target due to compiler bug. @@ -546,7 +546,7 @@ if (build_armv7_neon) { config("pcm16b_config") { include_dirs = [ - "../..", + "../../..", "codecs/pcm16b/include", ] } @@ -561,7 +561,7 @@ source_set("pcm16b") { } config("opus_config") { - include_dirs = [ "../.." ] + include_dirs = [ "../../.." ] } source_set("webrtc_opus") { diff --git a/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.c b/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.c index ab43aef8a..bc08d431a 100644 --- a/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.c +++ b/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.c @@ -11,7 +11,7 @@ #include "cng_helpfuns.h" #include "signal_processing_library.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" #include "webrtc_cng.h" /* Values in |k| are Q15, and |a| Q12. */ diff --git a/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.h b/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.h index de9e0d0a3..a553a7615 100644 --- a/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.h +++ b/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.h @@ -10,7 +10,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_CNG_HELPFUNS_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_CNG_HELPFUNS_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" #ifdef __cplusplus extern "C" { diff --git a/webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h b/webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h index 6030f8ebe..d90a26919 100644 --- a/webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h +++ b/webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h @@ -12,7 +12,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_INTERFACE_WEBRTC_CNG_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_INTERFACE_WEBRTC_CNG_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" #ifdef __cplusplus extern "C" { diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.c b/webrtc/modules/audio_coding/codecs/g711/g711.c index ac9e44a65..a183757ec 100644 --- a/webrtc/modules/audio_coding/codecs/g711/g711.c +++ b/webrtc/modules/audio_coding/codecs/g711/g711.c @@ -21,7 +21,7 @@ */ #include "g711.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" /* Copied from the CCITT G.711 specification */ static const uint8_t ulaw_to_alaw_table[256] = { diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.h b/webrtc/modules/audio_coding/codecs/g711/g711.h index f34d26667..3b07d8ba8 100644 --- a/webrtc/modules/audio_coding/codecs/g711/g711.h +++ b/webrtc/modules/audio_coding/codecs/g711/g711.h @@ -49,7 +49,7 @@ specification by other means. extern "C" { #endif -#include "typedefs.h" +#include "webrtc/typedefs.h" #if defined(__i386__) /*! \brief Find the bit position of the highest set bit in a word diff --git a/webrtc/modules/audio_coding/codecs/g711/g711_interface.c b/webrtc/modules/audio_coding/codecs/g711/g711_interface.c index 087e3e11c..134c1e4e1 100644 --- a/webrtc/modules/audio_coding/codecs/g711/g711_interface.c +++ b/webrtc/modules/audio_coding/codecs/g711/g711_interface.c @@ -10,7 +10,7 @@ #include #include "g711.h" #include "g711_interface.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" int16_t WebRtcG711_EncodeA(void* state, int16_t* speechIn, diff --git a/webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h b/webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h index bee5ffad5..83357e474 100644 --- a/webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h +++ b/webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_G711_MAIN_INTERFACE_G711_INTERFACE_H_ #define MODULES_AUDIO_CODING_CODECS_G711_MAIN_INTERFACE_G711_INTERFACE_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" // Comfort noise constants #define G711_WEBRTC_SPEECH 1 diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_decode.c b/webrtc/modules/audio_coding/codecs/g722/g722_decode.c index e62af981f..65ca77bad 100644 --- a/webrtc/modules/audio_coding/codecs/g722/g722_decode.c +++ b/webrtc/modules/audio_coding/codecs/g722/g722_decode.c @@ -34,13 +34,12 @@ #include #endif -#include #include +#include #include -#include "typedefs.h" #include "g722_enc_dec.h" - +#include "webrtc/typedefs.h" #if !defined(FALSE) #define FALSE 0 diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h b/webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h index ef279ac5a..da6122456 100644 --- a/webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h +++ b/webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h @@ -31,6 +31,8 @@ #if !defined(_G722_ENC_DEC_H_) #define _G722_ENC_DEC_H_ +#include "webrtc/typedefs.h" + /*! \page g722_page G.722 encoding and decoding \section g722_page_sec_1 What does it do? The G.722 module is a bit exact implementation of the ITU G.722 specification for all three diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_encode.c b/webrtc/modules/audio_coding/codecs/g722/g722_encode.c index 5b07615a0..03ac3c52f 100644 --- a/webrtc/modules/audio_coding/codecs/g722/g722_encode.c +++ b/webrtc/modules/audio_coding/codecs/g722/g722_encode.c @@ -34,12 +34,12 @@ #include #endif -#include #include +#include #include -#include "typedefs.h" #include "g722_enc_dec.h" +#include "webrtc/typedefs.h" #if !defined(FALSE) #define FALSE 0 diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_interface.c b/webrtc/modules/audio_coding/codecs/g722/g722_interface.c index 7075669f5..a52981b9a 100644 --- a/webrtc/modules/audio_coding/codecs/g722/g722_interface.c +++ b/webrtc/modules/audio_coding/codecs/g722/g722_interface.c @@ -12,10 +12,9 @@ #include #include -#include "g722_interface.h" #include "g722_enc_dec.h" -#include "typedefs.h" - +#include "g722_interface.h" +#include "webrtc/typedefs.h" int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst) { diff --git a/webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h b/webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h index 0948a1831..1d3d79908 100644 --- a/webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h +++ b/webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_G722_MAIN_INTERFACE_G722_INTERFACE_H_ #define MODULES_AUDIO_CODING_CODECS_G722_MAIN_INTERFACE_G722_INTERFACE_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" /* * Solution to support multiple instances diff --git a/webrtc/modules/audio_coding/codecs/g722/test/testG722.cc b/webrtc/modules/audio_coding/codecs/g722/test/testG722.cc index d51301d51..9df147692 100644 --- a/webrtc/modules/audio_coding/codecs/g722/test/testG722.cc +++ b/webrtc/modules/audio_coding/codecs/g722/test/testG722.cc @@ -15,7 +15,7 @@ #include #include #include -#include "typedefs.h" +#include "webrtc/typedefs.h" /* include API */ #include "g722_interface.h" diff --git a/webrtc/modules/audio_coding/codecs/ilbc/constants.h b/webrtc/modules/audio_coding/codecs/ilbc/constants.h index cdc8a9c56..ff6370e14 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/constants.h +++ b/webrtc/modules/audio_coding/codecs/ilbc/constants.h @@ -20,7 +20,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_ #include "defines.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" /* high pass filters */ diff --git a/webrtc/modules/audio_coding/codecs/ilbc/defines.h b/webrtc/modules/audio_coding/codecs/ilbc/defines.h index b60eaf481..796d7b586 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/defines.h +++ b/webrtc/modules/audio_coding/codecs/ilbc/defines.h @@ -18,9 +18,9 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_ -#include "typedefs.h" -#include "signal_processing_library.h" #include +#include "signal_processing_library.h" +#include "webrtc/typedefs.h" /* general codec settings */ diff --git a/webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h b/webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h index 9ab2e86a9..ccb3f5e3e 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h +++ b/webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h @@ -22,7 +22,7 @@ * Define the fixpoint numeric formats */ -#include "typedefs.h" +#include "webrtc/typedefs.h" /* * Solution to support multiple instances diff --git a/webrtc/modules/audio_coding/codecs/ilbc/vq3.h b/webrtc/modules/audio_coding/codecs/ilbc/vq3.h index e2e2ab525..b146ea3d8 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/vq3.h +++ b/webrtc/modules/audio_coding/codecs/ilbc/vq3.h @@ -19,7 +19,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" /*----------------------------------------------------------------* * Vector quantization of order 3 (based on MSE) diff --git a/webrtc/modules/audio_coding/codecs/ilbc/vq4.h b/webrtc/modules/audio_coding/codecs/ilbc/vq4.h index 5ae4c8747..926375936 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/vq4.h +++ b/webrtc/modules/audio_coding/codecs/ilbc/vq4.h @@ -19,7 +19,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" /*----------------------------------------------------------------* * Vector quantization of order 4 (based on MSE) diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h b/webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h index da7163e99..7cd295440 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h +++ b/webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h @@ -14,8 +14,7 @@ /* * Define the fixpoint numeric formats */ -#include "typedefs.h" - +#include "webrtc/typedefs.h" typedef struct { void *dummy; diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c index a66a43ef9..599f8f053 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" -#include "modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" // MIPS optimization of the function WebRtcIsacfix_MatrixProduct1. // Bit-exact with the function WebRtcIsacfix_MatrixProduct1C from diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h index 7a5f7462f..2aa587fc0 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h index 9a888e4fc..c96fb05b8 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h @@ -19,7 +19,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c index 3be2b151f..e855daea3 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c @@ -15,17 +15,17 @@ * */ -#include "modules/audio_coding/codecs/isac/fix/interface/isacfix.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h" #include -#include "modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h" -#include "modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" -#include "modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" -#include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" -#include "modules/audio_coding/codecs/isac/fix/source/structs.h" -#include "system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h" +#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" // Declare function pointers. FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix; diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c index d5b2d0e91..d7d198caf 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c @@ -16,7 +16,7 @@ #include "settings.h" #include "signal_processing_library.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" /* Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients * cth_Q15[] and sth_Q15[]. diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h index 587bcd473..7e8121e83 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h @@ -18,8 +18,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ -#include "typedefs.h" - +#include "webrtc/typedefs.h" /* indices of KLT coefficients used */ extern const uint16_t WebRtcIsacfix_kSelIndGain[12]; diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c index d3c90b3f0..5b1b3f17a 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "common_audio/signal_processing/include/signal_processing_library.h" -#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" +#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" /* Filter coefficicients in Q15. */ static const int16_t kDampFilter[PITCH_DAMPORDER] = { diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h index c4e0be594..4aab2b6c4 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h @@ -18,8 +18,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ -#include "typedefs.h" - +#include "webrtc/typedefs.h" /********************* Pitch Filter Gain Coefficient Tables ************************/ /* cdf for quantized pitch filter gains */ diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h index bb8b39ac5..a5478b2eb 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h @@ -18,9 +18,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ - -#include "typedefs.h" - +#include "webrtc/typedefs.h" /********************* Pitch Filter Lag Coefficient Tables ************************/ diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h index 115509af0..55832063f 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h @@ -19,9 +19,8 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ -#include "typedefs.h" #include "settings.h" - +#include "webrtc/typedefs.h" /********************* AR Coefficient Tables ************************/ /* cdf for quantized reflection coefficient 1 */ diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h index bd20ba016..1777efde5 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h @@ -19,9 +19,9 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_ -#include "common_audio/signal_processing/include/signal_processing_library.h" -#include "modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "typedefs.h" +#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" +#include "webrtc/typedefs.h" /* Bitstream struct for decoder */ typedef struct Bitstreamstruct_dec { diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/crc.h b/webrtc/modules/audio_coding/codecs/isac/main/source/crc.h index dba87493a..19d1bf31d 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/crc.h +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/crc.h @@ -18,7 +18,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" /**************************************************************************** * WebRtcIsac_GetCrc(...) diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c b/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c index 67e77b53f..d59f7489e 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c @@ -17,16 +17,16 @@ */ #include "encode_lpc_swb.h" -#include "typedefs.h" -#include "settings.h" - -#include "lpc_shape_swb12_tables.h" -#include "lpc_shape_swb16_tables.h" -#include "lpc_gain_swb_tables.h" +#include #include #include -#include + +#include "lpc_gain_swb_tables.h" +#include "lpc_shape_swb12_tables.h" +#include "lpc_shape_swb16_tables.h" +#include "settings.h" +#include "webrtc/typedefs.h" /****************************************************************************** * WebRtcIsac_RemoveLarMean() diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h b/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h index eab98c157..3dd2311ba 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h @@ -19,10 +19,9 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_ -#include "typedefs.h" #include "settings.h" #include "structs.h" - +#include "webrtc/typedefs.h" /****************************************************************************** * WebRtcIsac_RemoveLarMean() diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c index 8ce004b28..5cc6c11c7 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c @@ -18,7 +18,7 @@ #include "lpc_gain_swb_tables.h" #include "settings.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" const double WebRtcIsac_kQSizeLpcGain = 0.100000; diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h index 121d05e7d..c163f4ab5 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h @@ -20,7 +20,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_ #include "settings.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" extern const double WebRtcIsac_kQSizeLpcGain; diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c index 2c5698fbb..599b89d8a 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c @@ -18,7 +18,7 @@ #include "lpc_shape_swb12_tables.h" #include "settings.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" /* * Mean value of LAR diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h index cef885a7f..256f1d4a7 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h @@ -20,7 +20,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_ #include "settings.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" extern const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER]; diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c index 0f567ed7d..6176d2cf7 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c @@ -18,7 +18,7 @@ #include "lpc_shape_swb16_tables.h" #include "settings.h" -#include "typedefs.h" +#include "webrtc/typedefs.h" /* * Mean value of LAR diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h index a4b3a59f4..3e1bdf71d 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h @@ -20,8 +20,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_ #include "settings.h" -#include "typedefs.h" - +#include "webrtc/typedefs.h" extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER]; diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h b/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h index 891c67ccd..2b446e932 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h @@ -13,7 +13,7 @@ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_ #include -#include "typedefs.h" +#include "webrtc/typedefs.h" #if defined(WEBRTC_POSIX) #define WebRtcIsac_lrint lrint diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h index e7518b168..8d708ce68 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h @@ -18,7 +18,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" /* header file for coding tables for the pitch filter side-info in the entropy coder */ /********************* Pitch Filter Gain Coefficient Tables ************************/ diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h index 7c72571ff..01989f018 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h @@ -18,7 +18,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" /* header file for coding tables for the pitch filter side-info in the entropy coder */ /********************* Pitch Filter Lag Coefficient Tables ************************/ diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h b/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h index 9db65ddab..9c96b8304 100644 --- a/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h +++ b/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h @@ -14,7 +14,7 @@ * Define the fixpoint numeric formats */ -#include "typedefs.h" +#include "webrtc/typedefs.h" #ifdef __cplusplus extern "C" { diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c index 3ade03724..af6720f63 100644 --- a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c +++ b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c @@ -16,7 +16,7 @@ #include #endif -#include "typedefs.h" +#include "webrtc/typedefs.h" #define HIGHEND 0xFF00 #define LOWEND 0xFF diff --git a/webrtc/modules/audio_coding/main/test/TimedTrace.h b/webrtc/modules/audio_coding/main/test/TimedTrace.h index 237b329e7..ef9609a26 100644 --- a/webrtc/modules/audio_coding/main/test/TimedTrace.h +++ b/webrtc/modules/audio_coding/main/test/TimedTrace.h @@ -11,7 +11,7 @@ #ifndef TIMED_TRACE_H #define TIMED_TRACE_H -#include "typedefs.h" +#include "webrtc/typedefs.h" #include #include