diff --git a/BUILD.gn b/BUILD.gn index d337738931..09770a9484 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -384,22 +384,11 @@ if (!build_with_chromium) { } } -rtc_source_set("typedefs") { - sources = [ - "typedefs.h", - ] - deps = [ - "rtc_base/system:arch", - "rtc_base/system:unused", - ] -} - rtc_source_set("webrtc_common") { sources = [ "common_types.h", ] deps = [ - ":typedefs", "api:array_view", "api/video:video_bitrate_allocation", "rtc_base:checks", diff --git a/api/BUILD.gn b/api/BUILD.gn index e385c3ca21..e50e34d8c4 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -111,7 +111,6 @@ rtc_static_library("libjingle_peerconnection_api") { # Basically, don't add stuff here. You might break sensitive downstream # targets like pnacl. API should not depend on anything outside of this # file, really. All these should arguably go away in time. - "..:typedefs", "..:webrtc_common", "../logging:rtc_event_log_api", "../media:rtc_media_config", diff --git a/api/audio/BUILD.gn b/api/audio/BUILD.gn index 701be9ce0e..286a5a6f1c 100644 --- a/api/audio/BUILD.gn +++ b/api/audio/BUILD.gn @@ -16,7 +16,6 @@ rtc_source_set("audio_frame_api") { ] deps = [ - "../../:typedefs", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", ] diff --git a/api/audio/audio_frame.h b/api/audio/audio_frame.h index 4c9aa9ccad..cc078771fa 100644 --- a/api/audio/audio_frame.h +++ b/api/audio/audio_frame.h @@ -12,9 +12,9 @@ #define API_AUDIO_AUDIO_FRAME_H_ #include +#include #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/api/audio_codecs/BUILD.gn b/api/audio_codecs/BUILD.gn index 7895a937cd..8e6a0f3522 100644 --- a/api/audio_codecs/BUILD.gn +++ b/api/audio_codecs/BUILD.gn @@ -31,7 +31,6 @@ rtc_source_set("audio_codecs_api") { deps = [ "..:array_view", "../..:webrtc_common", - "../../:typedefs", "../../rtc_base:checks", "../../rtc_base:deprecation", "../../rtc_base:rtc_base_approved", diff --git a/api/audio_codecs/audio_decoder.h b/api/audio_codecs/audio_decoder.h index 4852ad71e6..9a955a6ecc 100644 --- a/api/audio_codecs/audio_decoder.h +++ b/api/audio_codecs/audio_decoder.h @@ -18,7 +18,6 @@ #include "api/array_view.h" #include "rtc_base/buffer.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/api/audio_codecs/audio_encoder.h b/api/audio_codecs/audio_encoder.h index 25094013c3..6a1f6534b2 100644 --- a/api/audio_codecs/audio_encoder.h +++ b/api/audio_codecs/audio_encoder.h @@ -20,7 +20,6 @@ #include "api/array_view.h" #include "rtc_base/buffer.h" #include "rtc_base/deprecation.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/api/rtp_headers.h b/api/rtp_headers.h index ded6c4b649..c0b22cc101 100644 --- a/api/rtp_headers.h +++ b/api/rtp_headers.h @@ -25,7 +25,6 @@ #include "common_types.h" // NOLINT(build/include) #include "rtc_base/checks.h" #include "rtc_base/deprecation.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn index b13d84eaf0..f9c33ab02a 100644 --- a/api/video/BUILD.gn +++ b/api/video/BUILD.gn @@ -84,7 +84,6 @@ rtc_source_set("video_bitrate_allocation") { "video_bitrate_allocation.h", ] deps = [ - "../..:typedefs", "../../rtc_base:checks", "../../rtc_base:safe_conversions", "../../rtc_base:stringutils", diff --git a/api/video/video_bitrate_allocation.h b/api/video/video_bitrate_allocation.h index ce6173408f..9e2501d85a 100644 --- a/api/video/video_bitrate_allocation.h +++ b/api/video/video_bitrate_allocation.h @@ -16,7 +16,6 @@ #include #include "absl/types/optional.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/audio/utility/BUILD.gn b/audio/utility/BUILD.gn index fe39b7f1a0..76c09a51a3 100644 --- a/audio/utility/BUILD.gn +++ b/audio/utility/BUILD.gn @@ -22,7 +22,6 @@ rtc_static_library("audio_frame_operations") { deps = [ "../..:webrtc_common", - "../../:typedefs", "../../api/audio:audio_frame_api", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", diff --git a/audio/utility/audio_frame_operations.h b/audio/utility/audio_frame_operations.h index 65a2bad9c7..599352356f 100644 --- a/audio/utility/audio_frame_operations.h +++ b/audio/utility/audio_frame_operations.h @@ -14,7 +14,6 @@ #include #include "api/audio/audio_frame.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/call/BUILD.gn b/call/BUILD.gn index b23e7513d2..45d6ef16c3 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -30,7 +30,6 @@ rtc_source_set("call_interfaces") { ":rtp_interfaces", ":video_stream_api", "..:webrtc_common", - "../:typedefs", "../api:fec_controller_api", "../api:libjingle_peerconnection_api", "../api:transport_api", @@ -236,7 +235,6 @@ rtc_source_set("video_stream_api") { ] deps = [ ":rtp_interfaces", - "../:typedefs", "../:webrtc_common", "../api:libjingle_peerconnection_api", "../api:transport_api", @@ -258,7 +256,6 @@ rtc_source_set("fake_network") { ] deps = [ ":call_interfaces", - "..:typedefs", "..:webrtc_common", "../api:simulated_network_api", "../api:transport_api", diff --git a/call/audio_receive_stream.h b/call/audio_receive_stream.h index 56c900b03c..9595a293da 100644 --- a/call/audio_receive_stream.h +++ b/call/audio_receive_stream.h @@ -24,7 +24,6 @@ #include "call/rtp_config.h" #include "common_types.h" // NOLINT(build/include) #include "rtc_base/scoped_ref_ptr.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { class AudioSinkInterface; diff --git a/call/audio_send_stream.h b/call/audio_send_stream.h index 3b4a939b25..60909ae128 100644 --- a/call/audio_send_stream.h +++ b/call/audio_send_stream.h @@ -25,7 +25,6 @@ #include "call/rtp_config.h" #include "modules/audio_processing/include/audio_processing_statistics.h" #include "rtc_base/scoped_ref_ptr.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/call/fake_network_pipe.h b/call/fake_network_pipe.h index 866c5504d6..d7c042dc84 100644 --- a/call/fake_network_pipe.h +++ b/call/fake_network_pipe.h @@ -28,7 +28,6 @@ #include "rtc_base/criticalsection.h" #include "rtc_base/random.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn index 465bf9cb0e..7b5de0c17a 100644 --- a/common_audio/BUILD.gn +++ b/common_audio/BUILD.gn @@ -55,12 +55,12 @@ rtc_static_library("common_audio") { ":fft4g", ":sinc_resampler", "..:webrtc_common", - "../:typedefs", "../rtc_base:checks", "../rtc_base:gtest_prod", "../rtc_base:rtc_base_approved", "../rtc_base/memory:aligned_array", "../rtc_base/memory:aligned_malloc", + "../rtc_base/system:arch", "../system_wrappers", "../system_wrappers:cpu_features_api", "//third_party/abseil-cpp/absl/types:optional", @@ -192,11 +192,11 @@ rtc_source_set("common_audio_c") { ":common_audio_cc", ":fft4g", "..:webrtc_common", - "../:typedefs", "../rtc_base:checks", "../rtc_base:compile_assert_c", "../rtc_base:rtc_base_approved", "../rtc_base:sanitizer", + "../rtc_base/system:arch", "../system_wrappers", "../system_wrappers:cpu_features_api", ] @@ -218,7 +218,6 @@ rtc_source_set("common_audio_cc") { deps = [ "..:webrtc_common", - "../:typedefs", "../rtc_base:rtc_base_approved", "../system_wrappers", ] @@ -230,10 +229,10 @@ rtc_source_set("sinc_resampler") { ] deps = [ "..:webrtc_common", - "../:typedefs", "../rtc_base:gtest_prod", "../rtc_base:rtc_base_approved", "../rtc_base/memory:aligned_malloc", + "../rtc_base/system:arch", "../system_wrappers", ] } @@ -257,6 +256,7 @@ rtc_source_set("fir_filter_factory") { ":fir_filter", "../rtc_base:checks", "../rtc_base:rtc_base_approved", + "../rtc_base/system:arch", "../system_wrappers:cpu_features_api", ] if (current_cpu == "x86" || current_cpu == "x64") { @@ -353,6 +353,7 @@ if (rtc_build_with_neon) { ":common_audio_c", "../rtc_base:checks", "../rtc_base:rtc_base_approved", + "../rtc_base/system:arch", ] } } @@ -404,10 +405,10 @@ if (rtc_include_tests) { ":fir_filter_factory", ":sinc_resampler", "..:webrtc_common", - "../:typedefs", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_utils", + "../rtc_base/system:arch", "../system_wrappers:cpu_features_api", "../test:fileutils", "../test:test_main", diff --git a/common_audio/audio_util.cc b/common_audio/audio_util.cc index b442a146f7..735ba5f188 100644 --- a/common_audio/audio_util.cc +++ b/common_audio/audio_util.cc @@ -10,8 +10,6 @@ #include "common_audio/include/audio_util.h" -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { void FloatToS16(const float* src, size_t size, int16_t* dest) { diff --git a/common_audio/audio_util_unittest.cc b/common_audio/audio_util_unittest.cc index 230669ed1e..cf85a2d46c 100644 --- a/common_audio/audio_util_unittest.cc +++ b/common_audio/audio_util_unittest.cc @@ -13,7 +13,6 @@ #include "rtc_base/arraysize.h" #include "test/gmock.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace { diff --git a/common_audio/fir_filter_factory.cc b/common_audio/fir_filter_factory.cc index c15c2e0c26..3243b27ef9 100644 --- a/common_audio/fir_filter_factory.cc +++ b/common_audio/fir_filter_factory.cc @@ -12,6 +12,7 @@ #include "common_audio/fir_filter_c.h" #include "rtc_base/checks.h" +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" #if defined(WEBRTC_HAS_NEON) diff --git a/common_audio/include/audio_util.h b/common_audio/include/audio_util.h index e4ea9a1a33..de242a49be 100644 --- a/common_audio/include/audio_util.h +++ b/common_audio/include/audio_util.h @@ -17,7 +17,6 @@ #include #include "rtc_base/checks.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/common_audio/resampler/include/push_resampler.h b/common_audio/resampler/include/push_resampler.h index 05b93d1909..082cdc6284 100644 --- a/common_audio/resampler/include/push_resampler.h +++ b/common_audio/resampler/include/push_resampler.h @@ -13,8 +13,6 @@ #include -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { class PushSincResampler; diff --git a/common_audio/resampler/include/resampler.h b/common_audio/resampler/include/resampler.h index f923b464d8..04c487b331 100644 --- a/common_audio/resampler/include/resampler.h +++ b/common_audio/resampler/include/resampler.h @@ -16,8 +16,7 @@ #define COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_ #include - -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { diff --git a/common_audio/resampler/push_sinc_resampler.h b/common_audio/resampler/push_sinc_resampler.h index ad51471294..1ffe73f79b 100644 --- a/common_audio/resampler/push_sinc_resampler.h +++ b/common_audio/resampler/push_sinc_resampler.h @@ -15,7 +15,6 @@ #include "common_audio/resampler/sinc_resampler.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/common_audio/resampler/push_sinc_resampler_unittest.cc b/common_audio/resampler/push_sinc_resampler_unittest.cc index 487a09fc8a..2f53a745ae 100644 --- a/common_audio/resampler/push_sinc_resampler_unittest.cc +++ b/common_audio/resampler/push_sinc_resampler_unittest.cc @@ -19,7 +19,6 @@ #include "rtc_base/timeutils.h" #include "test/gmock.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace { diff --git a/common_audio/resampler/sinc_resampler.cc b/common_audio/resampler/sinc_resampler.cc index c3d1ea466a..5aa2061ab7 100644 --- a/common_audio/resampler/sinc_resampler.cc +++ b/common_audio/resampler/sinc_resampler.cc @@ -93,8 +93,8 @@ #include #include "rtc_base/checks.h" +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/common_audio/resampler/sinc_resampler.h b/common_audio/resampler/sinc_resampler.h index 6306bc9169..8a833ce88c 100644 --- a/common_audio/resampler/sinc_resampler.h +++ b/common_audio/resampler/sinc_resampler.h @@ -19,7 +19,7 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/gtest_prod_util.h" #include "rtc_base/memory/aligned_malloc.h" -#include "typedefs.h" // NOLINT(build/include) +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/common_audio/resampler/sinc_resampler_unittest.cc b/common_audio/resampler/sinc_resampler_unittest.cc index 90bdf31369..eb5424d54e 100644 --- a/common_audio/resampler/sinc_resampler_unittest.cc +++ b/common_audio/resampler/sinc_resampler_unittest.cc @@ -23,6 +23,7 @@ #include "common_audio/resampler/sinc_resampler.h" #include "common_audio/resampler/sinusoidal_linear_chirp_source.h" #include "rtc_base/stringize_macros.h" +#include "rtc_base/system/arch.h" #include "rtc_base/timeutils.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gmock.h" diff --git a/common_audio/signal_processing/complex_fft.c b/common_audio/signal_processing/complex_fft.c index e2ac206925..ddc9a97b59 100644 --- a/common_audio/signal_processing/complex_fft.c +++ b/common_audio/signal_processing/complex_fft.c @@ -17,6 +17,7 @@ #include "common_audio/signal_processing/complex_fft_tables.h" #include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/system/arch.h" #define CFFTSFT 14 #define CFFTRND 1 diff --git a/common_audio/signal_processing/complex_fft_tables.h b/common_audio/signal_processing/complex_fft_tables.h index 5171040f5d..90fac072d2 100644 --- a/common_audio/signal_processing/complex_fft_tables.h +++ b/common_audio/signal_processing/complex_fft_tables.h @@ -11,7 +11,7 @@ #ifndef COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_ #define COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_ -#include "typedefs.h" // NOLINT(build/include) +#include static const int16_t kSinTable1024[] = { 0, 201, 402, 603, 804, 1005, 1206, 1406, 1607, diff --git a/common_audio/signal_processing/cross_correlation_neon.c b/common_audio/signal_processing/cross_correlation_neon.c index fdd03f1976..f2afbdf9f5 100644 --- a/common_audio/signal_processing/cross_correlation_neon.c +++ b/common_audio/signal_processing/cross_correlation_neon.c @@ -9,6 +9,7 @@ */ #include "common_audio/signal_processing/include/signal_processing_library.h" +#include "rtc_base/system/arch.h" #include diff --git a/common_audio/signal_processing/dot_product_with_scale.h b/common_audio/signal_processing/dot_product_with_scale.h index ff3c525066..bb892d40cb 100644 --- a/common_audio/signal_processing/dot_product_with_scale.h +++ b/common_audio/signal_processing/dot_product_with_scale.h @@ -11,10 +11,9 @@ #ifndef COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_ #define COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_ +#include #include -#include "typedefs.h" // NOLINT(build/include) - #ifdef __cplusplus extern "C" { #endif diff --git a/common_audio/signal_processing/include/real_fft.h b/common_audio/signal_processing/include/real_fft.h index 8da243da30..84450667d1 100644 --- a/common_audio/signal_processing/include/real_fft.h +++ b/common_audio/signal_processing/include/real_fft.h @@ -11,7 +11,7 @@ #ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_ #define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_ -#include "typedefs.h" // NOLINT(build/include) +#include // For ComplexFFT(), the maximum fft order is 10; // WebRTC APM uses orders of only 7 and 8. diff --git a/common_audio/signal_processing/include/signal_processing_library.h b/common_audio/signal_processing/include/signal_processing_library.h index 4d6edbf88e..72aabe3883 100644 --- a/common_audio/signal_processing/include/signal_processing_library.h +++ b/common_audio/signal_processing/include/signal_processing_library.h @@ -19,7 +19,6 @@ #include #include "common_audio/signal_processing/dot_product_with_scale.h" -#include "typedefs.h" // NOLINT(build/include) // Macros specific for the fixed point implementation #define WEBRTC_SPL_WORD16_MAX 32767 diff --git a/common_audio/signal_processing/real_fft_unittest.cc b/common_audio/signal_processing/real_fft_unittest.cc index 2d6b7d1b86..3b4312381a 100644 --- a/common_audio/signal_processing/real_fft_unittest.cc +++ b/common_audio/signal_processing/real_fft_unittest.cc @@ -11,7 +11,6 @@ #include "common_audio/signal_processing/include/real_fft.h" #include "common_audio/signal_processing/include/signal_processing_library.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace { diff --git a/common_audio/signal_processing/resample_by_2_internal.h b/common_audio/signal_processing/resample_by_2_internal.h index 5483e2ebca..145395a4cb 100644 --- a/common_audio/signal_processing/resample_by_2_internal.h +++ b/common_audio/signal_processing/resample_by_2_internal.h @@ -16,7 +16,7 @@ #ifndef COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_ #define COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /******************************************************************* * resample_by_2_fast.c diff --git a/common_audio/vad/include/vad.h b/common_audio/vad/include/vad.h index bd10756c99..b15275b166 100644 --- a/common_audio/vad/include/vad.h +++ b/common_audio/vad/include/vad.h @@ -15,7 +15,6 @@ #include "common_audio/vad/include/webrtc_vad.h" #include "rtc_base/checks.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/common_audio/vad/include/webrtc_vad.h b/common_audio/vad/include/webrtc_vad.h index a6c539cf79..f5bbadf5b7 100644 --- a/common_audio/vad/include/webrtc_vad.h +++ b/common_audio/vad/include/webrtc_vad.h @@ -17,8 +17,7 @@ #define COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_ #include - -#include "typedefs.h" // NOLINT(build/include) +#include typedef struct WebRtcVadInst VadInst; diff --git a/common_audio/vad/vad_core.c b/common_audio/vad/vad_core.c index 7316b45ce8..55927cea40 100644 --- a/common_audio/vad/vad_core.c +++ b/common_audio/vad/vad_core.c @@ -15,7 +15,6 @@ #include "common_audio/vad/vad_filterbank.h" #include "common_audio/vad/vad_gmm.h" #include "common_audio/vad/vad_sp.h" -#include "typedefs.h" // NOLINT(build/include) // Spectrum Weighting static const int16_t kSpectrumWeight[kNumChannels] = { 6, 8, 10, 12, 14, 16 }; diff --git a/common_audio/vad/vad_core.h b/common_audio/vad/vad_core.h index 0eb8de3d1d..e79696cef0 100644 --- a/common_audio/vad/vad_core.h +++ b/common_audio/vad/vad_core.h @@ -16,7 +16,6 @@ #define COMMON_AUDIO_VAD_VAD_CORE_H_ #include "common_audio/signal_processing/include/signal_processing_library.h" -#include "typedefs.h" // NOLINT(build/include) enum { kNumChannels = 6 }; // Number of frequency bands (named channels). enum { kNumGaussians = 2 }; // Number of Gaussians per channel in the GMM. diff --git a/common_audio/vad/vad_core_unittest.cc b/common_audio/vad/vad_core_unittest.cc index 0587878105..3131a86ae3 100644 --- a/common_audio/vad/vad_core_unittest.cc +++ b/common_audio/vad/vad_core_unittest.cc @@ -12,7 +12,6 @@ #include "common_audio/vad/vad_unittest.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) extern "C" { #include "common_audio/vad/vad_core.h" diff --git a/common_audio/vad/vad_filterbank.c b/common_audio/vad/vad_filterbank.c index 82cff25c36..1513153c48 100644 --- a/common_audio/vad/vad_filterbank.c +++ b/common_audio/vad/vad_filterbank.c @@ -12,7 +12,6 @@ #include "rtc_base/checks.h" #include "common_audio/signal_processing/include/signal_processing_library.h" -#include "typedefs.h" // NOLINT(build/include) // Constants used in LogOfEnergy(). static const int16_t kLogConst = 24660; // 160*log10(2) in Q9. diff --git a/common_audio/vad/vad_filterbank.h b/common_audio/vad/vad_filterbank.h index 60b785bed9..53bbbe10fd 100644 --- a/common_audio/vad/vad_filterbank.h +++ b/common_audio/vad/vad_filterbank.h @@ -16,7 +16,6 @@ #define COMMON_AUDIO_VAD_VAD_FILTERBANK_H_ #include "common_audio/vad/vad_core.h" -#include "typedefs.h" // NOLINT(build/include) // Takes |data_length| samples of |data_in| and calculates the logarithm of the // energy of each of the |kNumChannels| = 6 frequency bands used by the VAD: diff --git a/common_audio/vad/vad_filterbank_unittest.cc b/common_audio/vad/vad_filterbank_unittest.cc index b80004424b..51d8d0fefd 100644 --- a/common_audio/vad/vad_filterbank_unittest.cc +++ b/common_audio/vad/vad_filterbank_unittest.cc @@ -12,7 +12,6 @@ #include "common_audio/vad/vad_unittest.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) extern "C" { #include "common_audio/vad/vad_core.h" diff --git a/common_audio/vad/vad_gmm.c b/common_audio/vad/vad_gmm.c index b746fd5364..ddc87b6edd 100644 --- a/common_audio/vad/vad_gmm.c +++ b/common_audio/vad/vad_gmm.c @@ -11,7 +11,6 @@ #include "common_audio/vad/vad_gmm.h" #include "common_audio/signal_processing/include/signal_processing_library.h" -#include "typedefs.h" // NOLINT(build/include) static const int32_t kCompVar = 22005; static const int16_t kLog2Exp = 5909; // log2(exp(1)) in Q12. diff --git a/common_audio/vad/vad_gmm.h b/common_audio/vad/vad_gmm.h index 79f15c8957..6b2d11ba33 100644 --- a/common_audio/vad/vad_gmm.h +++ b/common_audio/vad/vad_gmm.h @@ -13,7 +13,7 @@ #ifndef COMMON_AUDIO_VAD_VAD_GMM_H_ #define COMMON_AUDIO_VAD_VAD_GMM_H_ -#include "typedefs.h" // NOLINT(build/include) +#include // Calculates the probability for |input|, given that |input| comes from a // normal distribution with mean and standard deviation (|mean|, |std|). diff --git a/common_audio/vad/vad_gmm_unittest.cc b/common_audio/vad/vad_gmm_unittest.cc index e77603d6ec..be61f7f971 100644 --- a/common_audio/vad/vad_gmm_unittest.cc +++ b/common_audio/vad/vad_gmm_unittest.cc @@ -10,7 +10,6 @@ #include "common_audio/vad/vad_unittest.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) extern "C" { #include "common_audio/vad/vad_gmm.h" diff --git a/common_audio/vad/vad_sp.c b/common_audio/vad/vad_sp.c index 915fb37520..d367c8b0af 100644 --- a/common_audio/vad/vad_sp.c +++ b/common_audio/vad/vad_sp.c @@ -13,7 +13,6 @@ #include "rtc_base/checks.h" #include "common_audio/signal_processing/include/signal_processing_library.h" #include "common_audio/vad/vad_core.h" -#include "typedefs.h" // NOLINT(build/include) // Allpass filter coefficients, upper and lower, in Q13. // Upper: 0.64, Lower: 0.17. diff --git a/common_audio/vad/vad_sp.h b/common_audio/vad/vad_sp.h index 8586ccd590..ff367603c5 100644 --- a/common_audio/vad/vad_sp.h +++ b/common_audio/vad/vad_sp.h @@ -14,7 +14,6 @@ #define COMMON_AUDIO_VAD_VAD_SP_H_ #include "common_audio/vad/vad_core.h" -#include "typedefs.h" // NOLINT(build/include) // Downsamples the signal by a factor 2, eg. 32->16 or 16->8. // diff --git a/common_audio/vad/vad_sp_unittest.cc b/common_audio/vad/vad_sp_unittest.cc index ebe25cffce..cdde56d1ca 100644 --- a/common_audio/vad/vad_sp_unittest.cc +++ b/common_audio/vad/vad_sp_unittest.cc @@ -12,7 +12,6 @@ #include "common_audio/vad/vad_unittest.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) extern "C" { #include "common_audio/vad/vad_core.h" diff --git a/common_audio/vad/vad_unittest.cc b/common_audio/vad/vad_unittest.cc index 1cef8e9949..c54014efce 100644 --- a/common_audio/vad/vad_unittest.cc +++ b/common_audio/vad/vad_unittest.cc @@ -17,7 +17,6 @@ #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) VadTest::VadTest() {} diff --git a/common_audio/vad/vad_unittest.h b/common_audio/vad/vad_unittest.h index 5521983fe7..ee642063af 100644 --- a/common_audio/vad/vad_unittest.h +++ b/common_audio/vad/vad_unittest.h @@ -14,7 +14,6 @@ #include // size_t #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/common_audio/vad/webrtc_vad.c b/common_audio/vad/webrtc_vad.c index 7fc4d65ed2..d8457eeebe 100644 --- a/common_audio/vad/webrtc_vad.c +++ b/common_audio/vad/webrtc_vad.c @@ -15,7 +15,6 @@ #include "common_audio/signal_processing/include/signal_processing_library.h" #include "common_audio/vad/vad_core.h" -#include "typedefs.h" // NOLINT(build/include) static const int kInitCheck = 42; static const int kValidRates[] = { 8000, 16000, 32000, 48000 }; diff --git a/common_audio/wav_file.cc b/common_audio/wav_file.cc index 21b64a8d30..008891f9cf 100644 --- a/common_audio/wav_file.cc +++ b/common_audio/wav_file.cc @@ -19,6 +19,7 @@ #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/common_audio/wav_header.cc b/common_audio/wav_header.cc index d093fa011c..8fc5fef508 100644 --- a/common_audio/wav_header.cc +++ b/common_audio/wav_header.cc @@ -21,6 +21,7 @@ #include "common_audio/include/audio_util.h" #include "rtc_base/checks.h" +#include "rtc_base/system/arch.h" namespace webrtc { namespace { diff --git a/common_types.h b/common_types.h index 919a947962..b936e377c3 100644 --- a/common_types.h +++ b/common_types.h @@ -21,7 +21,6 @@ #include "api/video/video_bitrate_allocation.h" #include "rtc_base/checks.h" #include "rtc_base/deprecation.h" -#include "typedefs.h" // NOLINT(build/include) #if defined(_MSC_VER) // Disable "new behavior: elements of array will be default initialized" diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn index 4cca478995..5bc4eb4ad3 100644 --- a/common_video/BUILD.gn +++ b/common_video/BUILD.gn @@ -43,7 +43,6 @@ rtc_static_library("common_video") { deps = [ "..:webrtc_common", - "../:typedefs", "../api/video:video_bitrate_allocation", "../api/video:video_bitrate_allocator", "../api/video:video_frame", diff --git a/common_video/include/video_frame.h b/common_video/include/video_frame.h index 2053ea488e..ccb709f7bc 100644 --- a/common_video/include/video_frame.h +++ b/common_video/include/video_frame.h @@ -21,7 +21,6 @@ #include "api/video/video_rotation.h" #include "api/video/video_timing.h" #include "common_types.h" // NOLINT(build/include) -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/common_video/libyuv/include/webrtc_libyuv.h b/common_video/libyuv/include/webrtc_libyuv.h index 6eff537ba1..4cbfec2018 100644 --- a/common_video/libyuv/include/webrtc_libyuv.h +++ b/common_video/libyuv/include/webrtc_libyuv.h @@ -20,7 +20,6 @@ #include "api/video/video_frame.h" #include "common_types.h" // NOLINT(build/include) // VideoTypes. -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/logging/BUILD.gn b/logging/BUILD.gn index 85215e035c..8636cf722e 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -66,7 +66,6 @@ rtc_source_set("rtc_event_pacing") { deps = [ ":rtc_event_log_api", - "../:typedefs", "../rtc_base:ptr_util", "//third_party/abseil-cpp/absl/memory", ] diff --git a/modules/BUILD.gn b/modules/BUILD.gn index 0109cf219d..e1c1f3a3e6 100644 --- a/modules/BUILD.gn +++ b/modules/BUILD.gn @@ -36,7 +36,6 @@ rtc_source_set("module_api_public") { ] deps = [ "..:webrtc_common", - "../:typedefs", "//third_party/abseil-cpp/absl/types:optional", ] } @@ -51,7 +50,6 @@ rtc_source_set("module_api") { ":module_api_public", ":module_fec_api", "..:webrtc_common", - "../:typedefs", "../api:libjingle_peerconnection_api", "../api/transport:network_control", "../api/video:video_frame", diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index 7ab2592123..5dc93d36e3 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -66,7 +66,6 @@ rtc_static_library("rent_a_codec") { "acm2/rent_a_codec.h", ] deps = [ - "../..:typedefs", "../../rtc_base:checks", "../../api:array_view", "//third_party/abseil-cpp/absl/types:optional", @@ -89,7 +88,6 @@ rtc_source_set("audio_coding_module_typedefs") { "include/audio_coding_module_typedefs.h", ] deps = [ - "../..:typedefs", "../..:webrtc_common", ] } @@ -122,7 +120,6 @@ rtc_static_library("audio_coding") { "../../api/audio:audio_frame_api", "..:module_api", "../../common_audio:common_audio_c", - "../..:typedefs", "../../rtc_base:deprecation", "../../rtc_base:checks", "../../system_wrappers:metrics_api", @@ -161,7 +158,6 @@ rtc_static_library("cng") { ] deps = [ - "../..:typedefs", "../..:webrtc_common", "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", @@ -215,7 +211,6 @@ rtc_source_set("g711_c") { "codecs/g711/g711_interface.h", ] deps = [ - "../..:typedefs", "../..:webrtc_common", "../third_party/g711:g711_3p", ] @@ -251,7 +246,6 @@ rtc_source_set("g722_c") { "codecs/g722/g722_interface.h", ] deps = [ - "../..:typedefs", "../..:webrtc_common", "../third_party/g722:g722_3p", ] @@ -426,7 +420,6 @@ rtc_source_set("ilbc_c") { ] deps = [ - "../..:typedefs", "../..:webrtc_common", "../../api/audio_codecs:audio_codecs_api", "../../common_audio", @@ -434,6 +427,8 @@ rtc_source_set("ilbc_c") { "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base:sanitizer", + "../../rtc_base/system:arch", + "../../rtc_base/system:unused", ] } @@ -449,7 +444,6 @@ rtc_static_library("isac_common") { ] deps = [ ":isac_bwinfo", - "../..:typedefs", "../..:webrtc_common", "../../api/audio_codecs:audio_codecs_api", "../../rtc_base:checks", @@ -481,9 +475,7 @@ rtc_source_set("isac_bwinfo") { sources = [ "codecs/isac/bandwidth_info.h", ] - deps = [ - "../..:typedefs", - ] + deps = [] } rtc_source_set("isac_vad") { @@ -503,8 +495,8 @@ rtc_source_set("isac_vad") { ] deps = [ ":isac_bwinfo", - "../..:typedefs", "../../rtc_base:compile_assert_c", + "../../rtc_base/system:arch", "../../rtc_base/system:ignore_warnings", ] } @@ -560,13 +552,13 @@ rtc_static_library("isac_c") { deps = [ ":isac_bwinfo", ":isac_vad", - "../..:typedefs", "../..:webrtc_common", "../../common_audio", "../../common_audio:common_audio_c", "../../rtc_base:checks", "../../rtc_base:compile_assert_c", "../../rtc_base:rtc_base_approved", + "../../rtc_base/system:arch", "../third_party/fft:fft", ] } @@ -608,7 +600,6 @@ rtc_source_set("isac_fix_common") { ] deps = [ ":isac_bwinfo", - "../..:typedefs", "../../common_audio", "../../common_audio:common_audio_c", ] @@ -676,7 +667,6 @@ rtc_source_set("isac_fix_c") { deps = [ ":isac_bwinfo", ":isac_common", - "../..:typedefs", "../..:webrtc_common", "../../api/audio_codecs:audio_codecs_api", "../../common_audio", @@ -800,7 +790,6 @@ rtc_source_set("pcm16b_c") { ] deps = [ - "../..:typedefs", "../..:webrtc_common", ] } @@ -862,7 +851,6 @@ rtc_source_set("webrtc_opus_c") { } deps = [ - "../..:typedefs", "../..:webrtc_common", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", @@ -1050,7 +1038,6 @@ rtc_static_library("neteq") { ":cng", ":neteq_decoder_enum", "..:module_api", - "../..:typedefs", "../..:webrtc_common", "../../api:libjingle_peerconnection_api", "../../api/audio:audio_frame_api", @@ -1093,7 +1080,6 @@ rtc_source_set("neteq_tools_minimal") { deps = [ ":neteq", - "../..:typedefs", "../..:webrtc_common", "../../api:libjingle_peerconnection_api", "../../api/audio:audio_frame_api", @@ -1132,7 +1118,6 @@ rtc_source_set("neteq_test_tools") { deps = [ ":pcm16b", - "../..:typedefs", "../..:webrtc_common", "../../api:array_view", "../../api:libjingle_peerconnection_api", @@ -1141,6 +1126,7 @@ rtc_source_set("neteq_test_tools") { "../../rtc_base:rtc_base", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_tests_utils", + "../../rtc_base/system:arch", "../../test:rtp_test_utils", "../rtp_rtcp", "../rtp_rtcp:rtp_rtcp_format", @@ -1180,7 +1166,6 @@ rtc_source_set("neteq_tools") { deps = [ "..:module_api", - "../..:typedefs", "../..:webrtc_common", "../../api:array_view", "../../api/audio_codecs:audio_codecs_api", @@ -1207,7 +1192,6 @@ rtc_source_set("neteq_input_audio_tools") { ] deps = [ - "../..:typedefs", "../..:webrtc_common", "../../common_audio", "../../rtc_base:checks", @@ -1333,7 +1317,6 @@ if (rtc_include_tests) { ":audio_format_conversion", ":pcm16b_c", "..:module_api", - "../..:typedefs", "../..:webrtc_common", "../../api/audio:audio_frame_api", "../../api/audio_codecs:builtin_audio_decoder_factory", @@ -1363,7 +1346,6 @@ if (rtc_include_tests) { deps = [ ":neteq_test_support", ":neteq_test_tools", - "../..:typedefs", "../..:webrtc_common", "../../api/audio_codecs/opus:audio_encoder_opus", "../../rtc_base:protobuf_utils", @@ -1442,7 +1424,6 @@ if (rtc_include_tests) { ":audio_coding_module_typedefs", ":audio_format_conversion", "..:module_api", - "../..:typedefs", "../../:webrtc_common", "../../api/audio:audio_frame_api", "../../api/audio_codecs:builtin_audio_decoder_factory", @@ -1490,6 +1471,7 @@ if (rtc_include_tests) { "../../api/audio_codecs/opus:audio_encoder_opus", "../../common_audio", "../../rtc_base:protobuf_utils", + "../../rtc_base/system:arch", "../../test:test_main", "//testing/gtest", ] + audio_coding_deps @@ -1517,7 +1499,6 @@ if (rtc_include_tests) { testonly = true defines = [] deps = [ - "../..:typedefs", "../../rtc_base:checks", "../../test:fileutils", ] @@ -1561,7 +1542,6 @@ if (rtc_include_tests) { testonly = true defines = [] deps = [ - "../..:typedefs", "../../test:fileutils", ] sources = [ @@ -1620,7 +1600,6 @@ if (rtc_include_tests) { ":neteq", ":neteq_test_tools", ":pcm16b", - "../..:typedefs", "../..:webrtc_common", "../../api/audio:audio_frame_api", "../../api/audio_codecs:audio_codecs_api", @@ -1649,7 +1628,6 @@ if (rtc_include_tests) { deps = [ ":neteq", ":neteq_test_tools", - "../..:typedefs", "../..:webrtc_common", "../../api/audio_codecs:builtin_audio_decoder_factory", "../../rtc_base:checks", @@ -1665,7 +1643,6 @@ if (rtc_include_tests) { deps = audio_coding_deps + [ "//third_party/abseil-cpp/absl/memory", - "../..:typedefs", ":audio_coding", ":neteq_input_audio_tools", "../../api/audio:audio_frame_api", @@ -1690,7 +1667,6 @@ if (rtc_include_tests) { testonly = true deps = audio_coding_deps + [ - "../..:typedefs", "../../system_wrappers:system_wrappers_default", "../rtp_rtcp:rtp_rtcp_format", "../../api:array_view", @@ -1765,7 +1741,6 @@ if (rtc_include_tests) { deps = [ ":neteq", ":neteq_test_support", - "../..:typedefs", "../..:webrtc_common", "../../rtc_base:rtc_base_approved", "../../system_wrappers:system_wrappers_default", @@ -1912,7 +1887,6 @@ if (rtc_include_tests) { deps = [ ":g722", - "../..:typedefs", "../..:webrtc_common", ] } @@ -2080,7 +2054,6 @@ if (rtc_include_tests) { ":rent_a_codec", ":webrtc_opus", "..:module_api", - "../..:typedefs", "../..:webrtc_common", "../../api/audio:audio_frame_api", "../../api/audio_codecs:audio_codecs_api", @@ -2100,6 +2073,7 @@ if (rtc_include_tests) { "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_tests_utils", "../../rtc_base:sanitizer", + "../../rtc_base/system:arch", "../../system_wrappers", "../../system_wrappers:cpu_features_api", "../../test:audio_codec_mocks", diff --git a/modules/audio_coding/acm2/acm_codec_database.h b/modules/audio_coding/acm2/acm_codec_database.h index 8b7c68a97e..ee6bb46faa 100644 --- a/modules/audio_coding/acm2/acm_codec_database.h +++ b/modules/audio_coding/acm2/acm_codec_database.h @@ -18,7 +18,6 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/acm2/rent_a_codec.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/acm2/acm_receiver.h b/modules/audio_coding/acm2/acm_receiver.h index c0afbb12f2..f133a873c2 100644 --- a/modules/audio_coding/acm2/acm_receiver.h +++ b/modules/audio_coding/acm2/acm_receiver.h @@ -26,7 +26,6 @@ #include "modules/audio_coding/neteq/include/neteq.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/acm2/acm_resampler.h b/modules/audio_coding/acm2/acm_resampler.h index d7d7bcf165..904ea524f8 100644 --- a/modules/audio_coding/acm2/acm_resampler.h +++ b/modules/audio_coding/acm2/acm_resampler.h @@ -12,7 +12,6 @@ #define MODULES_AUDIO_CODING_ACM2_ACM_RESAMPLER_H_ #include "common_audio/resampler/include/push_resampler.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace acm2 { diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc index ce2832a875..01f83a796d 100644 --- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc +++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc @@ -37,6 +37,7 @@ #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/platform_thread.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/system/arch.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/event_wrapper.h" diff --git a/modules/audio_coding/acm2/codec_manager.cc b/modules/audio_coding/acm2/codec_manager.cc index a101d3debb..f29e0f1a1e 100644 --- a/modules/audio_coding/acm2/codec_manager.cc +++ b/modules/audio_coding/acm2/codec_manager.cc @@ -14,7 +14,6 @@ //#include "rtc_base/format_macros.h" #include "modules/audio_coding/acm2/rent_a_codec.h" #include "rtc_base/logging.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace acm2 { diff --git a/modules/audio_coding/acm2/rent_a_codec.h b/modules/audio_coding/acm2/rent_a_codec.h index 02f9d0314a..5de7815682 100644 --- a/modules/audio_coding/acm2/rent_a_codec.h +++ b/modules/audio_coding/acm2/rent_a_codec.h @@ -23,7 +23,6 @@ #include "modules/audio_coding/neteq/neteq_decoder_enum.h" #include "rtc_base/constructormagic.h" #include "rtc_base/scoped_ref_ptr.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/codecs/cng/webrtc_cng.h b/modules/audio_coding/codecs/cng/webrtc_cng.h index 684480a1d3..3f8fadcd71 100644 --- a/modules/audio_coding/codecs/cng/webrtc_cng.h +++ b/modules/audio_coding/codecs/cng/webrtc_cng.h @@ -15,7 +15,6 @@ #include "api/array_view.h" #include "rtc_base/buffer.h" -#include "typedefs.h" // NOLINT(build/include) #define WEBRTC_CNG_MAX_LPC_ORDER 12 diff --git a/modules/audio_coding/codecs/g711/g711_interface.c b/modules/audio_coding/codecs/g711/g711_interface.c index 361350796f..5fe1692ccb 100644 --- a/modules/audio_coding/codecs/g711/g711_interface.c +++ b/modules/audio_coding/codecs/g711/g711_interface.c @@ -12,7 +12,6 @@ #include "modules/third_party/g711/g711.h" #include "modules/audio_coding/codecs/g711/g711_interface.h" -#include "typedefs.h" // NOLINT(build/include) size_t WebRtcG711_EncodeA(const int16_t* speechIn, size_t len, diff --git a/modules/audio_coding/codecs/g711/g711_interface.h b/modules/audio_coding/codecs/g711/g711_interface.h index f206f30306..83f9d378ed 100644 --- a/modules/audio_coding/codecs/g711/g711_interface.h +++ b/modules/audio_coding/codecs/g711/g711_interface.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_G711_G711_INTERFACE_H_ #define MODULES_AUDIO_CODING_CODECS_G711_G711_INTERFACE_H_ -#include "typedefs.h" // NOLINT(build/include) +#include // Comfort noise constants #define G711_WEBRTC_SPEECH 1 diff --git a/modules/audio_coding/codecs/g722/g722_interface.c b/modules/audio_coding/codecs/g722/g722_interface.c index b79846ca3e..36ee6d92be 100644 --- a/modules/audio_coding/codecs/g722/g722_interface.c +++ b/modules/audio_coding/codecs/g722/g722_interface.c @@ -13,7 +13,6 @@ #include "modules/audio_coding/codecs/g722/g722_interface.h" #include "modules/third_party/g722/g722_enc_dec.h" -#include "typedefs.h" // NOLINT(build/include) int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst) { diff --git a/modules/audio_coding/codecs/g722/g722_interface.h b/modules/audio_coding/codecs/g722/g722_interface.h index 3b73f858a0..85c1cd02a0 100644 --- a/modules/audio_coding/codecs/g722/g722_interface.h +++ b/modules/audio_coding/codecs/g722/g722_interface.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_G722_G722_INTERFACE_H_ #define MODULES_AUDIO_CODING_CODECS_G722_G722_INTERFACE_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /* * Solution to support multiple instances diff --git a/modules/audio_coding/codecs/g722/test/testG722.cc b/modules/audio_coding/codecs/g722/test/testG722.cc index ada56ab90f..9f2155d0f7 100644 --- a/modules/audio_coding/codecs/g722/test/testG722.cc +++ b/modules/audio_coding/codecs/g722/test/testG722.cc @@ -15,7 +15,6 @@ #include #include #include -#include "typedefs.h" // NOLINT(build/include) /* include API */ #include "modules/audio_coding/codecs/g722/g722_interface.h" diff --git a/modules/audio_coding/codecs/ilbc/cb_construct.h b/modules/audio_coding/codecs/ilbc/cb_construct.h index b200990742..f4df38728c 100644 --- a/modules/audio_coding/codecs/ilbc/cb_construct.h +++ b/modules/audio_coding/codecs/ilbc/cb_construct.h @@ -20,7 +20,10 @@ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CB_CONSTRUCT_H_ #include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" +#include "rtc_base/system/unused.h" /*----------------------------------------------------------------* * Construct decoded vector from codebook and gains. diff --git a/modules/audio_coding/codecs/ilbc/constants.h b/modules/audio_coding/codecs/ilbc/constants.h index 3c32c625ef..07369a39e0 100644 --- a/modules/audio_coding/codecs/ilbc/constants.h +++ b/modules/audio_coding/codecs/ilbc/constants.h @@ -20,7 +20,6 @@ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_ #include "modules/audio_coding/codecs/ilbc/defines.h" -#include "typedefs.h" // NOLINT(build/include) /* high pass filters */ diff --git a/modules/audio_coding/codecs/ilbc/decode.c b/modules/audio_coding/codecs/ilbc/decode.c index 7cba418010..3848bc7d7b 100644 --- a/modules/audio_coding/codecs/ilbc/decode.c +++ b/modules/audio_coding/codecs/ilbc/decode.c @@ -16,6 +16,9 @@ ******************************************************************/ +// 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/simple_lsf_dequant.h" #include "modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h" diff --git a/modules/audio_coding/codecs/ilbc/decode.h b/modules/audio_coding/codecs/ilbc/decode.h index c5f35f46ad..d73f79880b 100644 --- a/modules/audio_coding/codecs/ilbc/decode.h +++ b/modules/audio_coding/codecs/ilbc/decode.h @@ -19,7 +19,10 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_H_ +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" +#include "rtc_base/system/unused.h" /*----------------------------------------------------------------* * main decoder function diff --git a/modules/audio_coding/codecs/ilbc/decode_residual.h b/modules/audio_coding/codecs/ilbc/decode_residual.h index 7468e5f2ae..d54aada29a 100644 --- a/modules/audio_coding/codecs/ilbc/decode_residual.h +++ b/modules/audio_coding/codecs/ilbc/decode_residual.h @@ -20,7 +20,10 @@ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DECODE_RESIDUAL_H_ #include +#include + #include "modules/audio_coding/codecs/ilbc/defines.h" +#include "rtc_base/system/unused.h" /*----------------------------------------------------------------* * frame residual decoder function (subrutine to iLBC_decode) diff --git a/modules/audio_coding/codecs/ilbc/defines.h b/modules/audio_coding/codecs/ilbc/defines.h index 9a4a1966f9..43948a20c2 100644 --- a/modules/audio_coding/codecs/ilbc/defines.h +++ b/modules/audio_coding/codecs/ilbc/defines.h @@ -21,7 +21,6 @@ #include #include "common_audio/signal_processing/include/signal_processing_library.h" -#include "typedefs.h" // NOLINT(build/include) /* general codec settings */ diff --git a/modules/audio_coding/codecs/ilbc/encode.c b/modules/audio_coding/codecs/ilbc/encode.c index 3631c65136..912e23ca8b 100644 --- a/modules/audio_coding/codecs/ilbc/encode.c +++ b/modules/audio_coding/codecs/ilbc/encode.c @@ -18,6 +18,9 @@ #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" diff --git a/modules/audio_coding/codecs/ilbc/get_cd_vec.h b/modules/audio_coding/codecs/ilbc/get_cd_vec.h index 76e1a56f30..647b0634a0 100644 --- a/modules/audio_coding/codecs/ilbc/get_cd_vec.h +++ b/modules/audio_coding/codecs/ilbc/get_cd_vec.h @@ -20,8 +20,11 @@ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_GET_CD_VEC_H_ #include +#include +#include #include "modules/audio_coding/codecs/ilbc/defines.h" +#include "rtc_base/system/unused.h" // Returns true on success, false on failure. In case of failure, the decoder // state may be corrupted and needs resetting. diff --git a/modules/audio_coding/codecs/ilbc/ilbc.h b/modules/audio_coding/codecs/ilbc/ilbc.h index 4c12665db7..de8cfde111 100644 --- a/modules/audio_coding/codecs/ilbc/ilbc.h +++ b/modules/audio_coding/codecs/ilbc/ilbc.h @@ -19,12 +19,7 @@ #define MODULES_AUDIO_CODING_CODECS_ILBC_ILBC_H_ #include - -/* - * Define the fixpoint numeric formats - */ - -#include "typedefs.h" // NOLINT(build/include) +#include /* * Solution to support multiple instances diff --git a/modules/audio_coding/codecs/ilbc/vq3.h b/modules/audio_coding/codecs/ilbc/vq3.h index ceaff8d8a6..c946478a1a 100644 --- a/modules/audio_coding/codecs/ilbc/vq3.h +++ b/modules/audio_coding/codecs/ilbc/vq3.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /*----------------------------------------------------------------* * Vector quantization of order 3 (based on MSE) diff --git a/modules/audio_coding/codecs/ilbc/vq4.h b/modules/audio_coding/codecs/ilbc/vq4.h index 8dbedc912a..6d14830c03 100644 --- a/modules/audio_coding/codecs/ilbc/vq4.h +++ b/modules/audio_coding/codecs/ilbc/vq4.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_ #define MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /*----------------------------------------------------------------* * Vector quantization of order 4 (based on MSE) diff --git a/modules/audio_coding/codecs/isac/bandwidth_info.h b/modules/audio_coding/codecs/isac/bandwidth_info.h index 05397804f5..c3830a5f7c 100644 --- a/modules/audio_coding/codecs/isac/bandwidth_info.h +++ b/modules/audio_coding/codecs/isac/bandwidth_info.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_ -#include "typedefs.h" // NOLINT(build/include) +#include typedef struct { int in_use; diff --git a/modules/audio_coding/codecs/isac/fix/include/isacfix.h b/modules/audio_coding/codecs/isac/fix/include/isacfix.h index 626b3c76c3..8fcfebb21e 100644 --- a/modules/audio_coding/codecs/isac/fix/include/isacfix.h +++ b/modules/audio_coding/codecs/isac/fix/include/isacfix.h @@ -14,7 +14,6 @@ #include #include "modules/audio_coding/codecs/isac/bandwidth_info.h" -#include "typedefs.h" // NOLINT(build/include) typedef struct { void* dummy; } ISACFIX_MainStruct; diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h index 8d973471e1..6b99914b64 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h +++ b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_ -#include "typedefs.h" // NOLINT(build/include) +#include #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h index 55e1f44a01..01e5a7ba85 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_ -#include "typedefs.h" // NOLINT(build/include) +#include #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc index 0727d58378..b7456a7056 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc +++ b/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc @@ -15,7 +15,6 @@ #include "rtc_base/sanitizer.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) class FilterBanksTest : public testing::Test { protected: diff --git a/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc index 2ab8d6aeea..471fa57474 100644 --- a/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc +++ b/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc @@ -11,7 +11,6 @@ #include "modules/audio_coding/codecs/isac/fix/source/codec.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) class FiltersTest : public testing::Test { protected: diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice_c.c b/modules/audio_coding/codecs/isac/fix/source/lattice_c.c index d9849d6a34..43406612e8 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lattice_c.c +++ b/modules/audio_coding/codecs/isac/fix/source/lattice_c.c @@ -16,7 +16,6 @@ #include "common_audio/signal_processing/include/signal_processing_library.h" #include "modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) /* Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients * cth_Q15[] and sth_Q15[]. diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c b/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c index 613c07c9bd..c8d28b25cf 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c +++ b/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c @@ -11,7 +11,6 @@ #include #include "modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) // Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients // cth_Q15[] and sth_Q15[]. diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc index dbcf420179..fab0a043cc 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc +++ b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc @@ -11,7 +11,6 @@ #include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) class LpcMaskingModelTest : public testing::Test { protected: diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h index c51f2cab74..2d68fa6c6e 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h @@ -18,7 +18,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /* indices of KLT coefficients used */ extern const uint16_t WebRtcIsacfix_kSelIndGain[12]; diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h b/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h index 2b5f54e965..59e1738bce 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /********************* Pitch Filter Gain Coefficient Tables * ************************/ diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h b/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h index f834eab927..228da26731 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /********************* Pitch Filter Lag Coefficient Tables * ************************/ diff --git a/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h b/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h index 4ac5c0bbe3..2282a369cb 100644 --- a/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h +++ b/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h @@ -19,8 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ +#include + #include "modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) /********************* AR Coefficient Tables ************************/ /* cdf for quantized reflection coefficient 1 */ diff --git a/modules/audio_coding/codecs/isac/fix/source/structs.h b/modules/audio_coding/codecs/isac/fix/source/structs.h index 352eef0be0..59226ac24b 100644 --- a/modules/audio_coding/codecs/isac/fix/source/structs.h +++ b/modules/audio_coding/codecs/isac/fix/source/structs.h @@ -21,7 +21,6 @@ #include "common_audio/signal_processing/include/signal_processing_library.h" #include "modules/audio_coding/codecs/isac/bandwidth_info.h" #include "modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) /* Bitstream struct for decoder */ typedef struct Bitstreamstruct_dec { diff --git a/modules/audio_coding/codecs/isac/fix/source/transform_tables.c b/modules/audio_coding/codecs/isac/fix/source/transform_tables.c index eed88e4a3b..e661effdde 100644 --- a/modules/audio_coding/codecs/isac/fix/source/transform_tables.c +++ b/modules/audio_coding/codecs/isac/fix/source/transform_tables.c @@ -13,8 +13,9 @@ * transform functions WebRtcIsacfix_Time2Spec and WebRtcIsacfix_Spec2Time. */ +#include + #include "modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) /* Cosine table 1 in Q14. */ const int16_t WebRtcIsacfix_kCosTab1[FRAMESAMPLES/2] = { diff --git a/modules/audio_coding/codecs/isac/main/include/isac.h b/modules/audio_coding/codecs/isac/main/include/isac.h index 1d7e07538e..6cd70a6419 100644 --- a/modules/audio_coding/codecs/isac/main/include/isac.h +++ b/modules/audio_coding/codecs/isac/main/include/isac.h @@ -14,7 +14,6 @@ #include #include "modules/audio_coding/codecs/isac/bandwidth_info.h" -#include "typedefs.h" // NOLINT(build/include) typedef struct WebRtcISACStruct ISACStruct; diff --git a/modules/audio_coding/codecs/isac/main/source/crc.h b/modules/audio_coding/codecs/isac/main/source/crc.h index 19adbdaa0b..f031019ed3 100644 --- a/modules/audio_coding/codecs/isac/main/source/crc.h +++ b/modules/audio_coding/codecs/isac/main/source/crc.h @@ -18,7 +18,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /**************************************************************************** * WebRtcIsac_GetCrc(...) diff --git a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c index 0ab2dc1296..7b02e64a01 100644 --- a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c +++ b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c @@ -25,7 +25,6 @@ #include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h" #include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h" #include "modules/audio_coding/codecs/isac/main/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) /****************************************************************************** * WebRtcIsac_RemoveLarMean() diff --git a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h index b8d918b9ed..8bc3d752c3 100644 --- a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h +++ b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h @@ -21,7 +21,6 @@ #include "modules/audio_coding/codecs/isac/main/source/settings.h" #include "modules/audio_coding/codecs/isac/main/source/structs.h" -#include "typedefs.h" // NOLINT(build/include) /****************************************************************************** * WebRtcIsac_RemoveLarMean() diff --git a/modules/audio_coding/codecs/isac/main/source/isac.c b/modules/audio_coding/codecs/isac/main/source/isac.c index 45eb598ee3..866959691c 100644 --- a/modules/audio_coding/codecs/isac/main/source/isac.c +++ b/modules/audio_coding/codecs/isac/main/source/isac.c @@ -32,6 +32,7 @@ #include "modules/audio_coding/codecs/isac/main/source/os_specific_inline.h" #include "modules/audio_coding/codecs/isac/main/source/structs.h" #include "modules/audio_coding/codecs/isac/main/source/isac_vad.h" +#include "rtc_base/system/arch.h" #define BIT_MASK_DEC_INIT 0x0001 #define BIT_MASK_ENC_INIT 0x0002 diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c index d6e65f3ded..670754065f 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c +++ b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c @@ -18,7 +18,6 @@ #include "modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h" #include "modules/audio_coding/codecs/isac/main/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) const double WebRtcIsac_kQSizeLpcGain = 0.100000; diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h index 84913ddfe8..39c4a24ef4 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h @@ -19,8 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_ +#include + #include "modules/audio_coding/codecs/isac/main/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) extern const double WebRtcIsac_kQSizeLpcGain; diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c index 490866c841..e3600a7fab 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c +++ b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c @@ -18,7 +18,6 @@ #include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h" #include "modules/audio_coding/codecs/isac/main/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) /* * Mean value of LAR diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h index e21e15a422..7448a1e76b 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h @@ -19,8 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_ +#include + #include "modules/audio_coding/codecs/isac/main/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) extern const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER]; diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c index d03c7b7a56..59617fd274 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c +++ b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c @@ -18,7 +18,6 @@ #include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h" #include "modules/audio_coding/codecs/isac/main/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) /* * Mean value of LAR diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h index 4d5403d8d4..51101db936 100644 --- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h @@ -19,8 +19,9 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_ +#include + #include "modules/audio_coding/codecs/isac/main/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER]; diff --git a/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h b/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h index f72236d4ae..fe9afa4ba2 100644 --- a/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h +++ b/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h @@ -12,7 +12,8 @@ #define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_ #include -#include "typedefs.h" // NOLINT(build/include) + +#include "rtc_base/system/arch.h" #if defined(WEBRTC_POSIX) #define WebRtcIsac_lrint lrint diff --git a/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h b/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h index 891bcef1ea..145fd4e6aa 100644 --- a/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h @@ -19,7 +19,7 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ -#include "typedefs.h" // NOLINT(build/include) +#include /* header file for coding tables for the pitch filter side-info in the entropy * coder */ diff --git a/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h b/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h index b662ab5419..b48e358a5a 100644 --- a/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h +++ b/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h @@ -19,7 +19,8 @@ #ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ #define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ -#include "typedefs.h" // NOLINT(build/include) +#include + /* header file for coding tables for the pitch filter side-info in the entropy * coder */ /********************* Pitch Filter Lag Coefficient Tables diff --git a/modules/audio_coding/codecs/isac/main/source/structs.h b/modules/audio_coding/codecs/isac/main/source/structs.h index f8ac9c7c9d..1d730c7e65 100644 --- a/modules/audio_coding/codecs/isac/main/source/structs.h +++ b/modules/audio_coding/codecs/isac/main/source/structs.h @@ -20,7 +20,6 @@ #include "modules/audio_coding/codecs/isac/bandwidth_info.h" #include "modules/audio_coding/codecs/isac/main/source/settings.h" -#include "typedefs.h" // NOLINT(build/include) typedef struct Bitstreamstruct { uint8_t stream[STREAM_SIZE_MAX]; diff --git a/modules/audio_coding/codecs/opus/opus_interface.h b/modules/audio_coding/codecs/opus/opus_interface.h index 0b1c64d62f..ddb4ff9781 100644 --- a/modules/audio_coding/codecs/opus/opus_interface.h +++ b/modules/audio_coding/codecs/opus/opus_interface.h @@ -12,9 +12,9 @@ #define MODULES_AUDIO_CODING_CODECS_OPUS_OPUS_INTERFACE_H_ #include +#include #include "modules/audio_coding/codecs/opus/opus_inst.h" -#include "typedefs.h" // NOLINT(build/include) #ifdef __cplusplus extern "C" { diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b.c b/modules/audio_coding/codecs/pcm16b/pcm16b.c index abcff4fe73..2f6dce5f41 100644 --- a/modules/audio_coding/codecs/pcm16b/pcm16b.c +++ b/modules/audio_coding/codecs/pcm16b/pcm16b.c @@ -10,8 +10,6 @@ #include "modules/audio_coding/codecs/pcm16b/pcm16b.h" -#include "typedefs.h" // NOLINT(build/include) - size_t WebRtcPcm16b_Encode(const int16_t* speech, size_t len, uint8_t* encoded) { diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b.h b/modules/audio_coding/codecs/pcm16b/pcm16b.h index 9a3bfe90fa..75d1efda3b 100644 --- a/modules/audio_coding/codecs/pcm16b/pcm16b.h +++ b/modules/audio_coding/codecs/pcm16b/pcm16b.h @@ -15,8 +15,7 @@ */ #include - -#include "typedefs.h" // NOLINT(build/include) +#include #ifdef __cplusplus extern "C" { diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_test.h b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h index 0214a7d90f..c626bfa0ed 100644 --- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.h +++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h @@ -15,7 +15,6 @@ #include #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/include/audio_coding_module.h b/modules/audio_coding/include/audio_coding_module.h index a5ad4ffac8..41745abc7b 100644 --- a/modules/audio_coding/include/audio_coding_module.h +++ b/modules/audio_coding/include/audio_coding_module.h @@ -24,7 +24,6 @@ #include "rtc_base/deprecation.h" #include "rtc_base/function_view.h" #include "system_wrappers/include/clock.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/include/audio_coding_module_typedefs.h b/modules/audio_coding/include/audio_coding_module_typedefs.h index e8f80dc481..cd4351b07f 100644 --- a/modules/audio_coding/include/audio_coding_module_typedefs.h +++ b/modules/audio_coding/include/audio_coding_module_typedefs.h @@ -13,8 +13,6 @@ #include -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { /////////////////////////////////////////////////////////////////////////// diff --git a/modules/audio_coding/neteq/accelerate.h b/modules/audio_coding/neteq/accelerate.h index 6d5b11515a..b0bab32503 100644 --- a/modules/audio_coding/neteq/accelerate.h +++ b/modules/audio_coding/neteq/accelerate.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "modules/audio_coding/neteq/time_stretch.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_multi_vector.cc b/modules/audio_coding/neteq/audio_multi_vector.cc index fee37cb8bb..874633f389 100644 --- a/modules/audio_coding/neteq/audio_multi_vector.cc +++ b/modules/audio_coding/neteq/audio_multi_vector.cc @@ -15,7 +15,6 @@ #include #include "rtc_base/checks.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_multi_vector.h b/modules/audio_coding/neteq/audio_multi_vector.h index f54c98b942..4a9ed489e8 100644 --- a/modules/audio_coding/neteq/audio_multi_vector.h +++ b/modules/audio_coding/neteq/audio_multi_vector.h @@ -17,7 +17,6 @@ #include "modules/audio_coding/neteq/audio_vector.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_multi_vector_unittest.cc b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc index 7272dc287a..3f3283eb4f 100644 --- a/modules/audio_coding/neteq/audio_multi_vector_unittest.cc +++ b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc @@ -17,7 +17,6 @@ #include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_vector.cc b/modules/audio_coding/neteq/audio_vector.cc index 0486416320..b3ad48fc43 100644 --- a/modules/audio_coding/neteq/audio_vector.cc +++ b/modules/audio_coding/neteq/audio_vector.cc @@ -16,7 +16,6 @@ #include #include "rtc_base/checks.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_vector.h b/modules/audio_coding/neteq/audio_vector.h index 65939ce366..825a3bceac 100644 --- a/modules/audio_coding/neteq/audio_vector.h +++ b/modules/audio_coding/neteq/audio_vector.h @@ -16,7 +16,6 @@ #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/audio_vector_unittest.cc b/modules/audio_coding/neteq/audio_vector_unittest.cc index e70178c6c9..1a16bb387a 100644 --- a/modules/audio_coding/neteq/audio_vector_unittest.cc +++ b/modules/audio_coding/neteq/audio_vector_unittest.cc @@ -17,7 +17,6 @@ #include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/background_noise.h b/modules/audio_coding/neteq/background_noise.h index 26d42b50db..58eecaa705 100644 --- a/modules/audio_coding/neteq/background_noise.h +++ b/modules/audio_coding/neteq/background_noise.h @@ -17,7 +17,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "modules/audio_coding/neteq/include/neteq.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/comfort_noise.h b/modules/audio_coding/neteq/comfort_noise.h index c8cc64a5ff..5169124040 100644 --- a/modules/audio_coding/neteq/comfort_noise.h +++ b/modules/audio_coding/neteq/comfort_noise.h @@ -13,7 +13,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/decision_logic.h b/modules/audio_coding/neteq/decision_logic.h index 20ba8afe95..00b862008c 100644 --- a/modules/audio_coding/neteq/decision_logic.h +++ b/modules/audio_coding/neteq/decision_logic.h @@ -15,7 +15,6 @@ #include "modules/audio_coding/neteq/include/neteq.h" #include "modules/audio_coding/neteq/tick_timer.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/decoder_database.h b/modules/audio_coding/neteq/decoder_database.h index 107d2f31ff..131e769079 100644 --- a/modules/audio_coding/neteq/decoder_database.h +++ b/modules/audio_coding/neteq/decoder_database.h @@ -23,7 +23,6 @@ #include "modules/audio_coding/neteq/packet.h" #include "rtc_base/constructormagic.h" #include "rtc_base/scoped_ref_ptr.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/delay_manager.h b/modules/audio_coding/neteq/delay_manager.h index 08004eaccb..d75d5b47c0 100644 --- a/modules/audio_coding/neteq/delay_manager.h +++ b/modules/audio_coding/neteq/delay_manager.h @@ -18,7 +18,6 @@ #include "modules/audio_coding/neteq/tick_timer.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/dsp_helper.h b/modules/audio_coding/neteq/dsp_helper.h index 8940acd969..efa2f9ce06 100644 --- a/modules/audio_coding/neteq/dsp_helper.h +++ b/modules/audio_coding/neteq/dsp_helper.h @@ -15,7 +15,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/dsp_helper_unittest.cc b/modules/audio_coding/neteq/dsp_helper_unittest.cc index 9d5da5d4ef..ec434a4b19 100644 --- a/modules/audio_coding/neteq/dsp_helper_unittest.cc +++ b/modules/audio_coding/neteq/dsp_helper_unittest.cc @@ -12,7 +12,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/dtmf_buffer.h b/modules/audio_coding/neteq/dtmf_buffer.h index 1035e87c8f..6de512772f 100644 --- a/modules/audio_coding/neteq/dtmf_buffer.h +++ b/modules/audio_coding/neteq/dtmf_buffer.h @@ -15,7 +15,6 @@ #include // size_t #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/dtmf_tone_generator.h b/modules/audio_coding/neteq/dtmf_tone_generator.h index b91d221a52..a773ff353d 100644 --- a/modules/audio_coding/neteq/dtmf_tone_generator.h +++ b/modules/audio_coding/neteq/dtmf_tone_generator.h @@ -13,7 +13,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/expand.h b/modules/audio_coding/neteq/expand.h index 2fd4faec96..4cfe7b9d8c 100644 --- a/modules/audio_coding/neteq/expand.h +++ b/modules/audio_coding/neteq/expand.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/include/neteq.h b/modules/audio_coding/neteq/include/neteq.h index ce1448a1de..731dbe684a 100644 --- a/modules/audio_coding/neteq/include/neteq.h +++ b/modules/audio_coding/neteq/include/neteq.h @@ -24,7 +24,6 @@ #include "modules/audio_coding/neteq/neteq_decoder_enum.h" #include "rtc_base/constructormagic.h" #include "rtc_base/scoped_ref_ptr.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/merge.h b/modules/audio_coding/neteq/merge.h index 017e824edf..235c07f5b1 100644 --- a/modules/audio_coding/neteq/merge.h +++ b/modules/audio_coding/neteq/merge.h @@ -15,7 +15,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h index 5aed6a9d72..1fb3db5f96 100644 --- a/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h +++ b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h @@ -15,7 +15,6 @@ #include "modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "rtc_base/constructormagic.h" #include "test/gmock.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/nack_tracker_unittest.cc b/modules/audio_coding/neteq/nack_tracker_unittest.cc index 19adf30bf6..a44f41ba41 100644 --- a/modules/audio_coding/neteq/nack_tracker_unittest.cc +++ b/modules/audio_coding/neteq/nack_tracker_unittest.cc @@ -17,7 +17,6 @@ #include "modules/audio_coding/include/audio_coding_module_typedefs.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace { diff --git a/modules/audio_coding/neteq/neteq_impl.h b/modules/audio_coding/neteq/neteq_impl.h index 6b8764d131..e0e0c13882 100644 --- a/modules/audio_coding/neteq/neteq_impl.h +++ b/modules/audio_coding/neteq/neteq_impl.h @@ -28,7 +28,6 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc index 5d43fdb0f3..96a392bff2 100644 --- a/modules/audio_coding/neteq/neteq_unittest.cc +++ b/modules/audio_coding/neteq/neteq_unittest.cc @@ -33,10 +33,10 @@ #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/protobuf_utils.h" #include "rtc_base/stringencode.h" +#include "rtc_base/system/arch.h" #include "test/field_trial.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) // This must come after test/gtest.h #include "rtc_base/flags.h" // NOLINT(build/include) diff --git a/modules/audio_coding/neteq/normal.h b/modules/audio_coding/neteq/normal.h index 41bd30a85f..b13f16e50d 100644 --- a/modules/audio_coding/neteq/normal.h +++ b/modules/audio_coding/neteq/normal.h @@ -20,7 +20,6 @@ #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/numerics/safe_conversions.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/packet.h b/modules/audio_coding/neteq/packet.h index 61b014429a..45c56e1b68 100644 --- a/modules/audio_coding/neteq/packet.h +++ b/modules/audio_coding/neteq/packet.h @@ -17,7 +17,6 @@ #include "api/audio_codecs/audio_decoder.h" #include "modules/audio_coding/neteq/tick_timer.h" #include "rtc_base/buffer.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/packet_buffer.h b/modules/audio_coding/neteq/packet_buffer.h index 74f36a5876..7e34c1e9fc 100644 --- a/modules/audio_coding/neteq/packet_buffer.h +++ b/modules/audio_coding/neteq/packet_buffer.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/neteq/packet.h" #include "modules/include/module_common_types.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/post_decode_vad.h b/modules/audio_coding/neteq/post_decode_vad.h index dac95f02f8..ad4f0823bb 100644 --- a/modules/audio_coding/neteq/post_decode_vad.h +++ b/modules/audio_coding/neteq/post_decode_vad.h @@ -19,7 +19,6 @@ #include "modules/audio_coding/neteq/defines.h" #include "modules/audio_coding/neteq/packet.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/preemptive_expand.h b/modules/audio_coding/neteq/preemptive_expand.h index 197d3f1974..4d72616251 100644 --- a/modules/audio_coding/neteq/preemptive_expand.h +++ b/modules/audio_coding/neteq/preemptive_expand.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "modules/audio_coding/neteq/time_stretch.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/random_vector.h b/modules/audio_coding/neteq/random_vector.h index 2c6e06cade..e8c7ba847c 100644 --- a/modules/audio_coding/neteq/random_vector.h +++ b/modules/audio_coding/neteq/random_vector.h @@ -11,10 +11,10 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ #define MODULES_AUDIO_CODING_NETEQ_RANDOM_VECTOR_H_ -#include // size_t +#include +#include #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/rtcp.h b/modules/audio_coding/neteq/rtcp.h index 45bb058462..b1de7eb7f4 100644 --- a/modules/audio_coding/neteq/rtcp.h +++ b/modules/audio_coding/neteq/rtcp.h @@ -13,7 +13,6 @@ #include "modules/audio_coding/neteq/include/neteq.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/statistics_calculator.h b/modules/audio_coding/neteq/statistics_calculator.h index 42fd4c93e5..5f7d06a23b 100644 --- a/modules/audio_coding/neteq/statistics_calculator.h +++ b/modules/audio_coding/neteq/statistics_calculator.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/neteq/include/neteq.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/sync_buffer.h b/modules/audio_coding/neteq/sync_buffer.h index 8a35326c7a..3833cb2985 100644 --- a/modules/audio_coding/neteq/sync_buffer.h +++ b/modules/audio_coding/neteq/sync_buffer.h @@ -14,7 +14,6 @@ #include "api/audio/audio_frame.h" #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/test/neteq_performance_unittest.cc b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc index 6b1c223c40..90a205e7c1 100644 --- a/modules/audio_coding/neteq/test/neteq_performance_unittest.cc +++ b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc @@ -12,7 +12,6 @@ #include "system_wrappers/include/field_trial.h" #include "test/gtest.h" #include "test/testsupport/perf_test.h" -#include "typedefs.h" // NOLINT(build/include) // Runs a test with 10% packet losses and 10% clock drift, to exercise // both loss concealment and time-stretching code. diff --git a/modules/audio_coding/neteq/test/neteq_speed_test.cc b/modules/audio_coding/neteq/test/neteq_speed_test.cc index 76b6878c13..c486ac60bd 100644 --- a/modules/audio_coding/neteq/test/neteq_speed_test.cc +++ b/modules/audio_coding/neteq/test/neteq_speed_test.cc @@ -15,7 +15,6 @@ #include "modules/audio_coding/neteq/tools/neteq_performance_test.h" #include "rtc_base/flags.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) // Define command line flags. DEFINE_int(runtime_ms, 10000, "Simulated runtime in ms."); diff --git a/modules/audio_coding/neteq/tick_timer.h b/modules/audio_coding/neteq/tick_timer.h index 4a9ade5cb3..520099e346 100644 --- a/modules/audio_coding/neteq/tick_timer.h +++ b/modules/audio_coding/neteq/tick_timer.h @@ -15,7 +15,6 @@ #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/time_stretch.h b/modules/audio_coding/neteq/time_stretch.h index 606d1d0ecf..13ad2c8554 100644 --- a/modules/audio_coding/neteq/time_stretch.h +++ b/modules/audio_coding/neteq/time_stretch.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/neteq/audio_multi_vector.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/timestamp_scaler.h b/modules/audio_coding/neteq/timestamp_scaler.h index f0b05d634c..62f535c464 100644 --- a/modules/audio_coding/neteq/timestamp_scaler.h +++ b/modules/audio_coding/neteq/timestamp_scaler.h @@ -13,7 +13,6 @@ #include "modules/audio_coding/neteq/packet.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/tools/audio_checksum.h b/modules/audio_coding/neteq/tools/audio_checksum.h index db67edf4e0..ee8c582380 100644 --- a/modules/audio_coding/neteq/tools/audio_checksum.h +++ b/modules/audio_coding/neteq/tools/audio_checksum.h @@ -19,7 +19,7 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/messagedigest.h" #include "rtc_base/stringencode.h" -#include "typedefs.h" // NOLINT(build/include) +#include "rtc_base/system/arch.h" namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/audio_loop.h b/modules/audio_coding/neteq/tools/audio_loop.h index 876c2d772c..c7788a693a 100644 --- a/modules/audio_coding/neteq/tools/audio_loop.h +++ b/modules/audio_coding/neteq/tools/audio_loop.h @@ -16,7 +16,6 @@ #include "api/array_view.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/audio_sink.h b/modules/audio_coding/neteq/tools/audio_sink.h index 05e6fe8e7c..be2a315350 100644 --- a/modules/audio_coding/neteq/tools/audio_sink.h +++ b/modules/audio_coding/neteq/tools/audio_sink.h @@ -13,7 +13,6 @@ #include "api/audio/audio_frame.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/input_audio_file.h b/modules/audio_coding/neteq/tools/input_audio_file.h index db5a9440eb..b36dc24e1a 100644 --- a/modules/audio_coding/neteq/tools/input_audio_file.h +++ b/modules/audio_coding/neteq/tools/input_audio_file.h @@ -16,7 +16,6 @@ #include #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h index 5099e03fcb..f6b895aae0 100644 --- a/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h +++ b/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h @@ -19,7 +19,6 @@ #include "absl/types/optional.h" #include "modules/audio_coding/neteq/tools/neteq_input.h" #include "modules/audio_coding/neteq/tools/neteq_test.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/modules/audio_coding/neteq/tools/neteq_performance_test.cc index e0dfebf206..52524fed2c 100644 --- a/modules/audio_coding/neteq/tools/neteq_performance_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_performance_test.cc @@ -20,7 +20,6 @@ #include "rtc_base/checks.h" #include "system_wrappers/include/clock.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) using webrtc::NetEq; using webrtc::test::AudioLoop; diff --git a/modules/audio_coding/neteq/tools/neteq_performance_test.h b/modules/audio_coding/neteq/tools/neteq_performance_test.h index dcf0314b4b..d2212f03a3 100644 --- a/modules/audio_coding/neteq/tools/neteq_performance_test.h +++ b/modules/audio_coding/neteq/tools/neteq_performance_test.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ #define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_PERFORMANCE_TEST_H_ -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.h b/modules/audio_coding/neteq/tools/neteq_quality_test.h index b19460cfe9..3d7760e46d 100644 --- a/modules/audio_coding/neteq/tools/neteq_quality_test.h +++ b/modules/audio_coding/neteq/tools/neteq_quality_test.h @@ -21,7 +21,6 @@ #include "modules/audio_coding/neteq/tools/rtp_generator.h" #include "rtc_base/flags.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc index 7f1263cbc6..ce12c0d1a2 100644 --- a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc +++ b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc @@ -32,7 +32,6 @@ #include "rtc_base/checks.h" #include "rtc_base/flags.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/packet.h b/modules/audio_coding/neteq/tools/packet.h index 2c9a26f31e..623c5cb635 100644 --- a/modules/audio_coding/neteq/tools/packet.h +++ b/modules/audio_coding/neteq/tools/packet.h @@ -17,7 +17,6 @@ #include "api/rtp_headers.h" // NOLINT(build/include) #include "common_types.h" // NOLINT(build/include) #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/neteq/tools/packet_source.h b/modules/audio_coding/neteq/tools/packet_source.h index 3f98ba16a9..fb689e33d4 100644 --- a/modules/audio_coding/neteq/tools/packet_source.h +++ b/modules/audio_coding/neteq/tools/packet_source.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/neteq/tools/packet.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/resample_input_audio_file.h b/modules/audio_coding/neteq/tools/resample_input_audio_file.h index 13c419d969..4e2e9b0bd9 100644 --- a/modules/audio_coding/neteq/tools/resample_input_audio_file.h +++ b/modules/audio_coding/neteq/tools/resample_input_audio_file.h @@ -16,7 +16,6 @@ #include "common_audio/resampler/include/resampler.h" #include "modules/audio_coding/neteq/tools/input_audio_file.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/rtp_encode.cc b/modules/audio_coding/neteq/tools/rtp_encode.cc index abbb62170c..5065ca1675 100644 --- a/modules/audio_coding/neteq/tools/rtp_encode.cc +++ b/modules/audio_coding/neteq/tools/rtp_encode.cc @@ -34,7 +34,6 @@ #include "modules/audio_coding/neteq/tools/input_audio_file.h" #include "rtc_base/flags.h" #include "rtc_base/numerics/safe_conversions.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/rtp_generator.h b/modules/audio_coding/neteq/tools/rtp_generator.h index 04fdbddb9e..ca7b04fc8c 100644 --- a/modules/audio_coding/neteq/tools/rtp_generator.h +++ b/modules/audio_coding/neteq/tools/rtp_generator.h @@ -14,7 +14,6 @@ #include "api/rtp_headers.h" #include "common_types.h" // NOLINT(build/include) #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/neteq/tools/rtp_jitter.cc b/modules/audio_coding/neteq/tools/rtp_jitter.cc index d92fed06cf..3c49443036 100644 --- a/modules/audio_coding/neteq/tools/rtp_jitter.cc +++ b/modules/audio_coding/neteq/tools/rtp_jitter.cc @@ -18,7 +18,6 @@ #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/buffer.h" #include "rtc_base/flags.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_coding/test/Channel.h b/modules/audio_coding/test/Channel.h index e5f5b546fd..fd161fb139 100644 --- a/modules/audio_coding/test/Channel.h +++ b/modules/audio_coding/test/Channel.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/include/audio_coding_module.h" #include "modules/include/module_common_types.h" #include "rtc_base/criticalsection.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/EncodeDecodeTest.h b/modules/audio_coding/test/EncodeDecodeTest.h index f1209c5594..7a21cb5eaa 100644 --- a/modules/audio_coding/test/EncodeDecodeTest.h +++ b/modules/audio_coding/test/EncodeDecodeTest.h @@ -19,7 +19,6 @@ #include "modules/audio_coding/test/PCMFile.h" #include "modules/audio_coding/test/RTPFile.h" #include "modules/include/module_common_types.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/PCMFile.h b/modules/audio_coding/test/PCMFile.h index dc7a4fc45e..57ed5fb0b7 100644 --- a/modules/audio_coding/test/PCMFile.h +++ b/modules/audio_coding/test/PCMFile.h @@ -18,7 +18,6 @@ #include "absl/types/optional.h" #include "api/audio/audio_frame.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/RTPFile.cc b/modules/audio_coding/test/RTPFile.cc index d058384cb6..cfe93fa4b9 100644 --- a/modules/audio_coding/test/RTPFile.cc +++ b/modules/audio_coding/test/RTPFile.cc @@ -22,7 +22,6 @@ #include "modules/include/module_common_types.h" // TODO(tlegrand): Consider removing usage of gtest. #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/RTPFile.h b/modules/audio_coding/test/RTPFile.h index 73e97dd526..1d0ddf840a 100644 --- a/modules/audio_coding/test/RTPFile.h +++ b/modules/audio_coding/test/RTPFile.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/include/audio_coding_module.h" #include "rtc_base/synchronization/rw_lock_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc index 74de1d9f22..f78b705b7b 100644 --- a/modules/audio_coding/test/TestAllCodecs.cc +++ b/modules/audio_coding/test/TestAllCodecs.cc @@ -23,7 +23,6 @@ #include "rtc_base/logging.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) // Description of the test: // In this test we set up a one-way communication channel from a participant diff --git a/modules/audio_coding/test/TestAllCodecs.h b/modules/audio_coding/test/TestAllCodecs.h index 36269a9d9e..03539ffd84 100644 --- a/modules/audio_coding/test/TestAllCodecs.h +++ b/modules/audio_coding/test/TestAllCodecs.h @@ -16,7 +16,6 @@ #include "modules/audio_coding/test/ACMTest.h" #include "modules/audio_coding/test/Channel.h" #include "modules/audio_coding/test/PCMFile.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc index 34aab019df..71d34867ac 100644 --- a/modules/audio_coding/test/TestRedFec.cc +++ b/modules/audio_coding/test/TestRedFec.cc @@ -18,7 +18,6 @@ #include "modules/audio_coding/include/audio_coding_module_typedefs.h" #include "modules/audio_coding/test/utility.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc index 31b1d073ea..f8c983c7f2 100644 --- a/modules/audio_coding/test/TestStereo.cc +++ b/modules/audio_coding/test/TestStereo.cc @@ -21,7 +21,6 @@ #include "modules/audio_coding/test/utility.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/TestVADDTX.cc b/modules/audio_coding/test/TestVADDTX.cc index d211a6ba87..79b2d31b92 100644 --- a/modules/audio_coding/test/TestVADDTX.cc +++ b/modules/audio_coding/test/TestVADDTX.cc @@ -17,7 +17,6 @@ #include "modules/audio_coding/test/PCMFile.h" #include "modules/audio_coding/test/utility.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/TwoWayCommunication.cc b/modules/audio_coding/test/TwoWayCommunication.cc index 4367faf6a7..3c5b2fede4 100644 --- a/modules/audio_coding/test/TwoWayCommunication.cc +++ b/modules/audio_coding/test/TwoWayCommunication.cc @@ -27,7 +27,6 @@ #include "modules/audio_coding/test/utility.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_coding/test/delay_test.cc b/modules/audio_coding/test/delay_test.cc index 3c20a54c47..d49cd3ced7 100644 --- a/modules/audio_coding/test/delay_test.cc +++ b/modules/audio_coding/test/delay_test.cc @@ -27,7 +27,6 @@ #include "system_wrappers/include/event_wrapper.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) DEFINE_string(codec, "isac", "Codec Name"); DEFINE_int(sample_rate_hz, 16000, "Sampling rate in Hertz."); diff --git a/modules/audio_coding/test/opus_test.cc b/modules/audio_coding/test/opus_test.cc index 40b51475bf..3c17dba66e 100644 --- a/modules/audio_coding/test/opus_test.cc +++ b/modules/audio_coding/test/opus_test.cc @@ -23,7 +23,6 @@ #include "modules/audio_coding/test/utility.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn index b5514d88b0..6eb02a500e 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -87,7 +87,6 @@ rtc_source_set("audio_device_api") { "include/audio_device_defines.h", ] deps = [ - "../../:typedefs", "../../rtc_base:checks", "../../rtc_base:deprecation", "../../rtc_base:rtc_base_approved", @@ -109,7 +108,6 @@ rtc_source_set("audio_device_buffer") { ] deps = [ ":audio_device_api", - "../../:typedefs", "../../api:array_view", "../../common_audio:common_audio_c", "../../rtc_base:checks", @@ -208,7 +206,6 @@ rtc_source_set("audio_device_impl") { ":audio_device_buffer", ":audio_device_generic", "../..:webrtc_common", - "../../:typedefs", "../../api:array_view", "../../common_audio", "../../common_audio:common_audio_c", diff --git a/modules/audio_device/audio_device_buffer.h b/modules/audio_device/audio_device_buffer.h index 9d5b26e533..8dd9550194 100644 --- a/modules/audio_device/audio_device_buffer.h +++ b/modules/audio_device/audio_device_buffer.h @@ -17,7 +17,6 @@ #include "rtc_base/task_queue.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/thread_checker.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_device/include/audio_device_defines.h b/modules/audio_device/include/audio_device_defines.h index 1674ad803d..f488ab6e0f 100644 --- a/modules/audio_device/include/audio_device_defines.h +++ b/modules/audio_device/include/audio_device_defines.h @@ -17,7 +17,6 @@ #include "rtc_base/checks.h" #include "rtc_base/deprecation.h" #include "rtc_base/strings/string_builder.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_device/include/test_audio_device.cc b/modules/audio_device/include/test_audio_device.cc index da2218fa0c..7d18d825a1 100644 --- a/modules/audio_device/include/test_audio_device.cc +++ b/modules/audio_device/include/test_audio_device.cc @@ -27,7 +27,6 @@ #include "rtc_base/random.h" #include "rtc_base/refcountedobject.h" #include "system_wrappers/include/event_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_device/include/test_audio_device.h b/modules/audio_device/include/test_audio_device.h index 4a75df3f86..7d034dce8c 100644 --- a/modules/audio_device/include/test_audio_device.h +++ b/modules/audio_device/include/test_audio_device.h @@ -18,7 +18,6 @@ #include "rtc_base/buffer.h" #include "rtc_base/event.h" #include "rtc_base/platform_file.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_device/linux/audio_device_alsa_linux.cc b/modules/audio_device/linux/audio_device_alsa_linux.cc index 735474c518..f8be24e7f0 100644 --- a/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -13,7 +13,7 @@ #include "modules/audio_device/audio_device_config.h" #include "modules/audio_device/linux/audio_device_alsa_linux.h" #include "rtc_base/logging.h" - +#include "rtc_base/system/arch.h" #include "system_wrappers/include/event_wrapper.h" #include "system_wrappers/include/sleep.h" webrtc::adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; diff --git a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h index 0f31322bc3..5d40e08bf5 100644 --- a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h +++ b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h @@ -14,7 +14,6 @@ #include "modules/audio_device/include/audio_device.h" #include "modules/audio_device/linux/alsasymboltable_linux.h" #include "rtc_base/criticalsection.h" -#include "typedefs.h" // NOLINT(build/include) #include diff --git a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h index 1917b96096..c5460b6237 100644 --- a/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h +++ b/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h @@ -14,7 +14,6 @@ #include "modules/audio_device/include/audio_device.h" #include "modules/audio_device/linux/pulseaudiosymboltable_linux.h" #include "rtc_base/thread_checker.h" -#include "typedefs.h" // NOLINT(build/include) #include #include diff --git a/modules/audio_device/mac/audio_device_mac.cc b/modules/audio_device/mac/audio_device_mac.cc index b34e875a33..063ac85736 100644 --- a/modules/audio_device/mac/audio_device_mac.cc +++ b/modules/audio_device/mac/audio_device_mac.cc @@ -15,6 +15,7 @@ #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/platform_thread.h" +#include "rtc_base/system/arch.h" #include "system_wrappers/include/event_wrapper.h" #include diff --git a/modules/audio_device/mac/audio_mixer_manager_mac.cc b/modules/audio_device/mac/audio_mixer_manager_mac.cc index 0932e8b01b..faedfb0ce3 100644 --- a/modules/audio_device/mac/audio_mixer_manager_mac.cc +++ b/modules/audio_device/mac/audio_mixer_manager_mac.cc @@ -9,6 +9,7 @@ */ #include "modules/audio_device/mac/audio_mixer_manager_mac.h" +#include "rtc_base/system/arch.h" #include // getpid() diff --git a/modules/audio_device/mac/audio_mixer_manager_mac.h b/modules/audio_device/mac/audio_mixer_manager_mac.h index 6681da5913..bb67f2058c 100644 --- a/modules/audio_device/mac/audio_mixer_manager_mac.h +++ b/modules/audio_device/mac/audio_mixer_manager_mac.h @@ -14,7 +14,6 @@ #include "modules/audio_device/include/audio_device.h" #include "rtc_base/criticalsection.h" #include "rtc_base/logging.h" -#include "typedefs.h" // NOLINT(build/include) #include diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn index 6a310e9698..da54e7bc97 100644 --- a/modules/audio_mixer/BUILD.gn +++ b/modules/audio_mixer/BUILD.gn @@ -37,7 +37,6 @@ rtc_static_library("audio_mixer_impl") { deps = [ ":audio_frame_manipulator", "../..:webrtc_common", - "../../:typedefs", "../../api:array_view", "../../api/audio:audio_frame_api", "../../api/audio:audio_mixer_api", diff --git a/modules/audio_mixer/audio_mixer_impl.h b/modules/audio_mixer/audio_mixer_impl.h index 49edd1645f..e8994a674b 100644 --- a/modules/audio_mixer/audio_mixer_impl.h +++ b/modules/audio_mixer/audio_mixer_impl.h @@ -20,7 +20,6 @@ #include "rtc_base/race_checker.h" #include "rtc_base/scoped_ref_ptr.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn index 4be7d8f8fd..3c257a091f 100644 --- a/modules/audio_processing/BUILD.gn +++ b/modules/audio_processing/BUILD.gn @@ -101,7 +101,6 @@ rtc_static_library("audio_processing") { ":audio_processing_c", ":audio_processing_statistics", ":gain_control_interface", - "../..:typedefs", "../..:webrtc_common", "../../api:array_view", "../../api/audio:aec3_config", @@ -115,6 +114,7 @@ rtc_static_library("audio_processing") { "../../rtc_base:gtest_prod", "../../rtc_base:safe_minmax", "../../rtc_base:sanitizer", + "../../rtc_base/system:arch", "../../system_wrappers:cpu_features_api", "../../system_wrappers:field_trial_api", "../../system_wrappers:metrics_api", @@ -257,7 +257,6 @@ rtc_source_set("audio_processing_c") { } deps = [ - "../..:typedefs", "../..:webrtc_common", "../../common_audio", "../../common_audio:common_audio_c", @@ -382,7 +381,6 @@ if (rtc_include_tests) { ":audioproc_test_utils", ":file_audio_generator_unittests", ":mocks", - "../..:typedefs", "../..:webrtc_common", "../../api:array_view", "../../api/audio:aec3_config", @@ -395,6 +393,7 @@ if (rtc_include_tests) { "../../rtc_base:rtc_base", "../../rtc_base:rtc_base_approved", "../../rtc_base:safe_minmax", + "../../rtc_base/system:arch", "../../rtc_base/system:file_wrapper", "../../system_wrappers", "../../system_wrappers:cpu_features_api", @@ -616,6 +615,7 @@ if (rtc_include_tests) { "../../common_audio", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", + "../../rtc_base/system:arch", "../../system_wrappers", "../../test:fileutils", "../../test:test_support", @@ -634,7 +634,6 @@ if (rtc_include_tests) { ] deps = [ ":audio_processing", - "../..:typedefs", "../..:webrtc_common", "../../common_audio:common_audio", "../../rtc_base:rtc_base_approved", @@ -657,7 +656,6 @@ if (rtc_include_tests) { ] deps = [ ":audio_processing", - "../..:typedefs", "../..:webrtc_common", "../../rtc_base/system:file_wrapper", "../../system_wrappers", @@ -699,10 +697,10 @@ if (rtc_include_tests) { deps = [ ":audioproc_debug_proto", - "../..:typedefs", "../..:webrtc_common", "../../rtc_base:protobuf_utils", "../../rtc_base:rtc_base_approved", + "../../rtc_base/system:arch", ] } } diff --git a/modules/audio_processing/aec/BUILD.gn b/modules/audio_processing/aec/BUILD.gn index 5a858f53e3..88a3ae8943 100644 --- a/modules/audio_processing/aec/BUILD.gn +++ b/modules/audio_processing/aec/BUILD.gn @@ -19,7 +19,6 @@ rtc_source_set("aec") { deps = [ ":aec_core", "..:apm_logging", - "../../..:typedefs", "../../../common_audio:common_audio_c", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", @@ -36,10 +35,10 @@ rtc_source_set("aec_core") { ] deps = [ "..:apm_logging", - "../../..:typedefs", "../../../common_audio:common_audio_c", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", + "../../../rtc_base/system:arch", "../../../system_wrappers:cpu_features_api", "../../../system_wrappers:metrics_api", "../utility:block_mean_calculator", @@ -94,7 +93,6 @@ if (rtc_include_tests) { deps = [ ":aec", ":aec_core", - "../../..:typedefs", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", "../../../test:test_support", diff --git a/modules/audio_processing/aec/aec_common.h b/modules/audio_processing/aec/aec_common.h index 80c5c14813..ac1f339456 100644 --- a/modules/audio_processing/aec/aec_common.h +++ b/modules/audio_processing/aec/aec_common.h @@ -11,8 +11,6 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_ #define MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_ -#include "typedefs.h" // NOLINT(build/include) - #ifdef _MSC_VER /* visual c++ */ #define ALIGN16_BEG __declspec(align(16)) #define ALIGN16_END diff --git a/modules/audio_processing/aec/aec_core.cc b/modules/audio_processing/aec/aec_core.cc index 95ed595c97..5a8cf8f58b 100644 --- a/modules/audio_processing/aec/aec_core.cc +++ b/modules/audio_processing/aec/aec_core.cc @@ -30,9 +30,9 @@ extern "C" { #include "modules/audio_processing/logging/apm_data_dumper.h" #include "modules/audio_processing/utility/delay_estimator_wrapper.h" #include "rtc_base/checks.h" +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "system_wrappers/include/metrics.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace { diff --git a/modules/audio_processing/aec/aec_core.h b/modules/audio_processing/aec/aec_core.h index 9e25292267..35a6c9b216 100644 --- a/modules/audio_processing/aec/aec_core.h +++ b/modules/audio_processing/aec/aec_core.h @@ -26,7 +26,6 @@ extern "C" { #include "modules/audio_processing/utility/block_mean_calculator.h" #include "modules/audio_processing/utility/ooura_fft.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/aec/aec_core_optimized_methods.h b/modules/audio_processing/aec/aec_core_optimized_methods.h index a8a20e94d8..03c027dabf 100644 --- a/modules/audio_processing/aec/aec_core_optimized_methods.h +++ b/modules/audio_processing/aec/aec_core_optimized_methods.h @@ -14,7 +14,6 @@ #include #include "modules/audio_processing/aec/aec_core.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/aec/echo_cancellation.cc b/modules/audio_processing/aec/echo_cancellation.cc index c8382ec1d6..fd1aec4058 100644 --- a/modules/audio_processing/aec/echo_cancellation.cc +++ b/modules/audio_processing/aec/echo_cancellation.cc @@ -24,7 +24,6 @@ extern "C" { #include "modules/audio_processing/aec/aec_core.h" #include "modules/audio_processing/aec/aec_resampler.h" #include "modules/audio_processing/logging/apm_data_dumper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/aec/echo_cancellation.h b/modules/audio_processing/aec/echo_cancellation.h index d5c703e46b..20393471f2 100644 --- a/modules/audio_processing/aec/echo_cancellation.h +++ b/modules/audio_processing/aec/echo_cancellation.h @@ -19,7 +19,6 @@ extern "C" { #include "common_audio/ring_buffer.h" } #include "modules/audio_processing/aec/aec_core.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/aec/system_delay_unittest.cc b/modules/audio_processing/aec/system_delay_unittest.cc index 01119db76b..9c57e8b84e 100644 --- a/modules/audio_processing/aec/system_delay_unittest.cc +++ b/modules/audio_processing/aec/system_delay_unittest.cc @@ -12,7 +12,6 @@ #include "modules/audio_processing/aec/echo_cancellation.h" #include "rtc_base/numerics/safe_conversions.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace { diff --git a/modules/audio_processing/aec3/BUILD.gn b/modules/audio_processing/aec3/BUILD.gn index 4b3f15c35e..8b108ef3d4 100644 --- a/modules/audio_processing/aec3/BUILD.gn +++ b/modules/audio_processing/aec3/BUILD.gn @@ -114,7 +114,6 @@ rtc_static_library("aec3") { deps = [ "..:apm_logging", "..:audio_processing", - "../../..:typedefs", "../../../api:array_view", "../../../api/audio:aec3_config", "../../../api/audio:echo_control", @@ -122,6 +121,7 @@ rtc_static_library("aec3") { "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", "../../../rtc_base:safe_minmax", + "../../../rtc_base/system:arch", "../../../system_wrappers:cpu_features_api", "../../../system_wrappers:field_trial_api", "../../../system_wrappers:metrics_api", @@ -151,12 +151,12 @@ if (rtc_include_tests) { "..:apm_logging", "..:audio_processing", "..:audio_processing_unittests", - "../../..:typedefs", "../../../api:array_view", "../../../api/audio:aec3_config", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", "../../../rtc_base:safe_minmax", + "../../../rtc_base/system:arch", "../../../system_wrappers:cpu_features_api", "../../../test:test_support", "//third_party/abseil-cpp/absl/types:optional", diff --git a/modules/audio_processing/aec3/adaptive_fir_filter.cc b/modules/audio_processing/aec3/adaptive_fir_filter.cc index e17bd9aec6..c6009cece8 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter.cc +++ b/modules/audio_processing/aec3/adaptive_fir_filter.cc @@ -10,10 +10,12 @@ #include "modules/audio_processing/aec3/adaptive_fir_filter.h" +// Defines WEBRTC_ARCH_X86_FAMILY, used below. +#include "rtc_base/system/arch.h" + #if defined(WEBRTC_HAS_NEON) #include #endif -#include "typedefs.h" // NOLINT(build/include) #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif diff --git a/modules/audio_processing/aec3/adaptive_fir_filter.h b/modules/audio_processing/aec3/adaptive_fir_filter.h index 1978496911..22ed3973e3 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter.h +++ b/modules/audio_processing/aec3/adaptive_fir_filter.h @@ -22,6 +22,7 @@ #include "modules/audio_processing/aec3/render_buffer.h" #include "modules/audio_processing/logging/apm_data_dumper.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/system/arch.h" namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc b/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc index 6c441f30a8..077586e51f 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc +++ b/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc @@ -10,11 +10,13 @@ #include "modules/audio_processing/aec3/adaptive_fir_filter.h" +// Defines WEBRTC_ARCH_X86_FAMILY, used below. +#include "rtc_base/system/arch.h" + #include #include #include #include -#include "typedefs.h" // NOLINT(build/include) #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif diff --git a/modules/audio_processing/aec3/aec3_common.cc b/modules/audio_processing/aec3/aec3_common.cc index 3e60b46a47..c374a3517d 100644 --- a/modules/audio_processing/aec3/aec3_common.cc +++ b/modules/audio_processing/aec3/aec3_common.cc @@ -11,9 +11,9 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "system_wrappers/include/cpu_features_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) #include "rtc_base/checks.h" +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/audio_processing/aec3/aec3_common.h b/modules/audio_processing/aec3/aec3_common.h index 6422a5247d..9ae3d429ea 100644 --- a/modules/audio_processing/aec3/aec3_common.h +++ b/modules/audio_processing/aec3/aec3_common.h @@ -12,7 +12,6 @@ #define MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_ #include -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/aec3/comfort_noise_generator.cc b/modules/audio_processing/aec3/comfort_noise_generator.cc index dab40a9d7e..55faf4b529 100644 --- a/modules/audio_processing/aec3/comfort_noise_generator.cc +++ b/modules/audio_processing/aec3/comfort_noise_generator.cc @@ -10,7 +10,9 @@ #include "modules/audio_processing/aec3/comfort_noise_generator.h" -#include "typedefs.h" // NOLINT(build/include) +// Defines WEBRTC_ARCH_X86_FAMILY, used below. +#include "rtc_base/system/arch.h" + #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif diff --git a/modules/audio_processing/aec3/comfort_noise_generator.h b/modules/audio_processing/aec3/comfort_noise_generator.h index 2d998beb94..6a479896ec 100644 --- a/modules/audio_processing/aec3/comfort_noise_generator.h +++ b/modules/audio_processing/aec3/comfort_noise_generator.h @@ -18,6 +18,7 @@ #include "modules/audio_processing/aec3/aec_state.h" #include "modules/audio_processing/aec3/fft_data.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/system/arch.h" namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc b/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc index d7e9407dff..77a09edcd6 100644 --- a/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc +++ b/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc @@ -14,9 +14,9 @@ #include #include "rtc_base/random.h" +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/fft_data.h b/modules/audio_processing/aec3/fft_data.h index 59511b56fe..5e5adb62de 100644 --- a/modules/audio_processing/aec3/fft_data.h +++ b/modules/audio_processing/aec3/fft_data.h @@ -11,7 +11,9 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_ #define MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_ -#include "typedefs.h" // NOLINT(build/include) +// Defines WEBRTC_ARCH_X86_FAMILY, used below. +#include "rtc_base/system/arch.h" + #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif diff --git a/modules/audio_processing/aec3/fft_data_unittest.cc b/modules/audio_processing/aec3/fft_data_unittest.cc index 8fc5ca7c76..0812fd6420 100644 --- a/modules/audio_processing/aec3/fft_data_unittest.cc +++ b/modules/audio_processing/aec3/fft_data_unittest.cc @@ -10,9 +10,9 @@ #include "modules/audio_processing/aec3/fft_data.h" +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/aec3/matched_filter.cc b/modules/audio_processing/aec3/matched_filter.cc index 466acd41b3..7486ddfa08 100644 --- a/modules/audio_processing/aec3/matched_filter.cc +++ b/modules/audio_processing/aec3/matched_filter.cc @@ -9,10 +9,12 @@ */ #include "modules/audio_processing/aec3/matched_filter.h" +// Defines WEBRTC_ARCH_X86_FAMILY, used below. +#include "rtc_base/system/arch.h" + #if defined(WEBRTC_HAS_NEON) #include #endif -#include "typedefs.h" // NOLINT(build/include) #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif diff --git a/modules/audio_processing/aec3/matched_filter.h b/modules/audio_processing/aec3/matched_filter.h index 8add6fe3d5..1c06b5eb2e 100644 --- a/modules/audio_processing/aec3/matched_filter.h +++ b/modules/audio_processing/aec3/matched_filter.h @@ -20,6 +20,7 @@ #include "modules/audio_processing/aec3/aec3_common.h" #include "modules/audio_processing/aec3/downsampled_render_buffer.h" #include "rtc_base/constructormagic.h" +#include "rtc_base/system/arch.h" namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/matched_filter_unittest.cc b/modules/audio_processing/aec3/matched_filter_unittest.cc index fd878ff98d..c7dc211baa 100644 --- a/modules/audio_processing/aec3/matched_filter_unittest.cc +++ b/modules/audio_processing/aec3/matched_filter_unittest.cc @@ -10,7 +10,9 @@ #include "modules/audio_processing/aec3/matched_filter.h" -#include "typedefs.h" // NOLINT(build/include) +// Defines WEBRTC_ARCH_X86_FAMILY, used below. +#include "rtc_base/system/arch.h" + #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif diff --git a/modules/audio_processing/aec3/suppression_gain.cc b/modules/audio_processing/aec3/suppression_gain.cc index 846836de38..a042c5fd9a 100644 --- a/modules/audio_processing/aec3/suppression_gain.cc +++ b/modules/audio_processing/aec3/suppression_gain.cc @@ -11,7 +11,9 @@ #include "modules/audio_processing/aec3/suppression_gain.h" -#include "typedefs.h" // NOLINT(build/include) +// Defines WEBRTC_ARCH_X86_FAMILY, used below. +#include "rtc_base/system/arch.h" + #if defined(WEBRTC_ARCH_X86_FAMILY) #include #endif diff --git a/modules/audio_processing/aec3/suppression_gain_unittest.cc b/modules/audio_processing/aec3/suppression_gain_unittest.cc index 2eeb68b15e..630596ea79 100644 --- a/modules/audio_processing/aec3/suppression_gain_unittest.cc +++ b/modules/audio_processing/aec3/suppression_gain_unittest.cc @@ -18,7 +18,6 @@ #include "rtc_base/checks.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace aec3 { diff --git a/modules/audio_processing/aec3/vector_math.h b/modules/audio_processing/aec3/vector_math.h index 0672b513f3..255331b672 100644 --- a/modules/audio_processing/aec3/vector_math.h +++ b/modules/audio_processing/aec3/vector_math.h @@ -11,7 +11,9 @@ #ifndef MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_ #define MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_ -#include "typedefs.h" // NOLINT(build/include) +// Defines WEBRTC_ARCH_X86_FAMILY, used below. +#include "rtc_base/system/arch.h" + #if defined(WEBRTC_HAS_NEON) #include #endif diff --git a/modules/audio_processing/aec3/vector_math_unittest.cc b/modules/audio_processing/aec3/vector_math_unittest.cc index 6bf60ecb64..fdab2e52ca 100644 --- a/modules/audio_processing/aec3/vector_math_unittest.cc +++ b/modules/audio_processing/aec3/vector_math_unittest.cc @@ -12,9 +12,9 @@ #include +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/aecm/BUILD.gn b/modules/audio_processing/aecm/BUILD.gn index 54d839ed41..19b9c8fa3e 100644 --- a/modules/audio_processing/aecm/BUILD.gn +++ b/modules/audio_processing/aecm/BUILD.gn @@ -17,7 +17,6 @@ rtc_source_set("aecm_core") { "echo_control_mobile.h", ] deps = [ - "../../..:typedefs", "../../../common_audio:common_audio_c", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", diff --git a/modules/audio_processing/aecm/aecm_core.cc b/modules/audio_processing/aecm/aecm_core.cc index 21a2ba110a..0e56b50c5e 100644 --- a/modules/audio_processing/aecm/aecm_core.cc +++ b/modules/audio_processing/aecm/aecm_core.cc @@ -25,7 +25,6 @@ extern "C" { #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" -#include "typedefs.h" // NOLINT(build/include) #ifdef AEC_DEBUG FILE* dfile; diff --git a/modules/audio_processing/aecm/aecm_core.h b/modules/audio_processing/aecm/aecm_core.h index 3da3bca8b8..1681d2a92f 100644 --- a/modules/audio_processing/aecm/aecm_core.h +++ b/modules/audio_processing/aecm/aecm_core.h @@ -18,7 +18,6 @@ extern "C" { #include "common_audio/signal_processing/include/signal_processing_library.h" } #include "modules/audio_processing/aecm/aecm_defines.h" -#include "typedefs.h" // NOLINT(build/include) #ifdef _MSC_VER // visual c++ #define ALIGN8_BEG __declspec(align(8)) diff --git a/modules/audio_processing/aecm/aecm_core_c.cc b/modules/audio_processing/aecm/aecm_core_c.cc index b640f1a6e1..905274fa97 100644 --- a/modules/audio_processing/aecm/aecm_core_c.cc +++ b/modules/audio_processing/aecm/aecm_core_c.cc @@ -26,7 +26,6 @@ extern "C" { #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/sanitizer.h" -#include "typedefs.h" // NOLINT(build/include) // Square root of Hanning window in Q14. static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = { diff --git a/modules/audio_processing/aecm/echo_control_mobile.h b/modules/audio_processing/aecm/echo_control_mobile.h index 576cf196fa..cea13b8b5e 100644 --- a/modules/audio_processing/aecm/echo_control_mobile.h +++ b/modules/audio_processing/aecm/echo_control_mobile.h @@ -11,9 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ #define MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_ -#include - -#include "typedefs.h" // NOLINT(build/include) +#include +#include enum { AecmFalse = 0, AecmTrue }; diff --git a/modules/audio_processing/agc/BUILD.gn b/modules/audio_processing/agc/BUILD.gn index fe2f1078ab..1ce3eae201 100644 --- a/modules/audio_processing/agc/BUILD.gn +++ b/modules/audio_processing/agc/BUILD.gn @@ -19,7 +19,6 @@ rtc_source_set("agc") { ":level_estimation", "..:apm_logging", "..:gain_control_interface", - "../../..:typedefs", "../../..:webrtc_common", "../../../rtc_base:checks", "../../../rtc_base:logging", @@ -41,7 +40,6 @@ rtc_source_set("level_estimation") { "utility.h", ] deps = [ - "../../..:typedefs", "../../..:webrtc_common", "../../../rtc_base:checks", "../../../rtc_base:macromagic", @@ -66,7 +64,6 @@ rtc_source_set("agc_legacy_c") { ] deps = [ - "../../..:typedefs", "../../..:webrtc_common", "../../../common_audio", "../../../common_audio:common_audio_c", diff --git a/modules/audio_processing/agc/agc.h b/modules/audio_processing/agc/agc.h index 98bbf1fab3..5d34c212f3 100644 --- a/modules/audio_processing/agc/agc.h +++ b/modules/audio_processing/agc/agc.h @@ -14,7 +14,6 @@ #include #include "modules/audio_processing/vad/voice_activity_detector.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/agc/legacy/analog_agc.h b/modules/audio_processing/agc/legacy/analog_agc.h index 1fed3779ae..619d95ad0a 100644 --- a/modules/audio_processing/agc/legacy/analog_agc.h +++ b/modules/audio_processing/agc/legacy/analog_agc.h @@ -18,7 +18,6 @@ #include "modules/audio_processing/agc/legacy/digital_agc.h" #include "modules/audio_processing/agc/legacy/gain_control.h" -#include "typedefs.h" // NOLINT(build/include) /* Analog Automatic Gain Control variables: * Constant declarations (inner limits inside which no changes are done) diff --git a/modules/audio_processing/agc/legacy/digital_agc.h b/modules/audio_processing/agc/legacy/digital_agc.h index af6cf48837..f086294cf2 100644 --- a/modules/audio_processing/agc/legacy/digital_agc.h +++ b/modules/audio_processing/agc/legacy/digital_agc.h @@ -15,7 +15,6 @@ #include #endif #include "common_audio/signal_processing/include/signal_processing_library.h" -#include "typedefs.h" // NOLINT(build/include) // the 32 most significant bits of A(19) * B(26) >> 13 #define AGC_MUL32(A, B) (((B) >> 13) * (A) + (((0x00001FFF & (B)) * (A)) >> 13)) diff --git a/modules/audio_processing/agc/legacy/gain_control.h b/modules/audio_processing/agc/legacy/gain_control.h index 05b7ff6797..a0ac96dfa8 100644 --- a/modules/audio_processing/agc/legacy/gain_control.h +++ b/modules/audio_processing/agc/legacy/gain_control.h @@ -11,8 +11,6 @@ #ifndef MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_ #define MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_ -#include "typedefs.h" // NOLINT(build/include) - // Errors #define AGC_UNSPECIFIED_ERROR 18000 #define AGC_UNSUPPORTED_FUNCTION_ERROR 18001 diff --git a/modules/audio_processing/agc/loudness_histogram.h b/modules/audio_processing/agc/loudness_histogram.h index ab45276f06..d8ad751176 100644 --- a/modules/audio_processing/agc/loudness_histogram.h +++ b/modules/audio_processing/agc/loudness_histogram.h @@ -15,8 +15,6 @@ #include -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { // This class implements the histogram of loudness with circular buffers so that diff --git a/modules/audio_processing/agc2/BUILD.gn b/modules/audio_processing/agc2/BUILD.gn index dcdc7fa8f9..c5399ade9f 100644 --- a/modules/audio_processing/agc2/BUILD.gn +++ b/modules/audio_processing/agc2/BUILD.gn @@ -29,7 +29,6 @@ rtc_source_set("level_estimation_agc") { ":rnn_vad_with_level", "..:apm_logging", "..:audio_frame_view", - "../../..:typedefs", "../../../api:array_view", "../../../common_audio", "../../../rtc_base:checks", diff --git a/modules/audio_processing/audio_buffer.h b/modules/audio_processing/audio_buffer.h index 3d7c4a88f0..ade3eec13d 100644 --- a/modules/audio_processing/audio_buffer.h +++ b/modules/audio_processing/audio_buffer.h @@ -18,7 +18,6 @@ #include "common_audio/channel_buffer.h" #include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/splitting_filter.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index 7e5955a98f..04c1ba2cf2 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -33,6 +33,7 @@ #include "rtc_base/logging.h" #include "rtc_base/platform_file.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/system/arch.h" #include "rtc_base/trace_event.h" #if WEBRTC_INTELLIGIBILITY_ENHANCER #include "modules/audio_processing/intelligibility/intelligibility_enhancer.h" diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc index c21de99980..2b5501e362 100644 --- a/modules/audio_processing/audio_processing_unittest.cc +++ b/modules/audio_processing/audio_processing_unittest.cc @@ -35,6 +35,7 @@ #include "rtc_base/protobuf_utils.h" #include "rtc_base/refcountedobject.h" #include "rtc_base/swap_queue.h" +#include "rtc_base/system/arch.h" #include "rtc_base/task_queue.h" #include "rtc_base/thread.h" #include "system_wrappers/include/event_wrapper.h" diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index 9d27f1627d..bf9cab7147 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -34,7 +34,6 @@ #include "rtc_base/platform_file.h" #include "rtc_base/refcount.h" #include "rtc_base/scoped_ref_ptr.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/ns/noise_suppression.h b/modules/audio_processing/ns/noise_suppression.h index fd6aa961c1..0775ffa243 100644 --- a/modules/audio_processing/ns/noise_suppression.h +++ b/modules/audio_processing/ns/noise_suppression.h @@ -12,8 +12,7 @@ #define MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_ #include - -#include "typedefs.h" // NOLINT(build/include) +#include typedef struct NsHandleT NsHandle; diff --git a/modules/audio_processing/ns/noise_suppression_x.h b/modules/audio_processing/ns/noise_suppression_x.h index f25fb7aba1..972784e581 100644 --- a/modules/audio_processing/ns/noise_suppression_x.h +++ b/modules/audio_processing/ns/noise_suppression_x.h @@ -12,8 +12,7 @@ #define MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_ #include - -#include "typedefs.h" // NOLINT(build/include) +#include typedef struct NsxHandleT NsxHandle; diff --git a/modules/audio_processing/ns/nsx_core.h b/modules/audio_processing/ns/nsx_core.h index 479e90c83e..9e9d142818 100644 --- a/modules/audio_processing/ns/nsx_core.h +++ b/modules/audio_processing/ns/nsx_core.h @@ -17,7 +17,6 @@ #include "common_audio/signal_processing/include/signal_processing_library.h" #include "modules/audio_processing/ns/nsx_defines.h" -#include "typedefs.h" // NOLINT(build/include) typedef struct NoiseSuppressionFixedC_ { uint32_t fs; diff --git a/modules/audio_processing/rms_level.h b/modules/audio_processing/rms_level.h index ae45a45baa..9aa549a57c 100644 --- a/modules/audio_processing/rms_level.h +++ b/modules/audio_processing/rms_level.h @@ -13,7 +13,6 @@ #include "absl/types/optional.h" #include "api/array_view.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn index 2e6e50e121..721ebc7ee5 100644 --- a/modules/audio_processing/test/conversational_speech/BUILD.gn +++ b/modules/audio_processing/test/conversational_speech/BUILD.gn @@ -47,7 +47,6 @@ rtc_static_library("lib") { ] deps = [ "../../../..:webrtc_common", - "../../../../:typedefs", "../../../../api:array_view", "../../../../common_audio", "../../../../rtc_base:checks", @@ -69,7 +68,6 @@ rtc_source_set("unittest") { deps = [ ":lib", "../../../..:webrtc_common", - "../../../../:typedefs", "../../../../api:array_view", "../../../../common_audio", "../../../../rtc_base:rtc_base_approved", diff --git a/modules/audio_processing/test/conversational_speech/mock_wavreader.h b/modules/audio_processing/test/conversational_speech/mock_wavreader.h index 55d00b31ae..591299eefe 100644 --- a/modules/audio_processing/test/conversational_speech/mock_wavreader.h +++ b/modules/audio_processing/test/conversational_speech/mock_wavreader.h @@ -17,7 +17,6 @@ #include "api/array_view.h" #include "modules/audio_processing/test/conversational_speech/wavreader_interface.h" #include "test/gmock.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/wavreader_factory.cc b/modules/audio_processing/test/conversational_speech/wavreader_factory.cc index 1a5cf8f2e2..01e3c9412f 100644 --- a/modules/audio_processing/test/conversational_speech/wavreader_factory.cc +++ b/modules/audio_processing/test/conversational_speech/wavreader_factory.cc @@ -15,7 +15,6 @@ #include "api/array_view.h" #include "common_audio/wav_file.h" #include "rtc_base/checks.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/conversational_speech/wavreader_interface.h b/modules/audio_processing/test/conversational_speech/wavreader_interface.h index 3aea273ad2..c74f639461 100644 --- a/modules/audio_processing/test/conversational_speech/wavreader_interface.h +++ b/modules/audio_processing/test/conversational_speech/wavreader_interface.h @@ -14,7 +14,6 @@ #include #include "api/array_view.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/modules/audio_processing/test/protobuf_utils.cc b/modules/audio_processing/test/protobuf_utils.cc index 6ecc97eca3..c47f8ea40f 100644 --- a/modules/audio_processing/test/protobuf_utils.cc +++ b/modules/audio_processing/test/protobuf_utils.cc @@ -9,7 +9,7 @@ */ #include "modules/audio_processing/test/protobuf_utils.h" -#include "typedefs.h" // NOLINT(build/include) +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/audio_processing/test/test_utils.cc b/modules/audio_processing/test/test_utils.cc index 937775e64b..9f1a4691d2 100644 --- a/modules/audio_processing/test/test_utils.cc +++ b/modules/audio_processing/test/test_utils.cc @@ -12,6 +12,7 @@ #include "modules/audio_processing/test/test_utils.h" #include "rtc_base/checks.h" +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/audio_processing/transient/dyadic_decimator.h b/modules/audio_processing/transient/dyadic_decimator.h index e5b19613e5..fcb56b7dc9 100644 --- a/modules/audio_processing/transient/dyadic_decimator.h +++ b/modules/audio_processing/transient/dyadic_decimator.h @@ -13,8 +13,6 @@ #include -#include "typedefs.h" // NOLINT(build/include) - // Provides a set of static methods to perform dyadic decimations. namespace webrtc { diff --git a/modules/audio_processing/transient/file_utils.cc b/modules/audio_processing/transient/file_utils.cc index 40732b9062..58f99325d1 100644 --- a/modules/audio_processing/transient/file_utils.cc +++ b/modules/audio_processing/transient/file_utils.cc @@ -13,7 +13,6 @@ #include #include "rtc_base/system/file_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/transient/file_utils.h b/modules/audio_processing/transient/file_utils.h index 4b04facc8a..618401761b 100644 --- a/modules/audio_processing/transient/file_utils.h +++ b/modules/audio_processing/transient/file_utils.h @@ -14,7 +14,6 @@ #include #include "rtc_base/system/file_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/transient/file_utils_unittest.cc b/modules/audio_processing/transient/file_utils_unittest.cc index 05f83411d2..89902eccb1 100644 --- a/modules/audio_processing/transient/file_utils_unittest.cc +++ b/modules/audio_processing/transient/file_utils_unittest.cc @@ -18,7 +18,6 @@ #include "rtc_base/system/file_wrapper.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/transient/transient_detector_unittest.cc b/modules/audio_processing/transient/transient_detector_unittest.cc index 69a669ff80..d1eb7af857 100644 --- a/modules/audio_processing/transient/transient_detector_unittest.cc +++ b/modules/audio_processing/transient/transient_detector_unittest.cc @@ -19,7 +19,6 @@ #include "rtc_base/system/file_wrapper.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/transient/transient_suppression_test.cc b/modules/audio_processing/transient/transient_suppression_test.cc index 00e198916f..9e7ecd5786 100644 --- a/modules/audio_processing/transient/transient_suppression_test.cc +++ b/modules/audio_processing/transient/transient_suppression_test.cc @@ -22,7 +22,6 @@ #include "rtc_base/flags.h" #include "test/gtest.h" #include "test/testsupport/fileutils.h" -#include "typedefs.h" // NOLINT(build/include) DEFINE_string(in_file_name, "", "PCM file that contains the signal."); DEFINE_string(detection_file_name, diff --git a/modules/audio_processing/transient/transient_suppressor.cc b/modules/audio_processing/transient/transient_suppressor.cc index 28eb666c47..b62935a705 100644 --- a/modules/audio_processing/transient/transient_suppressor.cc +++ b/modules/audio_processing/transient/transient_suppressor.cc @@ -25,7 +25,6 @@ #include "modules/audio_processing/transient/transient_detector.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/transient/transient_suppressor.h b/modules/audio_processing/transient/transient_suppressor.h index 27b096c795..9ae3fc660a 100644 --- a/modules/audio_processing/transient/transient_suppressor.h +++ b/modules/audio_processing/transient/transient_suppressor.h @@ -16,7 +16,6 @@ #include #include "rtc_base/gtest_prod_util.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/transient/wpd_node.h b/modules/audio_processing/transient/wpd_node.h index 117a6338a0..6a52fb7284 100644 --- a/modules/audio_processing/transient/wpd_node.h +++ b/modules/audio_processing/transient/wpd_node.h @@ -13,8 +13,6 @@ #include -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { class FIRFilter; diff --git a/modules/audio_processing/typing_detection.h b/modules/audio_processing/typing_detection.h index 14dfe1d0ea..70fd903366 100644 --- a/modules/audio_processing/typing_detection.h +++ b/modules/audio_processing/typing_detection.h @@ -11,8 +11,6 @@ #ifndef MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ #define MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_ -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { class TypingDetection { diff --git a/modules/audio_processing/utility/BUILD.gn b/modules/audio_processing/utility/BUILD.gn index cd23d01f40..531db879ed 100644 --- a/modules/audio_processing/utility/BUILD.gn +++ b/modules/audio_processing/utility/BUILD.gn @@ -28,7 +28,6 @@ rtc_source_set("legacy_delay_estimator") { "delay_estimator_wrapper.h", ] deps = [ - "../../..:typedefs", "../../../rtc_base:checks", ] } @@ -40,7 +39,7 @@ rtc_source_set("ooura_fft") { "ooura_fft_tables_common.h", ] deps = [ - "../../..:typedefs", + "../../../rtc_base/system:arch", "../../../system_wrappers:cpu_features_api", ] cflags = [] @@ -109,7 +108,6 @@ if (rtc_include_tests) { ] deps = [ ":legacy_delay_estimator", - "../../..:typedefs", "../../../rtc_base:rtc_base_approved", "../../../test:test_support", "//testing/gtest", diff --git a/modules/audio_processing/utility/delay_estimator.h b/modules/audio_processing/utility/delay_estimator.h index 11483ec6b5..2f47e26f36 100644 --- a/modules/audio_processing/utility/delay_estimator.h +++ b/modules/audio_processing/utility/delay_estimator.h @@ -14,7 +14,7 @@ #ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_ #define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_ -#include "typedefs.h" // NOLINT(build/include) +#include static const int32_t kMaxBitCountsQ9 = (32 << 9); // 32 matching bits in Q9. diff --git a/modules/audio_processing/utility/delay_estimator_internal.h b/modules/audio_processing/utility/delay_estimator_internal.h index 46eea3ec18..e99fe21a85 100644 --- a/modules/audio_processing/utility/delay_estimator_internal.h +++ b/modules/audio_processing/utility/delay_estimator_internal.h @@ -14,7 +14,6 @@ #define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_ #include "modules/audio_processing/utility/delay_estimator.h" -#include "typedefs.h" // NOLINT(build/include) typedef union { float float_; diff --git a/modules/audio_processing/utility/delay_estimator_unittest.cc b/modules/audio_processing/utility/delay_estimator_unittest.cc index 8d65cb98bf..324bc37a9e 100644 --- a/modules/audio_processing/utility/delay_estimator_unittest.cc +++ b/modules/audio_processing/utility/delay_estimator_unittest.cc @@ -12,7 +12,6 @@ #include "modules/audio_processing/utility/delay_estimator_internal.h" #include "modules/audio_processing/utility/delay_estimator_wrapper.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace { diff --git a/modules/audio_processing/utility/delay_estimator_wrapper.h b/modules/audio_processing/utility/delay_estimator_wrapper.h index 6b6e51f82c..995470f99d 100644 --- a/modules/audio_processing/utility/delay_estimator_wrapper.h +++ b/modules/audio_processing/utility/delay_estimator_wrapper.h @@ -14,7 +14,7 @@ #ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_ #define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_ -#include "typedefs.h" // NOLINT(build/include) +#include // Releases the memory allocated by WebRtc_CreateDelayEstimatorFarend(...) void WebRtc_FreeDelayEstimatorFarend(void* handle); diff --git a/modules/audio_processing/utility/ooura_fft.cc b/modules/audio_processing/utility/ooura_fft.cc index 2add4eb26b..c3333cea5b 100644 --- a/modules/audio_processing/utility/ooura_fft.cc +++ b/modules/audio_processing/utility/ooura_fft.cc @@ -26,8 +26,8 @@ #include #include "modules/audio_processing/utility/ooura_fft_tables_common.h" +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/utility/ooura_fft.h b/modules/audio_processing/utility/ooura_fft.h index 96d57dc908..0cdd6aa66f 100644 --- a/modules/audio_processing/utility/ooura_fft.h +++ b/modules/audio_processing/utility/ooura_fft.h @@ -11,7 +11,7 @@ #ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_ #define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_ -#include "typedefs.h" // NOLINT(build/include) +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/audio_processing/utility/ooura_fft_mips.cc b/modules/audio_processing/utility/ooura_fft_mips.cc index c782ee7386..9fe577db10 100644 --- a/modules/audio_processing/utility/ooura_fft_mips.cc +++ b/modules/audio_processing/utility/ooura_fft_mips.cc @@ -11,7 +11,6 @@ #include "modules/audio_processing/utility/ooura_fft.h" #include "modules/audio_processing/utility/ooura_fft_tables_common.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/utility/ooura_fft_sse2.cc b/modules/audio_processing/utility/ooura_fft_sse2.cc index b44458eea7..9b5d0f37a4 100644 --- a/modules/audio_processing/utility/ooura_fft_sse2.cc +++ b/modules/audio_processing/utility/ooura_fft_sse2.cc @@ -14,6 +14,7 @@ #include "modules/audio_processing/utility/ooura_fft_tables_common.h" #include "modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h" +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h b/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h index 1c44ae7197..b6e4a07fce 100644 --- a/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h +++ b/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h @@ -12,6 +12,7 @@ #define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_ #include "modules/audio_processing/utility/ooura_fft.h" +#include "rtc_base/system/arch.h" #ifdef _MSC_VER /* visual c++ */ #define ALIGN16_BEG __declspec(align(16)) diff --git a/modules/audio_processing/vad/BUILD.gn b/modules/audio_processing/vad/BUILD.gn index e16b57f8f3..378fbb8920 100644 --- a/modules/audio_processing/vad/BUILD.gn +++ b/modules/audio_processing/vad/BUILD.gn @@ -35,7 +35,6 @@ rtc_static_library("vad") { "voice_gmm_tables.h", ] deps = [ - "../../..:typedefs", "../../../audio/utility:audio_frame_operations", "../../../common_audio", "../../../common_audio:common_audio_c", diff --git a/modules/audio_processing/vad/gmm.cc b/modules/audio_processing/vad/gmm.cc index 266ca44cc9..cd8a1a8a37 100644 --- a/modules/audio_processing/vad/gmm.cc +++ b/modules/audio_processing/vad/gmm.cc @@ -13,8 +13,6 @@ #include #include -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { static const int kMaxDimension = 10; diff --git a/modules/audio_processing/vad/pitch_based_vad.h b/modules/audio_processing/vad/pitch_based_vad.h index 584dcc73ce..4d327652c6 100644 --- a/modules/audio_processing/vad/pitch_based_vad.h +++ b/modules/audio_processing/vad/pitch_based_vad.h @@ -15,7 +15,6 @@ #include "modules/audio_processing/vad/common.h" #include "modules/audio_processing/vad/gmm.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/vad/pole_zero_filter.h b/modules/audio_processing/vad/pole_zero_filter.h index 283deecde3..11a05114d1 100644 --- a/modules/audio_processing/vad/pole_zero_filter.h +++ b/modules/audio_processing/vad/pole_zero_filter.h @@ -11,9 +11,8 @@ #ifndef MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_ #define MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_ -#include - -#include "typedefs.h" // NOLINT(build/include) +#include +#include namespace webrtc { diff --git a/modules/audio_processing/vad/standalone_vad.cc b/modules/audio_processing/vad/standalone_vad.cc index 813d375f9a..19a5282c3f 100644 --- a/modules/audio_processing/vad/standalone_vad.cc +++ b/modules/audio_processing/vad/standalone_vad.cc @@ -14,7 +14,6 @@ #include "audio/utility/audio_frame_operations.h" #include "rtc_base/checks.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/vad/standalone_vad.h b/modules/audio_processing/vad/standalone_vad.h index 3f6eb7fde9..79650fbe8c 100644 --- a/modules/audio_processing/vad/standalone_vad.h +++ b/modules/audio_processing/vad/standalone_vad.h @@ -13,7 +13,6 @@ #include "common_audio/vad/include/webrtc_vad.h" #include "modules/audio_processing/vad/common.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/audio_processing/vad/vad_audio_proc.h b/modules/audio_processing/vad/vad_audio_proc.h index b1441a08c0..e34091bdb6 100644 --- a/modules/audio_processing/vad/vad_audio_proc.h +++ b/modules/audio_processing/vad/vad_audio_proc.h @@ -14,7 +14,6 @@ #include #include "modules/audio_processing/vad/common.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn index 173b658cb5..a82ba9abb5 100644 --- a/modules/congestion_controller/goog_cc/BUILD.gn +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -37,7 +37,6 @@ rtc_static_library("goog_cc") { ":probe_controller", "../..:module_api", "../../..:webrtc_common", - "../../../:typedefs", "../../../api/transport:network_control", "../../../logging:rtc_event_log_api", "../../../logging:rtc_event_pacing", @@ -66,7 +65,6 @@ rtc_source_set("alr_detector") { } deps = [ "../../..:webrtc_common", - "../../../:typedefs", "../../../logging:rtc_event_log_api", "../../../logging:rtc_event_pacing", "../../../rtc_base:checks", @@ -127,7 +125,6 @@ rtc_source_set("delay_based_bwe") { deps = [ ":estimators", - "../../../:typedefs", "../../../logging:rtc_event_bwe", "../../../logging:rtc_event_log_api", "../../../rtc_base:checks", diff --git a/modules/congestion_controller/goog_cc/alr_detector.h b/modules/congestion_controller/goog_cc/alr_detector.h index 2a99ae8039..8d1b00699c 100644 --- a/modules/congestion_controller/goog_cc/alr_detector.h +++ b/modules/congestion_controller/goog_cc/alr_detector.h @@ -15,7 +15,6 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/pacing/interval_budget.h" #include "rtc_base/rate_statistics.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc index b801cc8e62..6d50a87276 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc @@ -28,7 +28,6 @@ #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" -#include "typedefs.h" // NOLINT(build/include) namespace { constexpr int kTimestampGroupLengthMs = 5; diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index 69654dd6a8..e910adf2bf 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -29,7 +29,6 @@ rtc_static_library("primitives") { deps = [ "../..:webrtc_common", - "../../:typedefs", "../../rtc_base:checks", "//third_party/abseil-cpp/absl/memory", ] @@ -97,7 +96,6 @@ if (rtc_include_tests) { ":desktop_capture_mock", ":primitives", "../..:webrtc_common", - "../../:typedefs", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../system_wrappers:cpu_features_api", @@ -373,11 +371,11 @@ rtc_static_library("desktop_capture_generic") { deps = [ ":primitives", "../..:webrtc_common", - "../../:typedefs", "../../api:refcountedbase", "../../rtc_base:checks", "../../rtc_base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806. "../../rtc_base/synchronization:rw_lock_wrapper", + "../../rtc_base/system:arch", "../../system_wrappers", "../../system_wrappers:cpu_features_api", "../../system_wrappers:metrics_api", diff --git a/modules/desktop_capture/desktop_capture_types.h b/modules/desktop_capture/desktop_capture_types.h index f0a2bafa1f..5031cbf3ac 100644 --- a/modules/desktop_capture/desktop_capture_types.h +++ b/modules/desktop_capture/desktop_capture_types.h @@ -13,8 +13,6 @@ #include -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { // Type used to identify windows on the desktop. Values are platform-specific: diff --git a/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc b/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc index 4721a14155..eb2b8b263c 100644 --- a/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc +++ b/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc @@ -24,7 +24,6 @@ #include "rtc_base/timeutils.h" #include "system_wrappers/include/cpu_features_wrapper.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame.h b/modules/desktop_capture/desktop_frame.h index 2a3b71e8a3..6f7edfcc4f 100644 --- a/modules/desktop_capture/desktop_frame.h +++ b/modules/desktop_capture/desktop_frame.h @@ -18,7 +18,6 @@ #include "modules/desktop_capture/desktop_region.h" #include "modules/desktop_capture/shared_memory.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/desktop_capture/desktop_frame_win.h b/modules/desktop_capture/desktop_frame_win.h index 5cad867b14..cd953f0123 100644 --- a/modules/desktop_capture/desktop_frame_win.h +++ b/modules/desktop_capture/desktop_frame_win.h @@ -17,7 +17,6 @@ #include "modules/desktop_capture/desktop_frame.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/desktop_capture/desktop_geometry.h b/modules/desktop_capture/desktop_geometry.h index e01b435d6b..09ad55bb4b 100644 --- a/modules/desktop_capture/desktop_geometry.h +++ b/modules/desktop_capture/desktop_geometry.h @@ -11,8 +11,9 @@ #ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ #define MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_ +#include + #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/desktop_capture/desktop_region.h b/modules/desktop_capture/desktop_region.h index 305f877e9e..f4b9209e2d 100644 --- a/modules/desktop_capture/desktop_region.h +++ b/modules/desktop_capture/desktop_region.h @@ -16,7 +16,6 @@ #include "modules/desktop_capture/desktop_geometry.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/desktop_capture/differ_block.cc b/modules/desktop_capture/differ_block.cc index e15211d7d2..dd9ab457e0 100644 --- a/modules/desktop_capture/differ_block.cc +++ b/modules/desktop_capture/differ_block.cc @@ -13,8 +13,8 @@ #include #include "modules/desktop_capture/differ_vector_sse2.h" +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/desktop_capture/mac/desktop_configuration.h b/modules/desktop_capture/mac/desktop_configuration.h index 2bee9af2cb..5d96aa9b93 100644 --- a/modules/desktop_capture/mac/desktop_configuration.h +++ b/modules/desktop_capture/mac/desktop_configuration.h @@ -15,7 +15,6 @@ #include #include "modules/desktop_capture/desktop_geometry.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/desktop_capture/mouse_cursor_monitor.h b/modules/desktop_capture/mouse_cursor_monitor.h index a589c59b8d..6ba9099757 100644 --- a/modules/desktop_capture/mouse_cursor_monitor.h +++ b/modules/desktop_capture/mouse_cursor_monitor.h @@ -15,7 +15,6 @@ #include "modules/desktop_capture/desktop_capture_types.h" #include "modules/desktop_capture/desktop_geometry.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/desktop_capture/rgba_color.cc b/modules/desktop_capture/rgba_color.cc index 08324e3750..4bef3cdf9a 100644 --- a/modules/desktop_capture/rgba_color.cc +++ b/modules/desktop_capture/rgba_color.cc @@ -9,8 +9,7 @@ */ #include "modules/desktop_capture/rgba_color.h" - -#include "typedefs.h" // NOLINT(build/include) +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/desktop_capture/shared_memory.h b/modules/desktop_capture/shared_memory.h index 3bafa0b41e..3ecdadf461 100644 --- a/modules/desktop_capture/shared_memory.h +++ b/modules/desktop_capture/shared_memory.h @@ -21,7 +21,6 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/thread_checker.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/desktop_capture/win/cursor.cc b/modules/desktop_capture/win/cursor.cc index dfce5fbde7..5aba76908a 100644 --- a/modules/desktop_capture/win/cursor.cc +++ b/modules/desktop_capture/win/cursor.cc @@ -18,7 +18,7 @@ #include "modules/desktop_capture/mouse_cursor.h" #include "modules/desktop_capture/win/scoped_gdi_object.h" #include "rtc_base/logging.h" -#include "typedefs.h" // NOLINT(build/include) +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/desktop_capture/win/scoped_gdi_object.h b/modules/desktop_capture/win/scoped_gdi_object.h index cc6299c541..0de316c694 100644 --- a/modules/desktop_capture/win/scoped_gdi_object.h +++ b/modules/desktop_capture/win/scoped_gdi_object.h @@ -14,7 +14,6 @@ #include #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace win { diff --git a/modules/include/module.h b/modules/include/module.h index fc2a1b5fc9..3b1e046ab1 100644 --- a/modules/include/module.h +++ b/modules/include/module.h @@ -11,7 +11,7 @@ #ifndef MODULES_INCLUDE_MODULE_H_ #define MODULES_INCLUDE_MODULE_H_ -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { diff --git a/modules/include/module_common_types.h b/modules/include/module_common_types.h index 47fd3c25ca..4175c411d5 100644 --- a/modules/include/module_common_types.h +++ b/modules/include/module_common_types.h @@ -29,7 +29,6 @@ #include "rtc_base/deprecation.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/timeutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/include/module_common_types_public.h b/modules/include/module_common_types_public.h index 2afd9af1c0..d4dab40573 100644 --- a/modules/include/module_common_types_public.h +++ b/modules/include/module_common_types_public.h @@ -14,7 +14,6 @@ #include #include "absl/types/optional.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn index f035c7fff6..7f7767f411 100644 --- a/modules/pacing/BUILD.gn +++ b/modules/pacing/BUILD.gn @@ -28,7 +28,6 @@ rtc_static_library("pacing") { deps = [ ":interval_budget", "..:module_api", - "../../:typedefs", "../../:webrtc_common", "../../logging:rtc_event_bwe", "../../logging:rtc_event_log_api", @@ -56,7 +55,6 @@ rtc_source_set("interval_budget") { ] deps = [ - # "../../:typedefs", "../../:webrtc_common", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", diff --git a/modules/pacing/bitrate_prober.h b/modules/pacing/bitrate_prober.h index 816eb0df19..f0ceab27a0 100644 --- a/modules/pacing/bitrate_prober.h +++ b/modules/pacing/bitrate_prober.h @@ -14,7 +14,6 @@ #include #include "modules/include/module_common_types.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { class RtcEventLog; diff --git a/modules/pacing/paced_sender.h b/modules/pacing/paced_sender.h index 2f13de9522..2fcc3a3c0d 100644 --- a/modules/pacing/paced_sender.h +++ b/modules/pacing/paced_sender.h @@ -18,7 +18,6 @@ #include "modules/pacing/packet_queue_interface.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { class AlrDetector; diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn index abdd0358aa..12612032bf 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -40,7 +40,6 @@ rtc_static_library("remote_bitrate_estimator") { deps = [ "../..:webrtc_common", - "../../:typedefs", "../../modules:module_api", "../../modules/rtp_rtcp:rtp_rtcp_format", "../../rtc_base:checks", @@ -122,7 +121,6 @@ if (rtc_include_tests) { ":remote_bitrate_estimator", "..:module_api", "../..:webrtc_common", - "../../:typedefs", "../../logging:mocks", "../../rtc_base:checks", "../../rtc_base:gtest_prod", @@ -132,6 +130,7 @@ if (rtc_include_tests) { "../../rtc_base:safe_minmax", "../../rtc_base/experiments:alr_experiment", "../../rtc_base/system:fallthrough", + "../../rtc_base/system:unused", "../../system_wrappers", "../../system_wrappers:field_trial_api", "../../test:fileutils", diff --git a/modules/remote_bitrate_estimator/include/bwe_defines.h b/modules/remote_bitrate_estimator/include/bwe_defines.h index 2905118ea3..0d8c49bda6 100644 --- a/modules/remote_bitrate_estimator/include/bwe_defines.h +++ b/modules/remote_bitrate_estimator/include/bwe_defines.h @@ -12,7 +12,6 @@ #define MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ #include "absl/types/optional.h" -#include "typedefs.h" // NOLINT(build/include) #define BWE_MAX(a, b) ((a) > (b) ? (a) : (b)) #define BWE_MIN(a, b) ((a) < (b) ? (a) : (b)) diff --git a/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h b/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h index 99f4ab8250..6bf0ff3906 100644 --- a/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h +++ b/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h @@ -20,7 +20,6 @@ #include "modules/include/module.h" #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace rtcp { diff --git a/modules/remote_bitrate_estimator/inter_arrival.h b/modules/remote_bitrate_estimator/inter_arrival.h index e9aaf9b2aa..f46bf4425d 100644 --- a/modules/remote_bitrate_estimator/inter_arrival.h +++ b/modules/remote_bitrate_estimator/inter_arrival.h @@ -11,10 +11,10 @@ #ifndef MODULES_REMOTE_BITRATE_ESTIMATOR_INTER_ARRIVAL_H_ #define MODULES_REMOTE_BITRATE_ESTIMATOR_INTER_ARRIVAL_H_ -#include +#include +#include #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/remote_bitrate_estimator/overuse_detector.h b/modules/remote_bitrate_estimator/overuse_detector.h index 69e5c13d73..f322c30496 100644 --- a/modules/remote_bitrate_estimator/overuse_detector.h +++ b/modules/remote_bitrate_estimator/overuse_detector.h @@ -15,7 +15,6 @@ #include "modules/include/module_common_types.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc index 39406d1a9e..a7cfe4c90a 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc @@ -20,7 +20,6 @@ #include "rtc_base/logging.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/metrics.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc index 7efda7a872..3d791f7848 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc @@ -19,7 +19,6 @@ #include "rtc_base/logging.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/metrics.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc index ec9a58f464..1e513ee315 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc @@ -16,6 +16,7 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/numerics/safe_minmax.h" +#include "rtc_base/system/unused.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/modules/remote_bitrate_estimator/test/bwe_test_framework.h index adade14852..b67a218bc2 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework.h @@ -34,7 +34,6 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/random.h" #include "system_wrappers/include/clock.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/estimators/remb.cc b/modules/remote_bitrate_estimator/test/estimators/remb.cc index 51b38ac763..34e60a6fa5 100644 --- a/modules/remote_bitrate_estimator/test/estimators/remb.cc +++ b/modules/remote_bitrate_estimator/test/estimators/remb.cc @@ -16,8 +16,8 @@ #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "modules/rtp_rtcp/include/receive_statistics.h" +#include "rtc_base/system/unused.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/metric_recorder.cc b/modules/remote_bitrate_estimator/test/metric_recorder.cc index 8ef0177a77..fc2296e279 100644 --- a/modules/remote_bitrate_estimator/test/metric_recorder.cc +++ b/modules/remote_bitrate_estimator/test/metric_recorder.cc @@ -15,7 +15,7 @@ #include #include "modules/remote_bitrate_estimator/test/packet_sender.h" -#include "typedefs.h" // NOLINT(build/include) +#include "rtc_base/system/unused.h" namespace webrtc { namespace testing { diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index b6dd96564c..ae82e3b960 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -87,7 +87,6 @@ rtc_source_set("rtp_rtcp_format") { deps = [ "..:module_api", "../..:webrtc_common", - "../../:typedefs", "../../api:array_view", "../../api:libjingle_peerconnection_api", "../../api/audio_codecs:audio_codecs_api", @@ -196,7 +195,6 @@ rtc_static_library("rtp_rtcp") { ":rtp_rtcp_format", "..:module_api", "../..:webrtc_common", - "../../:typedefs", "../../api:array_view", "../../api:libjingle_peerconnection_api", "../../api:transport_api", @@ -422,7 +420,6 @@ if (rtc_include_tests) { ":rtp_rtcp_format", "..:module_api", "../..:webrtc_common", - "../../:typedefs", "../../api:array_view", "../../api:libjingle_peerconnection_api", "../../api:transport_api", diff --git a/modules/rtp_rtcp/include/receive_statistics.h b/modules/rtp_rtcp/include/receive_statistics.h index d372fd362b..6c51e8502b 100644 --- a/modules/rtp_rtcp/include/receive_statistics.h +++ b/modules/rtp_rtcp/include/receive_statistics.h @@ -18,7 +18,6 @@ #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/include/rtp_header_parser.h b/modules/rtp_rtcp/include/rtp_header_parser.h index 59012ce0a4..2d84fc1e69 100644 --- a/modules/rtp_rtcp/include/rtp_header_parser.h +++ b/modules/rtp_rtcp/include/rtp_header_parser.h @@ -11,7 +11,6 @@ #define MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/include/rtp_receiver.h b/modules/rtp_rtcp/include/rtp_receiver.h index d2d73b41eb..d43acb2c7c 100644 --- a/modules/rtp_rtcp/include/rtp_receiver.h +++ b/modules/rtp_rtcp/include/rtp_receiver.h @@ -15,7 +15,6 @@ #include "api/rtpreceiverinterface.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index cfd9030ed2..56e1cd3e78 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -21,7 +21,6 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "system_wrappers/include/clock.h" -#include "typedefs.h" // NOLINT(build/include) #define RTCP_CNAME_SIZE 256 // RFC 3550 page 44, including null termination #define IP_PACKET_SIZE 1500 // we assume ethernet diff --git a/modules/rtp_rtcp/include/ulpfec_receiver.h b/modules/rtp_rtcp/include/ulpfec_receiver.h index 6ea8496f83..fce6e888cc 100644 --- a/modules/rtp_rtcp/include/ulpfec_receiver.h +++ b/modules/rtp_rtcp/include/ulpfec_receiver.h @@ -12,7 +12,6 @@ #define MODULES_RTP_RTCP_INCLUDE_ULPFEC_RECEIVER_H_ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/byte_io.h b/modules/rtp_rtcp/source/byte_io.h index f9d973b0fe..955bce746e 100644 --- a/modules/rtp_rtcp/source/byte_io.h +++ b/modules/rtp_rtcp/source/byte_io.h @@ -34,10 +34,9 @@ // These classes are implemented as recursive templetizations, inteded to make // it easy for the compiler to completely inline the reading/writing. +#include #include -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { // According to ISO C standard ISO/IEC 9899, section 6.2.6.2 (2), the three diff --git a/modules/rtp_rtcp/source/fec_private_tables_bursty.h b/modules/rtp_rtcp/source/fec_private_tables_bursty.h index 4120cf94dd..5d67292b93 100644 --- a/modules/rtp_rtcp/source/fec_private_tables_bursty.h +++ b/modules/rtp_rtcp/source/fec_private_tables_bursty.h @@ -25,9 +25,7 @@ // (i.e., more packets/symbols in the code, so larger (k,m), i.e., k > 4, // m > 3). -#include - -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { namespace fec_private_tables { diff --git a/modules/rtp_rtcp/source/fec_private_tables_random.h b/modules/rtp_rtcp/source/fec_private_tables_random.h index 96c3cef827..cc7b92984c 100644 --- a/modules/rtp_rtcp/source/fec_private_tables_random.h +++ b/modules/rtp_rtcp/source/fec_private_tables_random.h @@ -15,9 +15,7 @@ // this table are specifically designed to favor recovery to random loss. // These packet masks are defined to protect up to maximum of 48 media packets. -#include - -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { namespace fec_private_tables { diff --git a/modules/rtp_rtcp/source/rtcp_receiver.h b/modules/rtp_rtcp/source/rtcp_receiver.h index c868837be6..a863caeff7 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.h +++ b/modules/rtp_rtcp/source/rtcp_receiver.h @@ -23,7 +23,6 @@ #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" #include "system_wrappers/include/ntp_time.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { class VideoBitrateAllocationObserver; diff --git a/modules/rtp_rtcp/source/rtcp_sender.h b/modules/rtp_rtcp/source/rtcp_sender.h index e27491569c..133bf6809c 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.h +++ b/modules/rtp_rtcp/source/rtcp_sender.h @@ -33,7 +33,6 @@ #include "rtc_base/criticalsection.h" #include "rtc_base/random.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.h b/modules/rtp_rtcp/source/rtp_format_video_generic.h index 9a916bf1e1..6031704d03 100644 --- a/modules/rtp_rtcp/source/rtp_format_video_generic.h +++ b/modules/rtp_rtcp/source/rtp_format_video_generic.h @@ -15,7 +15,6 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtp_format.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace RtpFormatVideoGeneric { diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h index 3f0d7e5532..2b4468abe4 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8.h @@ -32,7 +32,6 @@ #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/rtp_format.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h index 1ed63abdee..f8d5c34f9d 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h @@ -22,7 +22,6 @@ #include "modules/rtp_rtcp/source/rtp_format_vp8.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc index adcc5a232f..7da320c1b5 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc @@ -15,7 +15,6 @@ #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "test/gmock.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) #define CHECK_ARRAY_SIZE(expected_size, array) \ static_assert(expected_size == sizeof(array) / sizeof(array[0]), \ diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.h b/modules/rtp_rtcp/source/rtp_format_vp9.h index 90178643eb..9052c21d67 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9.h +++ b/modules/rtp_rtcp/source/rtp_format_vp9.h @@ -27,7 +27,6 @@ #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/rtp_format.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc index b9480ef0c2..ada56d05da 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc @@ -15,7 +15,6 @@ #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "test/gmock.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc b/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc index 5eb8f1a62d..ad9f79c509 100644 --- a/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc @@ -14,7 +14,6 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_packet_history.h b/modules/rtp_rtcp/source/rtp_packet_history.h index 03527ffdc6..433da0e7ee 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history.h +++ b/modules/rtp_rtcp/source/rtp_packet_history.h @@ -19,7 +19,6 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc index 026c1875de..ab5aeb0be6 100644 --- a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc @@ -17,7 +17,6 @@ #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_receiver_audio.h b/modules/rtp_rtcp/source/rtp_receiver_audio.h index d88acfd2e0..8c82094ab9 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_audio.h +++ b/modules/rtp_rtcp/source/rtp_receiver_audio.h @@ -18,7 +18,6 @@ #include "modules/rtp_rtcp/source/rtp_receiver_strategy.h" #include "modules/rtp_rtcp/source/rtp_utility.h" #include "rtc_base/onetimeevent.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_receiver_impl.h b/modules/rtp_rtcp/source/rtp_receiver_impl.h index ec218d3127..878f499e4c 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_impl.h +++ b/modules/rtp_rtcp/source/rtp_receiver_impl.h @@ -21,7 +21,6 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_receiver_strategy.h" #include "rtc_base/criticalsection.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_receiver_strategy.h b/modules/rtp_rtcp/source/rtp_receiver_strategy.h index 8b13f186ff..bc6378fded 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_strategy.h +++ b/modules/rtp_rtcp/source/rtp_receiver_strategy.h @@ -15,7 +15,6 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_utility.h" #include "rtc_base/criticalsection.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_receiver_video.h b/modules/rtp_rtcp/source/rtp_receiver_video.h index d9404d1ef7..adaab9cddd 100644 --- a/modules/rtp_rtcp/source/rtp_receiver_video.h +++ b/modules/rtp_rtcp/source/rtp_receiver_video.h @@ -15,7 +15,6 @@ #include "modules/rtp_rtcp/source/rtp_receiver_strategy.h" #include "modules/rtp_rtcp/source/rtp_utility.h" #include "rtc_base/onetimeevent.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.h b/modules/rtp_rtcp/source/rtp_sender_audio.h index 16648cd136..63dfc2b99c 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.h +++ b/modules/rtp_rtcp/source/rtp_sender_audio.h @@ -19,7 +19,6 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/onetimeevent.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc index 1d0ddaf322..98531159d3 100644 --- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -34,7 +34,6 @@ #include "test/gmock.h" #include "test/gtest.h" #include "test/mock_transport.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h index 08724c7b48..ce7be16149 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/modules/rtp_rtcp/source/rtp_sender_video.h @@ -27,7 +27,6 @@ #include "rtc_base/rate_statistics.h" #include "rtc_base/sequenced_task_checker.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { class RtpPacketizer; diff --git a/modules/rtp_rtcp/source/rtp_utility.h b/modules/rtp_rtcp/source/rtp_utility.h index 51732dfeb5..762f964a2e 100644 --- a/modules/rtp_rtcp/source/rtp_utility.h +++ b/modules/rtp_rtcp/source/rtp_utility.h @@ -19,7 +19,6 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "rtc_base/deprecation.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/tmmbr_help.h b/modules/rtp_rtcp/source/tmmbr_help.h index 46ce845507..91aeaf4641 100644 --- a/modules/rtp_rtcp/source/tmmbr_help.h +++ b/modules/rtp_rtcp/source/tmmbr_help.h @@ -13,7 +13,6 @@ #include #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h index 7dbc7ddfa5..96367dc7aa 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h +++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h @@ -18,7 +18,6 @@ #include "modules/rtp_rtcp/include/ulpfec_receiver.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" #include "rtc_base/criticalsection.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/utility/BUILD.gn b/modules/utility/BUILD.gn index 5ddfff0052..32da10950f 100644 --- a/modules/utility/BUILD.gn +++ b/modules/utility/BUILD.gn @@ -27,11 +27,11 @@ rtc_static_library("utility") { deps = [ "..:module_api", "../..:webrtc_common", - "../../:typedefs", "../../common_audio", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_task_queue", + "../../rtc_base/system:arch", "../../system_wrappers", ] } diff --git a/modules/utility/include/helpers_android.h b/modules/utility/include/helpers_android.h index b7bb0b2fa8..763a0c37cf 100644 --- a/modules/utility/include/helpers_android.h +++ b/modules/utility/include/helpers_android.h @@ -14,6 +14,8 @@ #include #include +#include "rtc_base/system/arch.h" + // Abort the process if |jni| has a Java exception pending. // TODO(henrika): merge with CHECK_JNI_EXCEPTION() in jni_helpers.h. #define CHECK_EXCEPTION(jni) \ diff --git a/modules/utility/include/process_thread.h b/modules/utility/include/process_thread.h index 4ab40b219a..8c6919660a 100644 --- a/modules/utility/include/process_thread.h +++ b/modules/utility/include/process_thread.h @@ -13,8 +13,6 @@ #include -#include "typedefs.h" // NOLINT(build/include) - #if defined(WEBRTC_WIN) // Due to a bug in the std::unique_ptr implementation that ships with MSVS, // we need the full definition of QueuedTask, on Windows. diff --git a/modules/utility/source/process_thread_impl.h b/modules/utility/source/process_thread_impl.h index fcc668f3cd..c1f6ed4447 100644 --- a/modules/utility/source/process_thread_impl.h +++ b/modules/utility/source/process_thread_impl.h @@ -21,7 +21,6 @@ #include "rtc_base/platform_thread.h" #include "rtc_base/thread_checker.h" #include "system_wrappers/include/event_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn index 62c5314b30..df5139ef58 100644 --- a/modules/video_capture/BUILD.gn +++ b/modules/video_capture/BUILD.gn @@ -29,7 +29,6 @@ rtc_static_library("video_capture_module") { deps = [ "..:module_api", "../..:webrtc_common", - "../../:typedefs", "../../api:libjingle_peerconnection_api", "../../api/video:video_frame", "../../api/video:video_frame_i420", diff --git a/modules/video_capture/video_capture_defines.h b/modules/video_capture/video_capture_defines.h index 350025fa7f..3987c03e10 100644 --- a/modules/video_capture/video_capture_defines.h +++ b/modules/video_capture/video_capture_defines.h @@ -13,7 +13,6 @@ #include "api/video/video_frame.h" #include "modules/include/module_common_types.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 9e11cce76a..10fac98bf1 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -69,7 +69,6 @@ rtc_static_library("packet") { ] deps = [ "..:module_api", - "../../:typedefs", ] } @@ -156,7 +155,6 @@ rtc_static_library("video_coding") { "..:module_api", "..:module_api_public", "../..:webrtc_common", - "../../:typedefs", "../../api:fec_controller_api", "../../api/video:encoded_frame", "../../api/video:video_bitrate_allocator", @@ -194,7 +192,6 @@ rtc_source_set("video_codec_interface") { ] deps = [ "..:module_api", - "../..:typedefs", "../..:webrtc_common", "../../api/video:video_frame", "../../api/video_codecs:video_codecs_api", @@ -211,7 +208,6 @@ rtc_source_set("mock_headers") { ":video_codec_interface", ":video_coding_utility", "../..:webrtc_common", - "../../:typedefs", "../../test:test_support", ] } @@ -261,7 +257,6 @@ rtc_source_set("video_coding_utility") { ":video_codec_interface", "..:module_api", "../..:webrtc_common", - "../../:typedefs", "../../api/video:video_bitrate_allocator", "../../api/video_codecs:video_codecs_api", "../../common_video", @@ -272,6 +267,7 @@ rtc_source_set("video_coding_utility") { "../../rtc_base:rtc_task_queue", "../../rtc_base:sequenced_task_checker", "../../rtc_base/experiments:quality_scaling_experiment", + "../../rtc_base/system:arch", "../../system_wrappers", "../../system_wrappers:field_trial_api", "../../system_wrappers:metrics_api", @@ -346,7 +342,6 @@ rtc_static_library("webrtc_i420") { ":video_codec_interface", ":video_coding_utility", "../..:webrtc_common", - "../../:typedefs", "../../api/video:video_frame_i420", "../../common_video:common_video", "../../rtc_base:checks", @@ -414,7 +409,6 @@ rtc_static_library("webrtc_vp8") { ":video_coding_utility", "..:module_api", "../..:webrtc_common", - "../../:typedefs", "../../api/video:video_frame", "../../api/video_codecs:video_codecs_api", "../../common_video", @@ -600,7 +594,6 @@ if (rtc_include_tests) { ":video_coding_utility", ":webrtc_vp9_helpers", "../..:webrtc_common", - "../../:typedefs", "../../api:videocodec_test_fixture_api", "../../api/video:video_bitrate_allocator", "../../api/video:video_frame", @@ -837,7 +830,6 @@ if (rtc_include_tests) { ":webrtc_vp9_helpers", "..:module_api", "../..:webrtc_common", - "../../:typedefs", "../../api:create_simulcast_test_fixture_api", "../../api:simulcast_test_fixture_api", "../../api:videocodec_test_fixture_api", diff --git a/modules/video_coding/codec_timer.h b/modules/video_coding/codec_timer.h index 1a46834f73..e5d6839504 100644 --- a/modules/video_coding/codec_timer.h +++ b/modules/video_coding/codec_timer.h @@ -15,7 +15,6 @@ #include "modules/include/module_common_types.h" #include "rtc_base/numerics/percentile_filter.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/codecs/i420/include/i420.h b/modules/video_coding/codecs/i420/include/i420.h index 6f2ec02e8a..580bc16c2f 100644 --- a/modules/video_coding/codecs/i420/include/i420.h +++ b/modules/video_coding/codecs/i420/include/i420.h @@ -15,7 +15,6 @@ #include "modules/video_coding/include/video_codec_interface.h" #include "rtc_base/checks.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc index da7b72b559..589a3d898a 100644 --- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -24,7 +24,6 @@ #include "test/gmock.h" #include "test/gtest.h" #include "test/testsupport/mock/mock_frame_reader.h" -#include "typedefs.h" // NOLINT(build/include) using ::testing::_; using ::testing::Property; diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.h b/modules/video_coding/codecs/vp8/screenshare_layers.h index c1b5fa79a7..953b00d60d 100644 --- a/modules/video_coding/codecs/vp8/screenshare_layers.h +++ b/modules/video_coding/codecs/vp8/screenshare_layers.h @@ -15,7 +15,6 @@ #include "modules/video_coding/utility/frame_dropper.h" #include "rtc_base/rate_statistics.h" #include "rtc_base/timeutils.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/decoding_state.h b/modules/video_coding/decoding_state.h index 02a932b80b..b87fb2d034 100644 --- a/modules/video_coding/decoding_state.h +++ b/modules/video_coding/decoding_state.h @@ -15,8 +15,6 @@ #include #include -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { // Forward declarations diff --git a/modules/video_coding/frame_buffer.h b/modules/video_coding/frame_buffer.h index 260471738c..0b8c220a60 100644 --- a/modules/video_coding/frame_buffer.h +++ b/modules/video_coding/frame_buffer.h @@ -18,7 +18,6 @@ #include "modules/video_coding/include/video_coding.h" #include "modules/video_coding/jitter_buffer_common.h" #include "modules/video_coding/session_info.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/include/mock/mock_vcm_callbacks.h b/modules/video_coding/include/mock/mock_vcm_callbacks.h index aab0e6a535..e604cab5b0 100644 --- a/modules/video_coding/include/mock/mock_vcm_callbacks.h +++ b/modules/video_coding/include/mock/mock_vcm_callbacks.h @@ -13,7 +13,6 @@ #include "modules/video_coding/include/video_coding_defines.h" #include "test/gmock.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/include/mock/mock_video_codec_interface.h b/modules/video_coding/include/mock/mock_video_codec_interface.h index 4857c2298b..c29efeead6 100644 --- a/modules/video_coding/include/mock/mock_video_codec_interface.h +++ b/modules/video_coding/include/mock/mock_video_codec_interface.h @@ -16,7 +16,6 @@ #include "modules/video_coding/include/video_codec_interface.h" #include "test/gmock.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/include/video_codec_interface.h b/modules/video_coding/include/video_codec_interface.h index d5c4223fa6..e164189b61 100644 --- a/modules/video_coding/include/video_codec_interface.h +++ b/modules/video_coding/include/video_codec_interface.h @@ -19,7 +19,6 @@ #include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_error_codes.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h index c24fdadf89..7fb6f58364 100644 --- a/modules/video_coding/include/video_coding_defines.h +++ b/modules/video_coding/include/video_coding_defines.h @@ -18,7 +18,6 @@ // For EncodedImage #include "common_video/include/video_frame.h" #include "modules/include/module_common_types.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/inter_frame_delay.h b/modules/video_coding/inter_frame_delay.h index 01cfd2e36b..c66b1c5177 100644 --- a/modules/video_coding/inter_frame_delay.h +++ b/modules/video_coding/inter_frame_delay.h @@ -11,7 +11,7 @@ #ifndef MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ #define MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { diff --git a/modules/video_coding/internal_defines.h b/modules/video_coding/internal_defines.h index 07c972ac65..0c06e9a47f 100644 --- a/modules/video_coding/internal_defines.h +++ b/modules/video_coding/internal_defines.h @@ -11,8 +11,6 @@ #ifndef MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ #define MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { #define MASK_32_BITS(x) (0xFFFFFFFF & (x)) diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h index e1414aa4ee..f649adc8b3 100644 --- a/modules/video_coding/jitter_buffer.h +++ b/modules/video_coding/jitter_buffer.h @@ -28,7 +28,6 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/jitter_buffer_common.h b/modules/video_coding/jitter_buffer_common.h index 0ea73eef79..202b4a386d 100644 --- a/modules/video_coding/jitter_buffer_common.h +++ b/modules/video_coding/jitter_buffer_common.h @@ -11,8 +11,6 @@ #ifndef MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ #define MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { // Used to estimate rolling average of packets per frame. diff --git a/modules/video_coding/jitter_estimator.h b/modules/video_coding/jitter_estimator.h index ff11eeb6dd..aeba3eded3 100644 --- a/modules/video_coding/jitter_estimator.h +++ b/modules/video_coding/jitter_estimator.h @@ -13,7 +13,6 @@ #include "modules/video_coding/rtt_filter.h" #include "rtc_base/rollingaccumulator.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/media_opt_util.h b/modules/video_coding/media_opt_util.h index 9cc8d6db3e..1e2c197673 100644 --- a/modules/video_coding/media_opt_util.h +++ b/modules/video_coding/media_opt_util.h @@ -18,7 +18,6 @@ #include "modules/video_coding/internal_defines.h" #include "rtc_base/numerics/exp_filter.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace media_optimization { diff --git a/modules/video_coding/packet.h b/modules/video_coding/packet.h index c67cc2f0fa..80a39cabbe 100644 --- a/modules/video_coding/packet.h +++ b/modules/video_coding/packet.h @@ -12,7 +12,6 @@ #define MODULES_VIDEO_CODING_PACKET_H_ #include "modules/include/module_common_types.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/rtt_filter.h b/modules/video_coding/rtt_filter.h index 95de363eb9..073fabb85b 100644 --- a/modules/video_coding/rtt_filter.h +++ b/modules/video_coding/rtt_filter.h @@ -11,7 +11,7 @@ #ifndef MODULES_VIDEO_CODING_RTT_FILTER_H_ #define MODULES_VIDEO_CODING_RTT_FILTER_H_ -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { diff --git a/modules/video_coding/session_info.h b/modules/video_coding/session_info.h index b845ffb546..8d577fe0cc 100644 --- a/modules/video_coding/session_info.h +++ b/modules/video_coding/session_info.h @@ -17,7 +17,6 @@ #include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_coding.h" #include "modules/video_coding/packet.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { // Used to pass data from jitter buffer to session info. diff --git a/modules/video_coding/test/stream_generator.h b/modules/video_coding/test/stream_generator.h index 894df5e615..38ca92d763 100644 --- a/modules/video_coding/test/stream_generator.h +++ b/modules/video_coding/test/stream_generator.h @@ -14,7 +14,6 @@ #include "modules/video_coding/packet.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/timestamp_map.h b/modules/video_coding/timestamp_map.h index 15f6e27222..6657787ac2 100644 --- a/modules/video_coding/timestamp_map.h +++ b/modules/video_coding/timestamp_map.h @@ -13,8 +13,6 @@ #include -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { struct VCMFrameInformation; diff --git a/modules/video_coding/timing.h b/modules/video_coding/timing.h index 08ec193d92..2b5e21d649 100644 --- a/modules/video_coding/timing.h +++ b/modules/video_coding/timing.h @@ -16,7 +16,6 @@ #include "modules/video_coding/codec_timer.h" #include "rtc_base/criticalsection.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/utility/frame_dropper.h b/modules/video_coding/utility/frame_dropper.h index 224f31b77f..2764994b25 100644 --- a/modules/video_coding/utility/frame_dropper.h +++ b/modules/video_coding/utility/frame_dropper.h @@ -11,10 +11,10 @@ #ifndef MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_ #define MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_ -#include +#include +#include #include "rtc_base/numerics/exp_filter.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/utility/mock/mock_frame_dropper.h b/modules/video_coding/utility/mock/mock_frame_dropper.h index 91ab221eed..a0f2220080 100644 --- a/modules/video_coding/utility/mock/mock_frame_dropper.h +++ b/modules/video_coding/utility/mock/mock_frame_dropper.h @@ -14,7 +14,6 @@ #include "modules/video_coding/utility/frame_dropper.h" #include "test/gmock.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/utility/vp8_header_parser.cc b/modules/video_coding/utility/vp8_header_parser.cc index d1cfb08b44..6b65fad400 100644 --- a/modules/video_coding/utility/vp8_header_parser.cc +++ b/modules/video_coding/utility/vp8_header_parser.cc @@ -10,6 +10,7 @@ #include "modules/video_coding/utility/vp8_header_parser.h" #include "rtc_base/logging.h" +#include "rtc_base/system/arch.h" namespace webrtc { diff --git a/modules/video_processing/BUILD.gn b/modules/video_processing/BUILD.gn index 82bafecdca..d3724994e6 100644 --- a/modules/video_processing/BUILD.gn +++ b/modules/video_processing/BUILD.gn @@ -32,6 +32,7 @@ rtc_static_library("video_processing") { "../../modules/utility", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", + "../../rtc_base/system:arch", "../../system_wrappers:cpu_features_api", "//third_party/libyuv", ] diff --git a/modules/video_processing/util/denoiser_filter.cc b/modules/video_processing/util/denoiser_filter.cc index cf666332a4..a88865b509 100644 --- a/modules/video_processing/util/denoiser_filter.cc +++ b/modules/video_processing/util/denoiser_filter.cc @@ -13,6 +13,7 @@ #include "modules/video_processing/util/denoiser_filter_neon.h" #include "modules/video_processing/util/denoiser_filter_sse2.h" #include "rtc_base/checks.h" +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/ortc/BUILD.gn b/ortc/BUILD.gn index 233a0eb25f..d0fb00f5ca 100644 --- a/ortc/BUILD.gn +++ b/ortc/BUILD.gn @@ -93,6 +93,7 @@ if (rtc_include_tests) { "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_main", "../rtc_base:rtc_base_tests_utils", + "../rtc_base/system:arch", "../system_wrappers:metrics_default", "../system_wrappers:runtime_enabled_features_default", ] diff --git a/ortc/ortcfactory_integrationtest.cc b/ortc/ortcfactory_integrationtest.cc index 016aacc0ee..681dda948e 100644 --- a/ortc/ortcfactory_integrationtest.cc +++ b/ortc/ortcfactory_integrationtest.cc @@ -23,6 +23,7 @@ #include "rtc_base/criticalsection.h" #include "rtc_base/fakenetwork.h" #include "rtc_base/gunit.h" +#include "rtc_base/system/arch.h" #include "rtc_base/virtualsocketserver.h" namespace { diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index c319fc243a..6666c9fedb 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -203,7 +203,6 @@ rtc_static_library("libstunprober") { deps = [ ":rtc_p2p", "..:webrtc_common", - "../:typedefs", "../rtc_base:checks", "../rtc_base:rtc_base", ] diff --git a/p2p/stunprober/stunprober.h b/p2p/stunprober/stunprober.h index ba3fc5892a..9f1d42f32c 100644 --- a/p2p/stunprober/stunprober.h +++ b/p2p/stunprober/stunprober.h @@ -24,7 +24,6 @@ #include "rtc_base/socketaddress.h" #include "rtc_base/thread.h" #include "rtc_base/thread_checker.h" -#include "typedefs.h" // NOLINT(build/include) namespace rtc { class AsyncPacketSocket; diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 7f9d834378..f4b89dd397 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -109,6 +109,9 @@ rtc_source_set("macromagic") { "stringize_macros.h", "thread_annotations.h", ] + deps = [ + "system:arch", + ] } rtc_source_set("platform_thread_types") { @@ -150,7 +153,7 @@ rtc_source_set("criticalsection") { ":checks", ":macromagic", ":platform_thread_types", - "..:typedefs", + "system:unused", ] } @@ -174,7 +177,6 @@ rtc_source_set("platform_thread") { ":rtc_event", ":thread_checker", ":timeutils", - "..:typedefs", ] } @@ -239,7 +241,6 @@ rtc_source_set("thread_checker") { ":criticalsection", ":macromagic", ":platform_thread_types", - "..:typedefs", ] } @@ -256,7 +257,6 @@ rtc_source_set("checks") { ] deps = [ ":safe_compare", - "..:typedefs", "system:inline", ] } @@ -387,8 +387,8 @@ rtc_source_set("rtc_base_approved_generic") { ":thread_checker", ":timeutils", ":type_traits", - "../:typedefs", "system:arch", + "system:unused", "third_party/base64", ] @@ -557,6 +557,7 @@ if (rtc_enable_libevent) { ":rtc_task_queue_api", ":safe_conversions", ":timeutils", + "system:unused", ] if (rtc_build_libevent) { deps += [ "//base/third_party/libevent" ] diff --git a/rtc_base/criticalsection.cc b/rtc_base/criticalsection.cc index c786a40b19..d8a5b48c05 100644 --- a/rtc_base/criticalsection.cc +++ b/rtc_base/criticalsection.cc @@ -13,6 +13,7 @@ #include "rtc_base/atomicops.h" #include "rtc_base/checks.h" #include "rtc_base/platform_thread_types.h" +#include "rtc_base/system/unused.h" // TODO(tommi): Split this file up to per-platform implementation files. diff --git a/rtc_base/criticalsection.h b/rtc_base/criticalsection.h index ce6fca13aa..f25e7d0c10 100644 --- a/rtc_base/criticalsection.h +++ b/rtc_base/criticalsection.h @@ -15,7 +15,6 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/platform_thread_types.h" #include "rtc_base/thread_annotations.h" -#include "typedefs.h" // NOLINT(build/include) #if defined(WEBRTC_WIN) // clang-format off diff --git a/rtc_base/format_macros.h b/rtc_base/format_macros.h index 48127e16e0..7252f2ea74 100644 --- a/rtc_base/format_macros.h +++ b/rtc_base/format_macros.h @@ -37,6 +37,8 @@ #include +#include "rtc_base/system/arch.h" + #if !defined(PRIuS) #define PRIuS "zu" #endif diff --git a/rtc_base/memory/BUILD.gn b/rtc_base/memory/BUILD.gn index e24b8cee61..05fd7ababc 100644 --- a/rtc_base/memory/BUILD.gn +++ b/rtc_base/memory/BUILD.gn @@ -27,9 +27,7 @@ rtc_source_set("aligned_malloc") { "aligned_malloc.cc", "aligned_malloc.h", ] - deps = [ - "../..:typedefs", - ] + deps = [] } rtc_source_set("unittests") { @@ -41,7 +39,6 @@ rtc_source_set("unittests") { deps = [ ":aligned_array", ":aligned_malloc", - "../..:typedefs", "../../test:test_support", ] } diff --git a/rtc_base/memory/aligned_malloc.cc b/rtc_base/memory/aligned_malloc.cc index 4e1e85c51f..2943a64208 100644 --- a/rtc_base/memory/aligned_malloc.cc +++ b/rtc_base/memory/aligned_malloc.cc @@ -19,8 +19,6 @@ #include #endif -#include "typedefs.h" // NOLINT(build/include) - // Reference on memory alignment: // http://stackoverflow.com/questions/227897/solve-the-memory-alignment-in-c-interview-question-that-stumped-me namespace webrtc { diff --git a/rtc_base/memory/aligned_malloc_unittest.cc b/rtc_base/memory/aligned_malloc_unittest.cc index 742a77266f..572af5a8bb 100644 --- a/rtc_base/memory/aligned_malloc_unittest.cc +++ b/rtc_base/memory/aligned_malloc_unittest.cc @@ -19,7 +19,6 @@ #endif #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/rtc_base/onetimeevent.h b/rtc_base/onetimeevent.h index 8c55e2672d..f649f15ded 100644 --- a/rtc_base/onetimeevent.h +++ b/rtc_base/onetimeevent.h @@ -12,7 +12,6 @@ #define RTC_BASE_ONETIMEEVENT_H_ #include "rtc_base/criticalsection.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { // Provides a simple way to perform an operation (such as logging) one diff --git a/rtc_base/random.h b/rtc_base/random.h index 7c103ccfa7..2faa9856dc 100644 --- a/rtc_base/random.h +++ b/rtc_base/random.h @@ -15,7 +15,6 @@ #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/rtc_base/rate_statistics.h b/rtc_base/rate_statistics.h index fe5ae824a4..89bfddfa55 100644 --- a/rtc_base/rate_statistics.h +++ b/rtc_base/rate_statistics.h @@ -14,7 +14,6 @@ #include #include "absl/types/optional.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/rtc_base/swap_queue.h b/rtc_base/swap_queue.h index f794ad91f9..172f2f5f8f 100644 --- a/rtc_base/swap_queue.h +++ b/rtc_base/swap_queue.h @@ -18,6 +18,7 @@ #include "rtc_base/checks.h" #include "rtc_base/constructormagic.h" #include "rtc_base/criticalsection.h" +#include "rtc_base/system/unused.h" namespace webrtc { diff --git a/rtc_base/synchronization/BUILD.gn b/rtc_base/synchronization/BUILD.gn index 9d9ea6f775..447be38b8a 100644 --- a/rtc_base/synchronization/BUILD.gn +++ b/rtc_base/synchronization/BUILD.gn @@ -21,7 +21,6 @@ rtc_source_set("rw_lock_wrapper") { ] deps = [ "..:macromagic", - "../..:typedefs", ] if (is_win) { sources += [ diff --git a/rtc_base/synchronization/rw_lock_posix.h b/rtc_base/synchronization/rw_lock_posix.h index 9a92bcd2b0..a103fe7714 100644 --- a/rtc_base/synchronization/rw_lock_posix.h +++ b/rtc_base/synchronization/rw_lock_posix.h @@ -14,7 +14,6 @@ #include #include "rtc_base/synchronization/rw_lock_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/rtc_base/system/BUILD.gn b/rtc_base/system/BUILD.gn index 9d3fa2c98a..64df84f663 100644 --- a/rtc_base/system/BUILD.gn +++ b/rtc_base/system/BUILD.gn @@ -38,7 +38,6 @@ rtc_source_set("file_wrapper") { deps = [ "..:checks", "..:criticalsection", - "../..:typedefs", "../..:webrtc_common", ] } diff --git a/rtc_base/system/file_wrapper.h b/rtc_base/system/file_wrapper.h index 4672cc43e3..5411b04f69 100644 --- a/rtc_base/system/file_wrapper.h +++ b/rtc_base/system/file_wrapper.h @@ -16,7 +16,6 @@ #include "common_types.h" // NOLINT(build/include) #include "rtc_base/criticalsection.h" -#include "typedefs.h" // NOLINT(build/include) // Implementation that can read (exclusive) or write from/to a file. diff --git a/rtc_base/task_queue_libevent.cc b/rtc_base/task_queue_libevent.cc index b6e6353798..d3b1a7c5cb 100644 --- a/rtc_base/task_queue_libevent.cc +++ b/rtc_base/task_queue_libevent.cc @@ -24,6 +24,7 @@ #include "rtc_base/platform_thread.h" #include "rtc_base/refcount.h" #include "rtc_base/refcountedobject.h" +#include "rtc_base/system/unused.h" #include "rtc_base/task_queue.h" #include "rtc_base/task_queue_posix.h" #include "rtc_base/timeutils.h" diff --git a/rtc_base/time/BUILD.gn b/rtc_base/time/BUILD.gn index f8f6244585..7b298ce117 100644 --- a/rtc_base/time/BUILD.gn +++ b/rtc_base/time/BUILD.gn @@ -18,7 +18,6 @@ rtc_source_set("timestamp_extrapolator") { "timestamp_extrapolator.h", ] deps = [ - "../..:typedefs", "../synchronization:rw_lock_wrapper", ] } diff --git a/rtc_base/time/timestamp_extrapolator.h b/rtc_base/time/timestamp_extrapolator.h index 6638184263..63af57b227 100644 --- a/rtc_base/time/timestamp_extrapolator.h +++ b/rtc_base/time/timestamp_extrapolator.h @@ -11,8 +11,9 @@ #ifndef RTC_BASE_TIME_TIMESTAMP_EXTRAPOLATOR_H_ #define RTC_BASE_TIME_TIMESTAMP_EXTRAPOLATOR_H_ +#include + #include "rtc_base/synchronization/rw_lock_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index dcb3818c60..99f1ae6b4f 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -147,7 +147,6 @@ if (!build_with_chromium) { deps = [ "..:webrtc_common", - "../:typedefs", "../common_video", ] } @@ -371,7 +370,6 @@ if (rtc_include_tests) { deps = [ "..:webrtc_common", - "../:typedefs", "../common_audio", "../modules/audio_processing", "../modules/audio_processing:audioproc_debug_proto", diff --git a/rtc_tools/frame_editing/frame_editing_lib.cc b/rtc_tools/frame_editing/frame_editing_lib.cc index 4418214b3e..d052cfc3fd 100644 --- a/rtc_tools/frame_editing/frame_editing_lib.cc +++ b/rtc_tools/frame_editing/frame_editing_lib.cc @@ -16,7 +16,6 @@ #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_tools/frame_editing/frame_editing_lib.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/rtc_tools/unpack_aecdump/unpack.cc b/rtc_tools/unpack_aecdump/unpack.cc index 0224ad5bb7..3ce6906d4d 100644 --- a/rtc_tools/unpack_aecdump/unpack.cc +++ b/rtc_tools/unpack_aecdump/unpack.cc @@ -22,7 +22,6 @@ #include "rtc_base/flags.h" #include "rtc_base/format_macros.h" #include "rtc_base/ignore_wundef.h" -#include "typedefs.h" // NOLINT(build/include) RTC_PUSH_IGNORING_WUNDEF() #include "modules/audio_processing/debug.pb.h" diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index f50223f746..34f103bb4e 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -976,6 +976,7 @@ if (is_ios || is_mac) { "../modules/audio_processing:audio_processing", "../modules/video_coding:video_codec_interface", "../rtc_base:rtc_base_tests_utils", + "../rtc_base/system:unused", "../system_wrappers:system_wrappers_default", "//test:test_support", "//third_party/ocmock", diff --git a/sdk/objc/Framework/UnitTests/RTCPeerConnectionFactoryBuilderTest.mm b/sdk/objc/Framework/UnitTests/RTCPeerConnectionFactoryBuilderTest.mm index fa78aeda0f..b09cc12d2d 100644 --- a/sdk/objc/Framework/UnitTests/RTCPeerConnectionFactoryBuilderTest.mm +++ b/sdk/objc/Framework/UnitTests/RTCPeerConnectionFactoryBuilderTest.mm @@ -28,6 +28,7 @@ extern "C" { #include "modules/audio_processing/include/audio_processing.h" #include "rtc_base/gunit.h" +#include "rtc_base/system/unused.h" @interface RTCPeerConnectionFactoryBuilderTest : NSObject - (void)testBuilder; diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn index 4c09164abd..106c63b055 100644 --- a/system_wrappers/BUILD.gn +++ b/system_wrappers/BUILD.gn @@ -39,10 +39,10 @@ rtc_static_library("system_wrappers") { ":metrics_api", ":runtime_enabled_features_api", "..:webrtc_common", - "../:typedefs", "../modules:module_api_public", "../rtc_base:checks", "../rtc_base/synchronization:rw_lock_wrapper", + "../rtc_base/system:arch", "//third_party/abseil-cpp/absl/types:optional", ] @@ -103,7 +103,6 @@ rtc_source_set("cpu_features_api") { ] deps = [ "..:webrtc_common", - "../:typedefs", ] } @@ -194,6 +193,7 @@ if (is_linux) { ] deps = [ ":cpu_features_api", + "../rtc_base/system:arch", ] } } @@ -218,7 +218,6 @@ if (rtc_include_tests) { ":metrics_default", ":system_wrappers", "..:webrtc_common", - "../:typedefs", "../rtc_base:rtc_base_approved", "../test:test_main", "//testing/gtest", diff --git a/system_wrappers/include/clock.h b/system_wrappers/include/clock.h index 0164288785..4b6eab8edc 100644 --- a/system_wrappers/include/clock.h +++ b/system_wrappers/include/clock.h @@ -15,7 +15,6 @@ #include "rtc_base/synchronization/rw_lock_wrapper.h" #include "system_wrappers/include/ntp_time.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/system_wrappers/include/cpu_features_wrapper.h b/system_wrappers/include/cpu_features_wrapper.h index 07ee912cb2..739161afca 100644 --- a/system_wrappers/include/cpu_features_wrapper.h +++ b/system_wrappers/include/cpu_features_wrapper.h @@ -11,12 +11,12 @@ #ifndef SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_ #define SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_ +#include + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -#include "typedefs.h" // NOLINT(build/include) - // List of features in x86. typedef enum { kSSE2, kSSE3 } CPUFeature; diff --git a/system_wrappers/include/cpu_info.h b/system_wrappers/include/cpu_info.h index dbd5d606aa..ab546c7214 100644 --- a/system_wrappers/include/cpu_info.h +++ b/system_wrappers/include/cpu_info.h @@ -11,7 +11,7 @@ #ifndef SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ #define SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { diff --git a/system_wrappers/include/rtp_to_ntp_estimator.h b/system_wrappers/include/rtp_to_ntp_estimator.h index 62a79a597f..d7009d8b1f 100644 --- a/system_wrappers/include/rtp_to_ntp_estimator.h +++ b/system_wrappers/include/rtp_to_ntp_estimator.h @@ -17,7 +17,6 @@ #include "modules/include/module_common_types_public.h" #include "rtc_base/numerics/moving_median_filter.h" #include "system_wrappers/include/ntp_time.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { // Class for converting an RTP timestamp to the NTP domain in milliseconds. diff --git a/system_wrappers/source/cpu_features.cc b/system_wrappers/source/cpu_features.cc index 7417f53d59..d433a77f70 100644 --- a/system_wrappers/source/cpu_features.cc +++ b/system_wrappers/source/cpu_features.cc @@ -10,13 +10,13 @@ // Parts of this file derived from Chromium's base/cpu.cc. +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" #if defined(WEBRTC_ARCH_X86_FAMILY) && defined(_MSC_VER) #include #endif -#include "typedefs.h" // NOLINT(build/include) // No CPU feature is available => straight C path. int GetCPUInfoNoASM(CPUFeature feature) { diff --git a/system_wrappers/source/cpu_features_linux.c b/system_wrappers/source/cpu_features_linux.c index 9c5645068a..004de5a6a9 100644 --- a/system_wrappers/source/cpu_features_linux.c +++ b/system_wrappers/source/cpu_features_linux.c @@ -22,6 +22,7 @@ #include #include #endif +#include "rtc_base/system/arch.h" #include "system_wrappers/include/cpu_features_wrapper.h" #if defined(WEBRTC_ARCH_ARM_FAMILY) diff --git a/system_wrappers/source/event_timer_win.h b/system_wrappers/source/event_timer_win.h index 0b4dff60e0..c99f8c66d6 100644 --- a/system_wrappers/source/event_timer_win.h +++ b/system_wrappers/source/event_timer_win.h @@ -11,12 +11,12 @@ #ifndef SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_ #define SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_ +#include + #include #include "system_wrappers/include/event_wrapper.h" -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { class EventTimerWin : public EventTimerWrapper { diff --git a/test/BUILD.gn b/test/BUILD.gn index f7e952ca5a..4dc65cb3c2 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -61,7 +61,6 @@ rtc_source_set("video_test_common") { deps = [ "..:webrtc_common", - "../:typedefs", "../api:libjingle_peerconnection_api", "../api/video:video_frame", "../api/video:video_frame_i010", @@ -102,6 +101,7 @@ rtc_source_set("rtp_test_utils") { "../modules/rtp_rtcp:rtp_rtcp_format", "../rtc_base:checks", "../rtc_base:rtc_base_approved", + "../rtc_base/system:arch", "//testing/gtest", ] } @@ -240,7 +240,6 @@ if (rtc_include_tests) { ":test_support", ":video_test_common", "..:webrtc_common", - "../:typedefs", "../api/video:video_frame", "../api/video:video_frame_i420", "../common_video", @@ -369,7 +368,6 @@ if (is_ios) { "testsupport/iosfileutils.mm", ] deps = [ - "..:typedefs", "..:webrtc_common", "../rtc_base:checks", "../rtc_base:rtc_base_approved", @@ -387,9 +385,9 @@ rtc_source_set("fileutils") { ] deps = [ "..:webrtc_common", - "../:typedefs", "../rtc_base:checks", "../rtc_base:rtc_base_approved", + "../rtc_base/system:arch", "//third_party/abseil-cpp/absl/types:optional", ] if (is_ios) { @@ -472,7 +470,6 @@ rtc_source_set("direct_transport") { } deps = [ "..:webrtc_common", - "../:typedefs", "../api:transport_api", "../call:call_interfaces", "../modules/rtp_rtcp", @@ -551,7 +548,6 @@ rtc_source_set("test_common") { ":test_support", ":video_test_common", "..:webrtc_common", - "../:typedefs", "../api:libjingle_peerconnection_api", "../api:transport_api", "../api/audio_codecs:builtin_audio_decoder_factory", @@ -649,7 +645,6 @@ rtc_source_set("test_renderer_generic") { deps = [ ":test_support", "..:webrtc_common", - "../:typedefs", "../api/video:video_frame", "../common_video", "../media:rtc_media_base", diff --git a/test/frame_generator.h b/test/frame_generator.h index 37a4a197e1..a92c3b4b5a 100644 --- a/test/frame_generator.h +++ b/test/frame_generator.h @@ -17,7 +17,6 @@ #include "api/video/video_frame.h" #include "api/video/video_source_interface.h" #include "rtc_base/criticalsection.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { class Clock; diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h index 1aecf497b2..63219900d8 100644 --- a/test/frame_generator_capturer.h +++ b/test/frame_generator_capturer.h @@ -18,7 +18,6 @@ #include "rtc_base/task_queue.h" #include "test/frame_generator.h" #include "test/video_capturer.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn index 805af14948..f361d59261 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -260,7 +260,6 @@ rtc_static_library("audio_decoder_fuzzer") { ] deps = [ "../..:webrtc_common", - "../../:typedefs", "../../api/audio_codecs:audio_codecs_api", "../../modules/rtp_rtcp:rtp_rtcp_format", "../../rtc_base:checks", diff --git a/test/fuzzers/audio_decoder_fuzzer.h b/test/fuzzers/audio_decoder_fuzzer.h index 504ecf6c02..b935004220 100644 --- a/test/fuzzers/audio_decoder_fuzzer.h +++ b/test/fuzzers/audio_decoder_fuzzer.h @@ -12,8 +12,7 @@ #define TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_ #include - -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { diff --git a/test/gl/gl_renderer.h b/test/gl/gl_renderer.h index 16f432b2b1..531e3f56ce 100644 --- a/test/gl/gl_renderer.h +++ b/test/gl/gl_renderer.h @@ -18,7 +18,6 @@ #endif #include "test/video_renderer.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/test/linux/glx_renderer.h b/test/linux/glx_renderer.h index ec8b3ddd6c..0c486df97f 100644 --- a/test/linux/glx_renderer.h +++ b/test/linux/glx_renderer.h @@ -15,7 +15,6 @@ #include #include "test/gl/gl_renderer.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/test/rtp_file_reader.cc b/test/rtp_file_reader.cc index 17d4d1447a..c9eb98681c 100644 --- a/test/rtp_file_reader.cc +++ b/test/rtp_file_reader.cc @@ -21,6 +21,7 @@ #include "rtc_base/constructormagic.h" #include "rtc_base/format_macros.h" #include "rtc_base/logging.h" +#include "rtc_base/system/arch.h" namespace webrtc { namespace test { diff --git a/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h index 99c8b732aa..d946b5f675 100644 --- a/test/rtp_rtcp_observer.h +++ b/test/rtp_rtcp_observer.h @@ -22,7 +22,6 @@ #include "test/constants.h" #include "test/direct_transport.h" #include "test/gtest.h" -#include "typedefs.h" // NOLINT(build/include) namespace { const int kShortTimeoutMs = 500; diff --git a/test/statistics.h b/test/statistics.h index 0389fd1232..2fa706f603 100644 --- a/test/statistics.h +++ b/test/statistics.h @@ -10,7 +10,7 @@ #ifndef TEST_STATISTICS_H_ #define TEST_STATISTICS_H_ -#include "typedefs.h" // NOLINT(build/include) +#include namespace webrtc { namespace test { diff --git a/test/testsupport/fileutils.cc b/test/testsupport/fileutils.cc index 119f6cc0ba..7b4482a124 100644 --- a/test/testsupport/fileutils.cc +++ b/test/testsupport/fileutils.cc @@ -44,7 +44,7 @@ #include "rtc_base/checks.h" #include "rtc_base/stringutils.h" -#include "typedefs.h" // NOLINT(build/include) // For architecture defines +#include "rtc_base/system/arch.h" namespace webrtc { namespace test { diff --git a/test/testsupport/frame_reader.h b/test/testsupport/frame_reader.h index 2e19af344e..de8962e126 100644 --- a/test/testsupport/frame_reader.h +++ b/test/testsupport/frame_reader.h @@ -16,7 +16,6 @@ #include #include "rtc_base/scoped_ref_ptr.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { class I420Buffer; diff --git a/test/testsupport/frame_writer.h b/test/testsupport/frame_writer.h index be9adb6e4a..b91e57c963 100644 --- a/test/testsupport/frame_writer.h +++ b/test/testsupport/frame_writer.h @@ -16,7 +16,6 @@ #include #include "api/video/video_frame.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/test/testsupport/iosfileutils.mm b/test/testsupport/iosfileutils.mm index a9156db656..5e9f71c8b7 100644 --- a/test/testsupport/iosfileutils.mm +++ b/test/testsupport/iosfileutils.mm @@ -15,7 +15,6 @@ #include "rtc_base/checks.h" #include "sdk/objc/Framework/Classes/Common/helpers.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/test/video_renderer.cc b/test/video_renderer.cc index 68a20f3752..75ab72a883 100644 --- a/test/video_renderer.cc +++ b/test/video_renderer.cc @@ -11,8 +11,6 @@ // TODO(pbos): Android renderer -#include "typedefs.h" // NOLINT(build/include) - namespace webrtc { namespace test { diff --git a/test/win/d3d_renderer.h b/test/win/d3d_renderer.h index 7f25aba547..a43be447f6 100644 --- a/test/win/d3d_renderer.h +++ b/test/win/d3d_renderer.h @@ -16,7 +16,6 @@ #include "rtc_base/scoped_ref_ptr.h" #include "test/video_renderer.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/video/BUILD.gn b/video/BUILD.gn index 3c9cdb37e0..274104e886 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -53,7 +53,6 @@ rtc_static_library("video") { deps = [ "..:webrtc_common", - "../:typedefs", "../api:fec_controller_api", "../api:libjingle_peerconnection_api", "../api:transport_api", @@ -347,7 +346,6 @@ if (rtc_include_tests) { ] deps = [ "..:webrtc_common", - "../:typedefs", "../api/video_codecs:video_codecs_api", "../call:call_interfaces", "../common_video", diff --git a/video/encoder_rtcp_feedback.h b/video/encoder_rtcp_feedback.h index d66a78e121..f6fa4a25f5 100644 --- a/video/encoder_rtcp_feedback.h +++ b/video/encoder_rtcp_feedback.h @@ -15,7 +15,6 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "rtc_base/criticalsection.h" #include "system_wrappers/include/clock.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/video/replay.cc b/video/replay.cc index 4667aa20cf..cfdf35bb83 100644 --- a/video/replay.cc +++ b/video/replay.cc @@ -36,7 +36,6 @@ #include "test/testsupport/frame_writer.h" #include "test/video_capturer.h" #include "test/video_renderer.h" -#include "typedefs.h" // NOLINT(build/include) namespace { diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h index 083bb36cb8..9e8b846eaa 100644 --- a/video/rtp_video_stream_receiver.h +++ b/video/rtp_video_stream_receiver.h @@ -34,7 +34,6 @@ #include "rtc_base/criticalsection.h" #include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/sequenced_task_checker.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/video/stats_counter.h b/video/stats_counter.h index 5a52e86bc9..68017391b8 100644 --- a/video/stats_counter.h +++ b/video/stats_counter.h @@ -15,7 +15,6 @@ #include #include "rtc_base/constructormagic.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/video/stream_synchronization.h b/video/stream_synchronization.h index 52b8bde21d..78fcf7286f 100644 --- a/video/stream_synchronization.h +++ b/video/stream_synchronization.h @@ -14,7 +14,6 @@ #include #include "system_wrappers/include/rtp_to_ntp_estimator.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc { diff --git a/video/video_stream_decoder.h b/video/video_stream_decoder.h index 4bc740697d..dd8601a5e6 100644 --- a/video/video_stream_decoder.h +++ b/video/video_stream_decoder.h @@ -22,7 +22,6 @@ #include "rtc_base/criticalsection.h" #include "rtc_base/platform_thread.h" #include "rtc_base/scoped_ref_ptr.h" -#include "typedefs.h" // NOLINT(build/include) namespace webrtc {