diff --git a/api/audio_codecs/BUILD.gn b/api/audio_codecs/BUILD.gn index 26c66d1b5d..d07682657d 100644 --- a/api/audio_codecs/BUILD.gn +++ b/api/audio_codecs/BUILD.gn @@ -32,7 +32,6 @@ rtc_source_set("audio_codecs_api") { "..:array_view", "..:bitrate_allocation", "..:scoped_refptr", - "../..:webrtc_common", "../../rtc_base:checks", "../../rtc_base:deprecation", "../../rtc_base:rtc_base_approved", diff --git a/api/video/builtin_video_bitrate_allocator_factory.cc b/api/video/builtin_video_bitrate_allocator_factory.cc index b01e5c219f..8991367339 100644 --- a/api/video/builtin_video_bitrate_allocator_factory.cc +++ b/api/video/builtin_video_bitrate_allocator_factory.cc @@ -13,7 +13,6 @@ #include "absl/memory/memory.h" #include "api/video/video_bitrate_allocator.h" #include "api/video_codecs/video_codec.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp9/svc_rate_allocator.h" #include "modules/video_coding/utility/default_video_bitrate_allocator.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn index 4a8a380ecf..672246d829 100644 --- a/api/video_codecs/BUILD.gn +++ b/api/video_codecs/BUILD.gn @@ -137,7 +137,6 @@ rtc_static_library("rtc_software_fallback_wrappers") { deps = [ ":video_codecs_api", - "../../:webrtc_common", "../../media:rtc_h264_profile_id", "../../media:rtc_media_base", "../../modules/video_coding:video_codec_interface", diff --git a/api/video_codecs/test/BUILD.gn b/api/video_codecs/test/BUILD.gn index 7b16497b90..03b9276f25 100644 --- a/api/video_codecs/test/BUILD.gn +++ b/api/video_codecs/test/BUILD.gn @@ -22,7 +22,6 @@ if (rtc_include_tests) { "..:rtc_software_fallback_wrappers", "..:video_codecs_api", "../..:mock_video_encoder", - "../../../:webrtc_common", "../../../api:scoped_refptr", "../../../modules:module_api", "../../../modules/video_coding:video_codec_interface", diff --git a/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc index b84ec36b9a..e7df549646 100644 --- a/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc +++ b/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc @@ -17,7 +17,6 @@ #include "api/video/video_frame.h" #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc index de245c8295..40cbb1fad0 100644 --- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc +++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc @@ -27,7 +27,6 @@ #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_software_fallback_wrapper.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/include/video_codec_interface.h" diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/api/video_codecs/video_encoder_software_fallback_wrapper.cc index 4360980ba6..46659a4e39 100644 --- a/api/video_codecs/video_encoder_software_fallback_wrapper.cc +++ b/api/video_codecs/video_encoder_software_fallback_wrapper.cc @@ -21,7 +21,6 @@ #include "api/video/video_bitrate_allocation.h" #include "api/video/video_frame.h" #include "api/video_codecs/video_codec.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_error_codes.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/call/BUILD.gn b/call/BUILD.gn index 1f94d9c7a5..11be068620 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -30,7 +30,6 @@ rtc_source_set("call_interfaces") { deps = [ ":rtp_interfaces", ":video_stream_api", - "..:webrtc_common", "../api:fec_controller_api", "../api:libjingle_peerconnection_api", "../api:rtp_headers", @@ -100,7 +99,6 @@ rtc_source_set("rtp_receiver") { ] deps = [ ":rtp_interfaces", - "..:webrtc_common", "../api:array_view", "../api:rtp_headers", "../modules/rtp_rtcp", @@ -125,7 +123,6 @@ rtc_source_set("rtp_sender") { deps = [ ":bitrate_configurator", ":rtp_interfaces", - "..:webrtc_common", "../api:fec_controller_api", "../api:transport_api", "../api/transport:field_trial_based_config", @@ -217,7 +214,6 @@ rtc_static_library("call") { ":rtp_sender", ":simulated_network", ":video_stream_api", - "..:webrtc_common", "../api:array_view", "../api:callfactory_api", "../api:fec_controller_api", @@ -322,7 +318,6 @@ rtc_source_set("fake_network") { ":call_interfaces", ":simulated_network", ":simulated_packet_receiver", - "..:webrtc_common", "../api:libjingle_peerconnection_api", "../api:simulated_network_api", "../api:transport_api", @@ -363,7 +358,6 @@ if (rtc_include_tests) { ":rtp_receiver", ":rtp_sender", ":simulated_network", - "../:webrtc_common", "../api:array_view", "../api:fake_media_transport", "../api:fake_media_transport", diff --git a/call/rtp_payload_params.cc b/call/rtp_payload_params.cc index 7ea30ef178..84ca65f395 100644 --- a/call/rtp_payload_params.cc +++ b/call/rtp_payload_params.cc @@ -16,7 +16,6 @@ #include "absl/container/inlined_vector.h" #include "absl/types/variant.h" #include "api/video/video_timing.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/codecs/interface/common_constants.h" #include "modules/video_coding/codecs/vp8/include/vp8_globals.h" diff --git a/call/rtp_payload_params_unittest.cc b/call/rtp_payload_params_unittest.cc index 9f6908f45d..6216034b8a 100644 --- a/call/rtp_payload_params_unittest.cc +++ b/call/rtp_payload_params_unittest.cc @@ -18,7 +18,6 @@ #include "api/video/video_content_type.h" #include "api/video/video_rotation.h" #include "call/rtp_payload_params.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/codecs/interface/common_constants.h" #include "modules/video_coding/codecs/vp8/include/vp8_globals.h" diff --git a/common_video/h264/profile_level_id_unittest.cc b/common_video/h264/profile_level_id_unittest.cc index aa50cbe91c..957b434a3c 100644 --- a/common_video/h264/profile_level_id_unittest.cc +++ b/common_video/h264/profile_level_id_unittest.cc @@ -14,7 +14,6 @@ #include #include "absl/types/optional.h" -#include "common_types.h" // NOLINT(build/include) #include "media/base/h264_profile_level_id.h" #include "test/gtest.h" diff --git a/media/BUILD.gn b/media/BUILD.gn index d9769717b5..2c9974195d 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -185,7 +185,6 @@ rtc_static_library("rtc_encoder_simulcast_proxy") { ] deps = [ ":rtc_simulcast_encoder_adapter", - "../:webrtc_common", "../api/video:video_bitrate_allocation", "../api/video:video_frame", "../api/video_codecs:video_codecs_api", @@ -445,7 +444,6 @@ if (rtc_include_tests) { ":rtc_internal_video_codecs", ":rtc_media", ":rtc_media_base", - "..:webrtc_common", "../api:call_api", "../api/video:video_bitrate_allocation", "../api/video:video_frame", diff --git a/media/engine/encoder_simulcast_proxy.h b/media/engine/encoder_simulcast_proxy.h index 2574fa9429..29151ad5e5 100644 --- a/media/engine/encoder_simulcast_proxy.h +++ b/media/engine/encoder_simulcast_proxy.h @@ -23,7 +23,6 @@ #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_codec_interface.h" namespace webrtc { diff --git a/media/engine/fake_webrtc_video_engine.h b/media/engine/fake_webrtc_video_engine.h index 3ab924aca4..3265274efd 100644 --- a/media/engine/fake_webrtc_video_engine.h +++ b/media/engine/fake_webrtc_video_engine.h @@ -26,7 +26,6 @@ #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_codec_interface.h" #include "rtc_base/critical_section.h" #include "rtc_base/event.h" diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn index 4c84235df3..64a07e2366 100644 --- a/modules/audio_processing/BUILD.gn +++ b/modules/audio_processing/BUILD.gn @@ -157,7 +157,6 @@ rtc_static_library("audio_processing") { ":gain_control_config_proxy", ":gain_control_interface", ":noise_suppression_proxy", - "../..:webrtc_common", "../../api:array_view", "../../api:function_view", "../../api/audio:aec3_config", @@ -330,7 +329,6 @@ rtc_source_set("audio_processing_c") { } deps = [ - "../..:webrtc_common", "../../common_audio", "../../common_audio:common_audio_c", "../../common_audio/third_party/fft4g", @@ -455,7 +453,6 @@ if (rtc_include_tests) { ":file_audio_generator_unittests", ":gain_control_config_proxy", ":mocks", - "../..:webrtc_common", "../../api:array_view", "../../api:scoped_refptr", "../../api/audio:aec3_config", @@ -705,7 +702,6 @@ if (rtc_include_tests) { ] deps = [ ":audio_processing", - "../..:webrtc_common", "../../common_audio", "../../rtc_base:rtc_base_approved", "../../rtc_base/system:file_wrapper", @@ -726,7 +722,6 @@ if (rtc_include_tests) { ] deps = [ ":audio_processing", - "../..:webrtc_common", "../../rtc_base/system:file_wrapper", "../../system_wrappers", ] @@ -748,7 +743,6 @@ if (rtc_include_tests) { deps = [ ":audioproc_debug_proto", - "../..:webrtc_common", "../../rtc_base:checks", "../../rtc_base:protobuf_utils", "../../rtc_base:rtc_base_approved", diff --git a/modules/audio_processing/agc/BUILD.gn b/modules/audio_processing/agc/BUILD.gn index 4c0e768940..69db73dbdf 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", - "../../..:webrtc_common", "../../../rtc_base:checks", "../../../rtc_base:gtest_prod", "../../../rtc_base:logging", @@ -41,7 +40,6 @@ rtc_source_set("level_estimation") { "utility.h", ] deps = [ - "../../..:webrtc_common", "../../../rtc_base:checks", "../../../rtc_base:macromagic", "../vad", @@ -65,7 +63,6 @@ rtc_source_set("agc_legacy_c") { ] deps = [ - "../../..:webrtc_common", "../../../common_audio", "../../../common_audio:common_audio_c", "../../../common_audio/third_party/fft4g", @@ -112,7 +109,6 @@ if (rtc_include_tests) { ":agc", ":level_estimation", "..:mocks", - "../../..:webrtc_common", "../../../test:fileutils", "../../../test:test_support", "//testing/gtest", diff --git a/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn index 551781b8bc..282591b22c 100644 --- a/modules/audio_processing/test/conversational_speech/BUILD.gn +++ b/modules/audio_processing/test/conversational_speech/BUILD.gn @@ -46,7 +46,6 @@ rtc_static_library("lib") { "wavreader_interface.h", ] deps = [ - "../../../..:webrtc_common", "../../../../api:array_view", "../../../../common_audio", "../../../../rtc_base:checks", @@ -68,7 +67,6 @@ rtc_source_set("unittest") { ] deps = [ ":lib", - "../../../..:webrtc_common", "../../../../api:array_view", "../../../../common_audio", "../../../../rtc_base:rtc_base_approved", diff --git a/modules/audio_processing/test/py_quality_assessment/BUILD.gn b/modules/audio_processing/test/py_quality_assessment/BUILD.gn index 3584e24116..ecf05b3e5d 100644 --- a/modules/audio_processing/test/py_quality_assessment/BUILD.gn +++ b/modules/audio_processing/test/py_quality_assessment/BUILD.gn @@ -116,7 +116,6 @@ rtc_executable("fake_polqa") { visibility = [ ":*" ] # Only targets in this file can depend on this. output_dir = "${root_out_dir}/py_quality_assessment/quality_assessment" deps = [ - "../../../..:webrtc_common", "../../../../rtc_base:checks", "../../../../rtc_base:rtc_base_approved", ] @@ -127,7 +126,6 @@ rtc_executable("vad") { "quality_assessment/vad.cc", ] deps = [ - "../../../..:webrtc_common", "../../../../common_audio", "../../../../rtc_base:rtc_base_approved", ] @@ -139,7 +137,6 @@ rtc_executable("apm_vad") { ] deps = [ "../..", - "../../../..:webrtc_common", "../../../../common_audio", "../../../../rtc_base:rtc_base_approved", "../../vad", @@ -152,7 +149,6 @@ rtc_executable("sound_level") { ] deps = [ "../..", - "../../../..:webrtc_common", "../../../../common_audio", "../../../../rtc_base:rtc_base_approved", ] diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn index caa6d7fd42..fc5941dc69 100644 --- a/modules/congestion_controller/BUILD.gn +++ b/modules/congestion_controller/BUILD.gn @@ -31,7 +31,6 @@ rtc_static_library("congestion_controller") { deps = [ ":transport_feedback", "..:module_api", - "../..:webrtc_common", "../../api:scoped_refptr", "../../api/transport:field_trial_based_config", "../../api/transport:network_control", diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn index 5d744ada33..0c67a7dac4 100644 --- a/modules/congestion_controller/goog_cc/BUILD.gn +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -30,7 +30,6 @@ rtc_static_library("goog_cc") { ":probe_controller", ":pushback_controller", "../..:module_api", - "../../..:webrtc_common", "../../../api/transport:field_trial_based_config", "../../../api/transport:network_control", "../../../api/transport:webrtc_key_value_config", @@ -88,7 +87,6 @@ rtc_source_set("alr_detector") { "alr_detector.h", ] deps = [ - "../../..:webrtc_common", "../../../api/transport:webrtc_key_value_config", "../../../logging:rtc_event_log_api", "../../../logging:rtc_event_pacing", diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h index 30c89dd087..ea28935ab3 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller.h +++ b/modules/congestion_controller/include/send_side_congestion_controller.h @@ -16,7 +16,6 @@ #include "api/transport/field_trial_based_config.h" #include "api/transport/webrtc_key_value_config.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/include/network_changed_observer.h" #include "modules/congestion_controller/include/send_side_congestion_controller_interface.h" diff --git a/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h b/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h index 6bf0ff3906..1546f30670 100644 --- a/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h +++ b/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h @@ -16,7 +16,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module.h" #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/modules/remote_bitrate_estimator/overuse_detector_unittest.cc b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc index 8ff3bddf54..7fefa5c80b 100644 --- a/modules/remote_bitrate_estimator/overuse_detector_unittest.cc +++ b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc @@ -14,7 +14,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "modules/remote_bitrate_estimator/inter_arrival.h" #include "modules/remote_bitrate_estimator/overuse_detector.h" #include "modules/remote_bitrate_estimator/overuse_estimator.h" 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 b3c6786ab9..e5e25c97d9 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc @@ -15,7 +15,6 @@ #include #include "absl/types/optional.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/remote_bitrate_estimator/aimd_rate_control.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/inter_arrival.h" diff --git a/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/modules/remote_bitrate_estimator/test/bwe_test_logging.h index 5ad58df6ef..a399d0b694 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_logging.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_logging.h @@ -128,7 +128,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "rtc_base/constructor_magic.h" #include "rtc_base/critical_section.h" diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index b941af0f76..0424a7adc9 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -89,7 +89,6 @@ rtc_source_set("rtp_rtcp_format") { deps = [ "..:module_api", "..:module_api_public", - "../..:webrtc_common", "../../api:array_view", "../../api:function_view", "../../api:libjingle_peerconnection_api", diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index d339ecb130..8691fe7c0f 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -20,7 +20,6 @@ #include "api/audio_codecs/audio_format.h" #include "api/rtp_headers.h" #include "api/transport/network_types.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "system_wrappers/include/clock.h" diff --git a/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/modules/rtp_rtcp/source/nack_rtx_unittest.cc index 038e925422..2ae324c933 100644 --- a/modules/rtp_rtcp/source/nack_rtx_unittest.cc +++ b/modules/rtp_rtcp/source/nack_rtx_unittest.cc @@ -19,7 +19,6 @@ #include "api/transport/field_trial_based_config.h" #include "call/rtp_stream_receiver_controller.h" #include "call/rtx_receive_stream.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/receive_statistics.h" #include "modules/rtp_rtcp/include/rtp_rtcp.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc index b301461427..634775821e 100644 --- a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc +++ b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc @@ -9,7 +9,6 @@ */ #include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h" -#include "common_types.h" // NOLINT(build/include) #include "system_wrappers/include/clock.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc index 22d6433791..e3b1d13505 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.cc +++ b/modules/rtp_rtcp/source/rtcp_receiver.cc @@ -21,7 +21,6 @@ #include "absl/memory/memory.h" #include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocator.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" diff --git a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc index a576fdc5e9..10351da4e0 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc @@ -13,7 +13,6 @@ #include "api/array_view.h" #include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocator.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/mocks/mock_rtcp_bandwidth_observer.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtcp_packet.h" diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc index 4bbc3079d5..f362fcb0db 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/modules/rtp_rtcp/source/rtcp_sender.cc @@ -16,7 +16,6 @@ #include #include "absl/memory/memory.h" -#include "common_types.h" // NOLINT(build/include) #include "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "modules/rtp_rtcp/source/rtcp_packet/app.h" diff --git a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc index d297f3d661..b6b3c34f51 100644 --- a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc @@ -10,7 +10,6 @@ #include -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" diff --git a/modules/rtp_rtcp/source/rtp_format.h b/modules/rtp_rtcp/source/rtp_format.h index c32283b72b..3303c92c7f 100644 --- a/modules/rtp_rtcp/source/rtp_format.h +++ b/modules/rtp_rtcp/source/rtp_format.h @@ -16,7 +16,6 @@ #include #include "api/array_view.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/rtp_video_header.h" diff --git a/modules/rtp_rtcp/source/rtp_format_h264.cc b/modules/rtp_rtcp/source/rtp_format_h264.cc index 0a70fcd109..53b719e42f 100644 --- a/modules/rtp_rtcp/source/rtp_format_h264.cc +++ b/modules/rtp_rtcp/source/rtp_format_h264.cc @@ -20,7 +20,6 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" #include "common_video/h264/pps_parser.h" #include "common_video/h264/sps_parser.h" diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.h b/modules/rtp_rtcp/source/rtp_format_video_generic.h index 069f20d4f8..6406b74a9c 100644 --- a/modules/rtp_rtcp/source/rtp_format_video_generic.h +++ b/modules/rtp_rtcp/source/rtp_format_video_generic.h @@ -14,7 +14,6 @@ #include #include "api/array_view.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtp_format.h" #include "rtc_base/constructor_magic.h" diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.cc b/modules/rtp_rtcp/source/rtp_format_vp8.cc index b565f5d99f..73c24d4f75 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp8.cc @@ -14,7 +14,6 @@ #include // memcpy #include -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/video_coding/codecs/interface/common_constants.h" #include "rtc_base/checks.h" diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.cc b/modules/rtp_rtcp/source/rtp_format_vp9.cc index da66370e35..0e538684d2 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp9.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp9.cc @@ -12,7 +12,6 @@ #include -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/video_coding/codecs/interface/common_constants.h" #include "rtc_base/bit_buffer.h" diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h index c77492e8ca..7c3b38b530 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.h +++ b/modules/rtp_rtcp/source/rtp_header_extensions.h @@ -21,7 +21,6 @@ #include "api/video/video_frame_marking.h" #include "api/video/video_rotation.h" #include "api/video/video_timing.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 3c7e4ef616..cb565f8f63 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -21,7 +21,6 @@ #include "absl/types/optional.h" #include "api/rtp_headers.h" #include "api/video/video_bitrate_allocation.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/include/module_fec_types.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index eca86eefae..4d7e72b7b7 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -22,7 +22,6 @@ #include "api/array_view.h" #include "api/call/transport.h" #include "api/transport/webrtc_key_value_config.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/flexfec_sender.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.h b/modules/rtp_rtcp/source/rtp_sender_audio.h index ac83145110..1c78e92612 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.h +++ b/modules/rtp_rtcp/source/rtp_sender_audio.h @@ -17,7 +17,6 @@ #include #include "absl/strings/string_view.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/audio_coding/include/audio_coding_module_typedefs.h" #include "modules/rtp_rtcp/source/dtmf_queue.h" #include "modules/rtp_rtcp/source/rtp_sender.h" diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h index afdca1e264..034e7909cf 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/modules/rtp_rtcp/source/rtp_sender_video.h @@ -16,7 +16,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/flexfec_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/playout_delay_oracle.h" diff --git a/modules/rtp_rtcp/source/rtp_utility.h b/modules/rtp_rtcp/source/rtp_utility.h index 92e02ef58f..b1bc352a88 100644 --- a/modules/rtp_rtcp/source/rtp_utility.h +++ b/modules/rtp_rtcp/source/rtp_utility.h @@ -16,7 +16,6 @@ #include "absl/strings/string_view.h" #include "api/rtp_headers.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn index 44db2c69f5..86752178e4 100644 --- a/modules/video_capture/BUILD.gn +++ b/modules/video_capture/BUILD.gn @@ -28,7 +28,6 @@ rtc_static_library("video_capture_module") { deps = [ "..:module_api", - "../..:webrtc_common", "../../api:scoped_refptr", "../../api/video:video_frame", "../../api/video:video_frame_i420", @@ -75,10 +74,7 @@ if (!build_with_chromium) { "linux/video_capture_linux.cc", "linux/video_capture_linux.h", ] - deps += [ - "../..:webrtc_common", - "../../media:rtc_media_base", - ] + deps += [ "../../media:rtc_media_base" ] } if (is_win) { sources = [ diff --git a/modules/video_capture/device_info_impl.cc b/modules/video_capture/device_info_impl.cc index ef85938bb7..f9079a69d5 100644 --- a/modules/video_capture/device_info_impl.cc +++ b/modules/video_capture/device_info_impl.cc @@ -13,7 +13,6 @@ #include "absl/strings/match.h" #include "absl/strings/string_view.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_capture/device_info_impl.h" #include "rtc_base/logging.h" diff --git a/modules/video_capture/linux/device_info_linux.cc b/modules/video_capture/linux/device_info_linux.cc index c138870877..39f72b0329 100644 --- a/modules/video_capture/linux/device_info_linux.cc +++ b/modules/video_capture/linux/device_info_linux.cc @@ -21,7 +21,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "modules/video_capture/video_capture.h" #include "modules/video_capture/video_capture_defines.h" #include "modules/video_capture/video_capture_impl.h" diff --git a/modules/video_capture/linux/video_capture_linux.h b/modules/video_capture/linux/video_capture_linux.h index c162e03b1b..5585583309 100644 --- a/modules/video_capture/linux/video_capture_linux.h +++ b/modules/video_capture/linux/video_capture_linux.h @@ -15,7 +15,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "modules/video_capture/video_capture_defines.h" #include "modules/video_capture/video_capture_impl.h" #include "rtc_base/critical_section.h" diff --git a/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc index 7977a24f41..410a4793ac 100644 --- a/modules/video_capture/video_capture_impl.cc +++ b/modules/video_capture/video_capture_impl.cc @@ -13,7 +13,6 @@ #include "api/video/i420_buffer.h" #include "api/video/video_frame_buffer.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" #include "modules/video_capture/video_capture_config.h" #include "modules/video_capture/video_capture_impl.h" diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 03591cb76a..ac1683445d 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -17,7 +17,6 @@ rtc_static_library("encoded_frame") { deps = [ ":codec_globals_headers", ":video_codec_interface", - "../../:webrtc_common", "../../api/video:encoded_image", "../../api/video:video_frame", "../../api/video:video_frame_i420", @@ -150,7 +149,6 @@ rtc_static_library("video_coding") { ":webrtc_vp9_helpers", "..:module_api", "..:module_api_public", - "../..:webrtc_common", "../../api:fec_controller_api", "../../api:rtp_headers", "../../api/units:data_rate", @@ -195,7 +193,6 @@ rtc_source_set("video_codec_interface") { ] deps = [ "..:module_api", - "../..:webrtc_common", "../../api/video:video_frame", "../../api/video_codecs:video_codecs_api", "../../common_video", @@ -246,7 +243,6 @@ rtc_source_set("video_coding_utility") { deps = [ ":video_codec_interface", "..:module_api", - "../..:webrtc_common", "../../api/video:encoded_frame", "../../api/video:encoded_image", "../../api/video:video_bitrate_allocation", @@ -281,7 +277,6 @@ rtc_static_library("webrtc_h264") { deps = [ ":video_codec_interface", ":video_coding_utility", - "../../:webrtc_common", "../../api/video:video_frame", "../../api/video:video_frame_i420", "../../api/video_codecs:video_codecs_api", @@ -335,7 +330,6 @@ rtc_static_library("webrtc_multiplex") { ":video_codec_interface", ":video_coding_utility", "..:module_api", - "../..:webrtc_common", "../../api:scoped_refptr", "../../api/video:encoded_image", "../../api/video:video_frame", @@ -567,7 +561,6 @@ if (rtc_include_tests) { ":videocodec_test_stats_impl", ":webrtc_vp9_helpers", "..:module_api", - "../..:webrtc_common", "../../api:scoped_refptr", "../../api:videocodec_test_fixture_api", "../../api/task_queue", @@ -832,7 +825,6 @@ if (rtc_include_tests) { ":webrtc_vp9_helpers", "..:module_api", "..:module_fec_api", - "../..:webrtc_common", "../../api:array_view", "../../api:create_simulcast_test_fixture_api", "../../api:fec_controller_api", diff --git a/modules/video_coding/codecs/h264/h264.cc b/modules/video_coding/codecs/h264/h264.cc index 6a692fbc57..3c46b4316f 100644 --- a/modules/video_coding/codecs/h264/h264.cc +++ b/modules/video_coding/codecs/h264/h264.cc @@ -16,7 +16,6 @@ #include "absl/memory/memory.h" #include "absl/types/optional.h" #include "api/video_codecs/sdp_video_format.h" -#include "common_types.h" // NOLINT(build/include) #include "media/base/h264_profile_level_id.h" #include "media/base/media_constants.h" diff --git a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc index 8bd543a91e..a1c5c614b4 100644 --- a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc +++ b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc @@ -18,7 +18,6 @@ #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" #include "common_video/test/utilities.h" #include "media/base/codec.h" diff --git a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h index d3505e444b..4a913fe502 100644 --- a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h +++ b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h @@ -16,7 +16,6 @@ #include #include "api/video/encoded_image.h" -#include "common_types.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc index 4c14680821..fa10bfb9ff 100644 --- a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc +++ b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc @@ -27,7 +27,6 @@ #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/include/video_frame_buffer.h" #include "common_video/libyuv/include/webrtc_libyuv.h" #include "media/base/media_constants.h" diff --git a/modules/video_coding/codecs/test/video_codec_unittest.cc b/modules/video_coding/codecs/test/video_codec_unittest.cc index de0fea487f..b9a911f58c 100644 --- a/modules/video_coding/codecs/test/video_codec_unittest.cc +++ b/modules/video_coding/codecs/test/video_codec_unittest.cc @@ -10,7 +10,6 @@ #include -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/video_coding/codecs/test/video_codec_unittest.h" #include "modules/video_coding/include/video_error_codes.h" diff --git a/modules/video_coding/codecs/test/video_encoder_decoder_instantiation_tests.cc b/modules/video_coding/codecs/test/video_encoder_decoder_instantiation_tests.cc index 71627514ae..6fc898dcac 100644 --- a/modules/video_coding/codecs/test/video_encoder_decoder_instantiation_tests.cc +++ b/modules/video_coding/codecs/test/video_encoder_decoder_instantiation_tests.cc @@ -16,7 +16,6 @@ #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder_factory.h" -#include "common_types.h" // NOLINT(build/include) #if defined(WEBRTC_ANDROID) #include "modules/video_coding/codecs/test/android_codec_factory_helper.h" #elif defined(WEBRTC_IOS) diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc index 3e8c373a95..126aa93ee8 100644 --- a/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc +++ b/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc @@ -12,7 +12,6 @@ #include "api/test/videocodec_test_fixture.h" #include "api/video_codecs/video_codec.h" -#include "common_types.h" // NOLINT(build/include) #include "test/gmock.h" #include "test/gtest.h" #include "test/video_codec_settings.h" diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc index 4b67525e6e..ced5458c50 100644 --- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc +++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc @@ -26,7 +26,6 @@ #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_encoder_config.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" #include "media/base/h264_profile_level_id.h" #include "media/base/media_constants.h" diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h index 04f778b7f1..a3b4d75f78 100644 --- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h +++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h @@ -18,7 +18,6 @@ #include "api/test/videocodec_test_fixture.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder_factory.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" #include "modules/video_coding/codecs/test/videocodec_test_stats_impl.h" #include "modules/video_coding/codecs/test/videoprocessor.h" diff --git a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc index f817f8ce5a..df6afa0a4d 100644 --- a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc +++ b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc @@ -14,7 +14,6 @@ #include "absl/memory/memory.h" #include "api/test/create_videocodec_test_fixture.h" -#include "common_types.h" // NOLINT(build/include) #include "media/base/media_constants.h" #include "modules/video_coding/codecs/test/android_codec_factory_helper.h" #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h" diff --git a/modules/video_coding/codecs/test/videoprocessor.cc b/modules/video_coding/codecs/test/videoprocessor.cc index c228869e09..e2e79aada1 100644 --- a/modules/video_coding/codecs/test/videoprocessor.cc +++ b/modules/video_coding/codecs/test/videoprocessor.cc @@ -24,7 +24,6 @@ #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" #include "api/video_codecs/video_codec.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" #include "common_video/libyuv/include/webrtc_libyuv.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/modules/video_coding/codecs/test/videoprocessor.h b/modules/video_coding/codecs/test/videoprocessor.h index 48f11f86b1..4935796eb9 100644 --- a/modules/video_coding/codecs/test/videoprocessor.h +++ b/modules/video_coding/codecs/test/videoprocessor.h @@ -29,7 +29,6 @@ #include "api/video/video_frame.h" #include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/video_coding/codecs/test/videocodec_test_stats_impl.h" #include "modules/video_coding/include/video_codec_interface.h" diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc index b8625ad0e8..608cf181a0 100644 --- a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc +++ b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc @@ -16,7 +16,6 @@ #include "api/video/video_bitrate_allocation.h" #include "api/video_codecs/video_codec.h" #include "api/video_codecs/vp8_frame_config.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/utility/simulcast_rate_allocator.h" diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc index be943655f8..8e2c541d52 100644 --- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc +++ b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc @@ -20,7 +20,6 @@ #include "api/video/video_frame.h" #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h" #include "modules/video_coding/include/video_error_codes.h" diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h index a6ddfefb0b..c905950669 100644 --- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h +++ b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h @@ -15,7 +15,6 @@ #include "api/video/encoded_image.h" #include "api/video_codecs/video_decoder.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/include/i420_buffer_pool.h" #include "modules/include/module_common_types.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h index 511504199b..c6bd455189 100644 --- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h +++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h @@ -20,7 +20,6 @@ #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/vp8_frame_buffer_controller.h" #include "api/video_codecs/vp8_frame_config.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/libvpx_interface.h" #include "modules/video_coding/include/video_codec_interface.h" diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc index 551e65522d..dcbd03ece5 100644 --- a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc +++ b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc @@ -15,7 +15,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "rtc_base/checks.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc b/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc index f1c6bdd7d9..8495b212a3 100644 --- a/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc +++ b/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc @@ -10,7 +10,6 @@ #include -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp9/svc_config.h" #include "modules/video_coding/codecs/vp9/svc_rate_allocator.h" #include "rtc_base/checks.h" diff --git a/modules/video_coding/decoding_state_unittest.cc b/modules/video_coding/decoding_state_unittest.cc index a5789005b7..2d7e4a35af 100644 --- a/modules/video_coding/decoding_state_unittest.cc +++ b/modules/video_coding/decoding_state_unittest.cc @@ -9,7 +9,6 @@ */ #include "modules/video_coding/decoding_state.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtp_video_header.h" #include "modules/video_coding/codecs/interface/common_constants.h" #include "modules/video_coding/codecs/vp8/include/vp8_globals.h" diff --git a/modules/video_coding/encoded_frame.h b/modules/video_coding/encoded_frame.h index 25c2f9b459..94da40f058 100644 --- a/modules/video_coding/encoded_frame.h +++ b/modules/video_coding/encoded_frame.h @@ -14,7 +14,6 @@ #include #include "api/video/encoded_image.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_coding_defines.h" diff --git a/modules/video_coding/fec_controller_default.h b/modules/video_coding/fec_controller_default.h index f4bbf22bac..5a116c8c95 100644 --- a/modules/video_coding/fec_controller_default.h +++ b/modules/video_coding/fec_controller_default.h @@ -17,7 +17,6 @@ #include #include "api/fec_controller.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/media_opt_util.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/critical_section.h" diff --git a/modules/video_coding/frame_buffer.h b/modules/video_coding/frame_buffer.h index 4b5ef7fe1f..3e5a7ff3c8 100644 --- a/modules/video_coding/frame_buffer.h +++ b/modules/video_coding/frame_buffer.h @@ -15,7 +15,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "modules/video_coding/encoded_frame.h" diff --git a/modules/video_coding/frame_buffer2.cc b/modules/video_coding/frame_buffer2.cc index 5cecb7abf7..ecc0e176f5 100644 --- a/modules/video_coding/frame_buffer2.cc +++ b/modules/video_coding/frame_buffer2.cc @@ -19,7 +19,6 @@ #include "api/video/encoded_image.h" #include "api/video/video_timing.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/jitter_estimator.h" #include "modules/video_coding/timing.h" diff --git a/modules/video_coding/frame_object.h b/modules/video_coding/frame_object.h index c39a896e5a..c5c8934b06 100644 --- a/modules/video_coding/frame_object.h +++ b/modules/video_coding/frame_object.h @@ -13,7 +13,6 @@ #include "absl/types/optional.h" #include "api/video/encoded_frame.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h" diff --git a/modules/video_coding/h264_sps_pps_tracker_unittest.cc b/modules/video_coding/h264_sps_pps_tracker_unittest.cc index 0af99e6e74..7fe2cd121e 100644 --- a/modules/video_coding/h264_sps_pps_tracker_unittest.cc +++ b/modules/video_coding/h264_sps_pps_tracker_unittest.cc @@ -14,7 +14,6 @@ #include #include "absl/types/variant.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" #include "modules/rtp_rtcp/source/rtp_video_header.h" #include "modules/video_coding/codecs/h264/include/h264_globals.h" diff --git a/modules/video_coding/include/video_codec_interface.h b/modules/video_coding/include/video_codec_interface.h index fb440be664..1b22cae52b 100644 --- a/modules/video_coding/include/video_codec_interface.h +++ b/modules/video_coding/include/video_codec_interface.h @@ -17,7 +17,6 @@ #include "api/video/video_frame.h" #include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/generic_frame_descriptor/generic_frame_info.h" #include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_error_codes.h" diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h index 84d5de9390..8ea5725a1c 100644 --- a/modules/video_coding/include/video_coding_defines.h +++ b/modules/video_coding/include/video_coding_defines.h @@ -18,7 +18,6 @@ #include "api/video/video_content_type.h" #include "api/video/video_frame.h" #include "api/video/video_timing.h" -#include "common_types.h" // NOLINT(build/include) namespace webrtc { diff --git a/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc index 804ce4aa71..7c42eb6029 100644 --- a/modules/video_coding/packet_buffer.cc +++ b/modules/video_coding/packet_buffer.cc @@ -17,7 +17,6 @@ #include "absl/types/variant.h" #include "api/video/encoded_frame.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_common.h" #include "modules/rtp_rtcp/source/rtp_video_header.h" #include "modules/video_coding/codecs/h264/include/h264_globals.h" diff --git a/modules/video_coding/receiver.cc b/modules/video_coding/receiver.cc index 0d58d9e9b0..e30102d275 100644 --- a/modules/video_coding/receiver.cc +++ b/modules/video_coding/receiver.cc @@ -18,7 +18,6 @@ #include "absl/memory/memory.h" #include "api/video/encoded_image.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/internal_defines.h" #include "modules/video_coding/jitter_buffer_common.h" diff --git a/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc index 083c13c39e..4fc9c33ccc 100644 --- a/modules/video_coding/receiver_unittest.cc +++ b/modules/video_coding/receiver_unittest.cc @@ -13,7 +13,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/jitter_buffer_common.h" #include "modules/video_coding/packet.h" diff --git a/modules/video_coding/session_info.h b/modules/video_coding/session_info.h index 47eccce9da..02c423661e 100644 --- a/modules/video_coding/session_info.h +++ b/modules/video_coding/session_info.h @@ -16,7 +16,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "modules/video_coding/include/video_coding.h" diff --git a/modules/video_coding/test/stream_generator.h b/modules/video_coding/test/stream_generator.h index 548654ec53..e030dc4ff3 100644 --- a/modules/video_coding/test/stream_generator.h +++ b/modules/video_coding/test/stream_generator.h @@ -13,7 +13,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/packet.h" #include "rtc_base/constructor_magic.h" diff --git a/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc b/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc index d081072459..78fcdaada0 100644 --- a/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc +++ b/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc @@ -11,7 +11,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/utility/default_video_bitrate_allocator.h" #include "test/gtest.h" diff --git a/modules/video_coding/utility/ivf_file_writer.h b/modules/video_coding/utility/ivf_file_writer.h index 74b3362f75..77acbc8b4c 100644 --- a/modules/video_coding/utility/ivf_file_writer.h +++ b/modules/video_coding/utility/ivf_file_writer.h @@ -16,7 +16,6 @@ #include #include "api/video/encoded_image.h" -#include "common_types.h" // NOLINT(build/include) #include "rtc_base/constructor_magic.h" #include "rtc_base/system/file_wrapper.h" #include "rtc_base/time_utils.h" diff --git a/modules/video_coding/utility/simulcast_rate_allocator.cc b/modules/video_coding/utility/simulcast_rate_allocator.cc index e54248fc23..dc617982e7 100644 --- a/modules/video_coding/utility/simulcast_rate_allocator.cc +++ b/modules/video_coding/utility/simulcast_rate_allocator.cc @@ -18,7 +18,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "rtc_base/checks.h" #include "rtc_base/experiments/rate_control_settings.h" #include "system_wrappers/include/field_trial.h" diff --git a/modules/video_coding/utility/simulcast_test_fixture_impl.h b/modules/video_coding/utility/simulcast_test_fixture_impl.h index 06437fc8fe..b710e2cea1 100644 --- a/modules/video_coding/utility/simulcast_test_fixture_impl.h +++ b/modules/video_coding/utility/simulcast_test_fixture_impl.h @@ -21,7 +21,6 @@ #include "api/video/video_frame.h" #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder_factory.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/utility/simulcast_rate_allocator.h" namespace webrtc { diff --git a/modules/video_coding/utility/simulcast_utility.cc b/modules/video_coding/utility/simulcast_utility.cc index 37e736f11e..3c74a65279 100644 --- a/modules/video_coding/utility/simulcast_utility.cc +++ b/modules/video_coding/utility/simulcast_utility.cc @@ -12,7 +12,6 @@ #include -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/utility/simulcast_utility.h" #include "rtc_base/checks.h" diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc index 3316ce1581..486d1cdc46 100644 --- a/modules/video_coding/video_codec_initializer.cc +++ b/modules/video_coding/video_codec_initializer.cc @@ -18,7 +18,6 @@ #include "api/scoped_refptr.h" #include "api/video/video_bitrate_allocation.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp9/svc_config.h" #include "modules/video_coding/include/video_coding_defines.h" #include "rtc_base/checks.h" diff --git a/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc index 0eca06de79..09b01f6336 100644 --- a/modules/video_coding/video_codec_initializer_unittest.cc +++ b/modules/video_coding/video_codec_initializer_unittest.cc @@ -23,7 +23,6 @@ #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/vp8_temporal_layers.h" #include "api/video_codecs/vp8_temporal_layers_factory.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "rtc_base/checks.h" #include "rtc_base/ref_counted_object.h" diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc index 2c1d89833e..d36e663f4b 100644 --- a/modules/video_coding/video_coding_impl.cc +++ b/modules/video_coding/video_coding_impl.cc @@ -14,7 +14,6 @@ #include #include "api/video/encoded_image.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/timing.h" #include "rtc_base/critical_section.h" diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc index af35aea4d5..ef80995a61 100644 --- a/modules/video_coding/video_receiver.cc +++ b/modules/video_coding/video_receiver.cc @@ -15,7 +15,6 @@ #include "api/rtp_headers.h" #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/utility/include/process_thread.h" #include "modules/video_coding/decoder_database.h" diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index bb6aed3ee4..aae2e87c20 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -240,7 +240,6 @@ rtc_static_library("libstunprober") { deps = [ ":rtc_p2p", - "..:webrtc_common", "../rtc_base", "../rtc_base:checks", "../rtc_base/system:rtc_export", diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 5e2460415a..1df3f63583 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -72,7 +72,6 @@ rtc_static_library("rtc_pc_base") { ] deps = [ - "..:webrtc_common", "../api:array_view", "../api:audio_options_api", "../api:call_api", @@ -192,7 +191,6 @@ rtc_static_library("peerconnection") { deps = [ ":rtc_pc_base", - "..:webrtc_common", "../api:array_view", "../api:audio_options_api", "../api:call_api", @@ -398,7 +396,6 @@ if (rtc_include_tests) { ":libjingle_peerconnection", ":peerconnection", ":rtc_pc_base", - "..:webrtc_common", "../api:audio_options_api", "../api:create_peerconnection_factory", "../api:libjingle_peerconnection_api", @@ -522,7 +519,6 @@ if (rtc_include_tests) { deps += [ ":libjingle_peerconnection", ":pc_test_utils", - "..:webrtc_common", "../api:callfactory_api", "../api:fake_media_transport", "../api:rtc_stats_api", diff --git a/pc/test/fake_audio_capture_module.h b/pc/test/fake_audio_capture_module.h index 12eecd9710..433fda0362 100644 --- a/pc/test/fake_audio_capture_module.h +++ b/pc/test/fake_audio_capture_module.h @@ -23,7 +23,6 @@ #include #include "api/scoped_refptr.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/audio_device/include/audio_device.h" #include "rtc_base/critical_section.h" #include "rtc_base/message_handler.h" diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 2cc45d5dd1..4468207edf 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -782,7 +782,6 @@ rtc_static_library("rtc_base") { deps = [ ":checks", ":stringutils", - "..:webrtc_common", "../api:array_view", "../api:scoped_refptr", "../system_wrappers:field_trial", diff --git a/rtc_base/system/BUILD.gn b/rtc_base/system/BUILD.gn index fb6ce5016f..d39f1f20e0 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", - "../..:webrtc_common", ] } diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index 609598ffcd..e04f1dc906 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -255,7 +255,6 @@ if (!build_with_chromium) { ] deps = [ - "..:webrtc_common", "../common_video", ] } @@ -298,7 +297,6 @@ if (!build_with_chromium) { defines = [ "ENABLE_RTC_EVENT_LOG" ] deps = [ ":chart_proto", - "../:webrtc_common", "../api:function_view", # TODO(kwiberg): Remove this dependency. @@ -415,7 +413,6 @@ if (rtc_include_tests) { ":video_file_reader", ":video_file_writer", ":video_quality_analysis", - "../:webrtc_common", "../api:scoped_refptr", "../api/video:video_frame", "../api/video:video_frame_i420", @@ -475,7 +472,6 @@ if (rtc_include_tests) { ] deps = [ - "..:webrtc_common", "../common_audio", "../modules/audio_processing", "../modules/audio_processing:audioproc_debug_proto", diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc index 304b2aa1c0..38cec78a2f 100644 --- a/rtc_tools/event_log_visualizer/analyzer.cc +++ b/rtc_tools/event_log_visualizer/analyzer.cc @@ -27,7 +27,6 @@ #include "call/call.h" #include "call/video_receive_stream.h" #include "call/video_send_stream.h" -#include "common_types.h" // NOLINT(build/include) #include "logging/rtc_event_log/rtc_stream_config.h" #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" #include "modules/audio_coding/neteq/tools/audio_sink.h" diff --git a/rtc_tools/frame_editing/frame_editing_lib.cc b/rtc_tools/frame_editing/frame_editing_lib.cc index 788033438b..249dd1fc60 100644 --- a/rtc_tools/frame_editing/frame_editing_lib.cc +++ b/rtc_tools/frame_editing/frame_editing_lib.cc @@ -13,7 +13,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_tools/frame_editing/frame_editing_lib.h" diff --git a/rtc_tools/frame_editing/frame_editing_unittest.cc b/rtc_tools/frame_editing/frame_editing_unittest.cc index a55a4e583f..1e93e42dd5 100644 --- a/rtc_tools/frame_editing/frame_editing_unittest.cc +++ b/rtc_tools/frame_editing/frame_editing_unittest.cc @@ -14,7 +14,6 @@ #include #include -#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_tools/frame_editing/frame_editing_lib.h" #include "test/gtest.h" diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index d8a601b254..9dd30897b4 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -621,7 +621,6 @@ if (is_android) { ":native_api_jni", ":video_jni", ":videoframe_jni", - "../..:webrtc_common", "../../api:scoped_refptr", "../../api/task_queue", "../../api/video_codecs:video_codecs_api", @@ -681,7 +680,6 @@ if (is_android) { ":generated_video_jni", ":native_api_jni", ":videoframe_jni", - "../..:webrtc_common", "../../api:libjingle_peerconnection_api", "../../api/task_queue", "../../api/video:encoded_image", @@ -765,7 +763,6 @@ if (is_android) { ":native_api_jni", ":native_api_stacktrace", "..:media_constraints", - "../..:webrtc_common", "../../api:libjingle_peerconnection_api", "../../api/video_codecs:video_codecs_api", "../../logging:rtc_event_log_api", diff --git a/sdk/android/src/jni/android_media_encoder.cc b/sdk/android/src/jni/android_media_encoder.cc index 8030c4084d..d39d902c01 100644 --- a/sdk/android/src/jni/android_media_encoder.cc +++ b/sdk/android/src/jni/android_media_encoder.cc @@ -19,7 +19,6 @@ #include "api/task_queue/task_queue_base.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/h264/h264_bitstream_parser.h" #include "common_video/h264/h264_common.h" #include "common_video/h264/profile_level_id.h" diff --git a/sdk/android/src/jni/video_decoder_factory_wrapper.cc b/sdk/android/src/jni/video_decoder_factory_wrapper.cc index 792e297bed..980fbb3691 100644 --- a/sdk/android/src/jni/video_decoder_factory_wrapper.cc +++ b/sdk/android/src/jni/video_decoder_factory_wrapper.cc @@ -12,7 +12,6 @@ #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_decoder.h" -#include "common_types.h" // NOLINT(build/include) #include "rtc_base/logging.h" #include "sdk/android/generated_video_jni/jni/VideoDecoderFactory_jni.h" #include "sdk/android/native_api/jni/java_types.h" diff --git a/sdk/android/src/jni/video_encoder_factory_wrapper.cc b/sdk/android/src/jni/video_encoder_factory_wrapper.cc index 83cfb82a94..e1011412e6 100644 --- a/sdk/android/src/jni/video_encoder_factory_wrapper.cc +++ b/sdk/android/src/jni/video_encoder_factory_wrapper.cc @@ -11,7 +11,6 @@ #include "sdk/android/src/jni/video_encoder_factory_wrapper.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "rtc_base/logging.h" #include "sdk/android/generated_video_jni/jni/VideoEncoderFactory_jni.h" #include "sdk/android/native_api/jni/class_loader.h" diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn index aca54f708d..7059fac740 100644 --- a/system_wrappers/BUILD.gn +++ b/system_wrappers/BUILD.gn @@ -130,7 +130,6 @@ rtc_source_set("metrics") { defines = [ "WEBRTC_EXCLUDE_METRICS_DEFAULT" ] } deps = [ - "..:webrtc_common", "../rtc_base:checks", "../rtc_base:rtc_base_approved", ] @@ -177,7 +176,6 @@ if (rtc_include_tests) { deps = [ ":metrics", ":system_wrappers", - "..:webrtc_common", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../test:test_main", diff --git a/test/BUILD.gn b/test/BUILD.gn index cc2e546186..c64713d9db 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -52,7 +52,6 @@ rtc_source_set("video_test_common") { ] deps = [ - "..:webrtc_common", "../api:libjingle_peerconnection_api", "../api:scoped_refptr", "../api/task_queue", @@ -135,7 +134,6 @@ rtc_source_set("rtp_test_utils") { ] deps = [ - "..:webrtc_common", "../api:array_view", "../modules/rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp_format", @@ -155,7 +153,6 @@ rtc_source_set("field_trial") { ] deps = [ - "..:webrtc_common", "../system_wrappers:field_trial", ] } @@ -167,7 +164,6 @@ rtc_source_set("perf_test") { "testsupport/perf_test.h", ] deps = [ - "..:webrtc_common", "../api:array_view", "../rtc_base:checks", "../rtc_base:rtc_base_approved", @@ -302,7 +298,6 @@ if (rtc_include_tests) { ":fileutils", ":test_support", ":video_test_common", - "..:webrtc_common", "../api:scoped_refptr", "../api/video:video_frame", "../api/video:video_frame_i420", @@ -443,7 +438,6 @@ if (is_ios) { "testsupport/ios_file_utils.mm", ] deps = [ - "..:webrtc_common", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../sdk:helpers_objc", @@ -477,7 +471,6 @@ rtc_source_set("fileutils") { deps = [ ":fileutils_override_api", ":fileutils_override_impl", - "..:webrtc_common", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base/system:arch", @@ -511,7 +504,6 @@ rtc_source_set("fileutils_override_impl") { ] deps = [ ":fileutils_override_api", - "..:webrtc_common", "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base/system:arch", @@ -595,7 +587,6 @@ rtc_source_set("direct_transport") { "direct_transport.h", ] deps = [ - "..:webrtc_common", "../api:simulated_network_api", "../api:transport_api", "../call:call_interfaces", @@ -641,7 +632,6 @@ rtc_source_set("fake_video_codecs") { "fake_vp8_encoder.h", ] deps = [ - "..:webrtc_common", "../api:scoped_refptr", "../api/task_queue", "../api/video:encoded_image", @@ -711,7 +701,6 @@ rtc_source_set("test_common") { ":rtp_test_utils", ":test_support", ":video_test_common", - "../:webrtc_common", "../api:libjingle_peerconnection_api", "../api:rtp_headers", "../api:scoped_refptr", @@ -811,7 +800,6 @@ rtc_source_set("test_renderer_generic") { ] deps = [ ":test_support", - "..:webrtc_common", "../api:scoped_refptr", "../api/video:video_frame", "../common_video", diff --git a/test/configurable_frame_size_encoder.h b/test/configurable_frame_size_encoder.h index 25dcaf991f..9daf13ebcb 100644 --- a/test/configurable_frame_size_encoder.h +++ b/test/configurable_frame_size_encoder.h @@ -22,7 +22,6 @@ #include "api/video/video_frame.h" #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/include/video_codec_interface.h" namespace webrtc { diff --git a/test/encoder_settings.h b/test/encoder_settings.h index fa2a1b6249..3c740f01d8 100644 --- a/test/encoder_settings.h +++ b/test/encoder_settings.h @@ -17,7 +17,6 @@ #include "api/video_codecs/video_encoder_config.h" #include "call/video_receive_stream.h" #include "call/video_send_stream.h" -#include "common_types.h" // NOLINT(build/include) namespace webrtc { namespace test { diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc index 0219c2fa5c..ec39f9c421 100644 --- a/test/fake_encoder.cc +++ b/test/fake_encoder.cc @@ -19,7 +19,6 @@ #include "absl/memory/memory.h" #include "api/task_queue/queued_task.h" #include "api/video/video_content_type.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" diff --git a/test/fake_encoder.h b/test/fake_encoder.h index 7d4b027101..d09199d875 100644 --- a/test/fake_encoder.h +++ b/test/fake_encoder.h @@ -22,7 +22,6 @@ #include "api/video/video_frame.h" #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_encoder.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_codec_interface.h" #include "rtc_base/critical_section.h" diff --git a/test/fake_vp8_encoder.cc b/test/fake_vp8_encoder.cc index a5513f3a24..5ea4b4e250 100644 --- a/test/fake_vp8_encoder.cc +++ b/test/fake_vp8_encoder.cc @@ -15,7 +15,6 @@ #include "absl/types/optional.h" #include "api/video_codecs/vp8_temporal_layers.h" #include "api/video_codecs/vp8_temporal_layers_factory.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/video_coding/codecs/interface/common_constants.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" diff --git a/test/fake_vp8_encoder.h b/test/fake_vp8_encoder.h index 23c6551a31..932818964b 100644 --- a/test/fake_vp8_encoder.h +++ b/test/fake_vp8_encoder.h @@ -21,7 +21,6 @@ #include "api/video_codecs/video_encoder.h" #include "api/video_codecs/vp8_frame_buffer_controller.h" #include "api/video_codecs/vp8_temporal_layers.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types.h" #include "modules/video_coding/include/video_codec_interface.h" #include "rtc_base/sequenced_task_checker.h" diff --git a/test/frame_generator.cc b/test/frame_generator.cc index 22cc00e681..84da4f7e79 100644 --- a/test/frame_generator.cc +++ b/test/frame_generator.cc @@ -20,7 +20,6 @@ #include "api/video/i420_buffer.h" #include "api/video/video_frame_buffer.h" #include "api/video/video_rotation.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/include/video_frame_buffer.h" #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_base/bind.h" diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn index 349bc158e6..bd2c931810 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -271,7 +271,6 @@ rtc_static_library("audio_decoder_fuzzer") { "audio_decoder_fuzzer.h", ] deps = [ - "../..:webrtc_common", "../../api/audio_codecs:audio_codecs_api", "../../modules/rtp_rtcp:rtp_rtcp_format", "../../rtc_base:checks", diff --git a/test/gl/gl_renderer.cc b/test/gl/gl_renderer.cc index c681ceaaa8..10162ee056 100644 --- a/test/gl/gl_renderer.cc +++ b/test/gl/gl_renderer.cc @@ -12,7 +12,6 @@ #include -#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_base/checks.h" diff --git a/test/layer_filtering_transport.cc b/test/layer_filtering_transport.cc index 6bea74901d..1a8cc3e6d3 100644 --- a/test/layer_filtering_transport.cc +++ b/test/layer_filtering_transport.cc @@ -14,7 +14,6 @@ #include #include "api/rtp_headers.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_format.h" #include "modules/rtp_rtcp/source/rtp_utility.h" diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn index 8f842d5ea3..ac4a73632f 100644 --- a/test/scenario/BUILD.gn +++ b/test/scenario/BUILD.gn @@ -78,7 +78,6 @@ if (rtc_include_tests) { "../:test_common", "../:test_support", "../:video_test_common", - "../../:webrtc_common", "../../api:libjingle_peerconnection_api", "../../api:transport_api", "../../api/audio_codecs:builtin_audio_decoder_factory", diff --git a/test/scenario/scenario_config.h b/test/scenario/scenario_config.h index e62c61086c..63ba1edf95 100644 --- a/test/scenario/scenario_config.h +++ b/test/scenario/scenario_config.h @@ -20,7 +20,6 @@ #include "api/units/data_size.h" #include "api/units/time_delta.h" #include "api/video/video_codec_type.h" -#include "common_types.h" // NOLINT(build/include) #include "test/frame_generator.h" #include "test/scenario/quality_info.h" diff --git a/test/testsupport/video_frame_writer.cc b/test/testsupport/video_frame_writer.cc index 64aec0de9c..2e2964f078 100644 --- a/test/testsupport/video_frame_writer.cc +++ b/test/testsupport/video_frame_writer.cc @@ -18,7 +18,6 @@ #include "absl/memory/memory.h" #include "api/scoped_refptr.h" #include "api/video/i420_buffer.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/libyuv/include/webrtc_libyuv.h" #include "rtc_base/logging.h" diff --git a/video/BUILD.gn b/video/BUILD.gn index c7931348a2..ab79852540 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -50,7 +50,6 @@ rtc_static_library("video") { deps = [ ":frame_dumping_decoder", - "..:webrtc_common", "../api:array_view", "../api:fec_controller_api", "../api:libjingle_peerconnection_api", @@ -301,7 +300,6 @@ if (rtc_include_tests) { ] deps = [ ":video_quality_test", - "../:webrtc_common", "../api:simulated_network_api", "../api:test_dependency_factory", "../api:video_quality_test_fixture_api", @@ -507,7 +505,6 @@ if (rtc_include_tests) { ":video", ":video_mocks", ":video_stream_encoder_impl", - "../:webrtc_common", "../api:fake_frame_decryptor", "../api:fake_frame_encryptor", "../api:libjingle_peerconnection_api", diff --git a/video/end_to_end_tests/extended_reports_tests.cc b/video/end_to_end_tests/extended_reports_tests.cc index 955f9cdf79..8c5f4fa941 100644 --- a/video/end_to_end_tests/extended_reports_tests.cc +++ b/video/end_to_end_tests/extended_reports_tests.cc @@ -28,7 +28,6 @@ #include "call/simulated_packet_receiver.h" #include "call/video_receive_stream.h" #include "call/video_send_stream.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" #include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" #include "rtc_base/critical_section.h" diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc index 7a366adc71..5738f8b7f3 100644 --- a/video/full_stack_tests.cc +++ b/video/full_stack_tests.cc @@ -20,7 +20,6 @@ #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_encoder_config.h" -#include "common_types.h" // NOLINT(build/include) #include "media/base/vp9_profile.h" #include "modules/video_coding/codecs/vp9/include/vp9.h" #include "rtc_base/flags.h" diff --git a/video/send_delay_stats.h b/video/send_delay_stats.h index c3b9dc2d40..ed4b2574e1 100644 --- a/video/send_delay_stats.h +++ b/video/send_delay_stats.h @@ -18,7 +18,6 @@ #include #include "call/video_send_stream.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/include/module_common_types_public.h" #include "rtc_base/critical_section.h" #include "rtc_base/thread_annotations.h" diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index ec841ef2d9..b44117cd12 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -29,7 +29,6 @@ #include "api/video_codecs/video_encoder.h" #include "call/rtp_stream_receiver_controller_interface.h" #include "call/rtx_receive_stream.h" -#include "common_types.h" // NOLINT(build/include) #include "common_video/include/incoming_video_stream.h" #include "media/base/h264_profile_level_id.h" #include "modules/utility/include/process_thread.h" diff --git a/video/video_send_stream_impl.cc b/video/video_send_stream_impl.cc index 100524dd38..643d30a6a2 100644 --- a/video/video_send_stream_impl.cc +++ b/video/video_send_stream_impl.cc @@ -22,7 +22,6 @@ #include "api/video_codecs/video_codec.h" #include "call/rtp_transport_controller_send_interface.h" #include "call/video_send_stream.h" -#include "common_types.h" // NOLINT(build/include) #include "modules/pacing/paced_sender.h" #include "rtc_base/atomic_ops.h" #include "rtc_base/checks.h"