Skip to content

Commit 9d8eaac

Browse files
Niels MöllerCommit Bot
Niels Möller
authored and
Commit Bot
committed
Delete unneeded direct includes of common_types.h
And delete corresponding dependencies on :webrtc_common. After this change, common_types.h is included directly only from code in the following directories: api/ api/video/ api/video_codecs/ common_video/libyuv/include/ media/base/ modules/remote_bitrate_estimator/ modules/rtp_rtcp/source/ modules/video_coding/codecs/vp9/ There remains plenty of indirect dependencies on the types declared in common_types.h, but the fewer direct dependencies should make it easier to find the proper place for each type. Bug: webrtc:5876 Change-Id: I93e8f214025ecb613c19fdec2015bd3f96c59aae Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130501 Reviewed-by: Karl Wiberg <[email protected]> Commit-Queue: Niels Moller <[email protected]> Cr-Commit-Position: refs/heads/master@{#27376}
1 parent 89cd0c0 commit 9d8eaac

File tree

125 files changed

+1
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1
-177
lines changed

Diff for: ‎api/audio_codecs/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ rtc_source_set("audio_codecs_api") {
3232
"..:array_view",
3333
"..:bitrate_allocation",
3434
"..:scoped_refptr",
35-
"../..:webrtc_common",
3635
"../../rtc_base:checks",
3736
"../../rtc_base:deprecation",
3837
"../../rtc_base:rtc_base_approved",

Diff for: ‎api/video/builtin_video_bitrate_allocator_factory.cc

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "absl/memory/memory.h"
1414
#include "api/video/video_bitrate_allocator.h"
1515
#include "api/video_codecs/video_codec.h"
16-
#include "common_types.h" // NOLINT(build/include)
1716
#include "modules/video_coding/codecs/vp9/svc_rate_allocator.h"
1817
#include "modules/video_coding/utility/default_video_bitrate_allocator.h"
1918
#include "modules/video_coding/utility/simulcast_rate_allocator.h"

Diff for: ‎api/video_codecs/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ rtc_static_library("rtc_software_fallback_wrappers") {
137137

138138
deps = [
139139
":video_codecs_api",
140-
"../../:webrtc_common",
141140
"../../media:rtc_h264_profile_id",
142141
"../../media:rtc_media_base",
143142
"../../modules/video_coding:video_codec_interface",

Diff for: ‎api/video_codecs/test/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ if (rtc_include_tests) {
2222
"..:rtc_software_fallback_wrappers",
2323
"..:video_codecs_api",
2424
"../..:mock_video_encoder",
25-
"../../../:webrtc_common",
2625
"../../../api:scoped_refptr",
2726
"../../../modules:module_api",
2827
"../../../modules/video_coding:video_codec_interface",

Diff for: ‎api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "api/video/video_frame.h"
1818
#include "api/video_codecs/video_codec.h"
1919
#include "api/video_codecs/video_decoder.h"
20-
#include "common_types.h" // NOLINT(build/include)
2120
#include "modules/video_coding/codecs/vp8/include/vp8.h"
2221
#include "modules/video_coding/include/video_codec_interface.h"
2322
#include "modules/video_coding/include/video_error_codes.h"

Diff for: ‎api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "api/video_codecs/video_codec.h"
2828
#include "api/video_codecs/video_encoder.h"
2929
#include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
30-
#include "common_types.h" // NOLINT(build/include)
3130
#include "modules/include/module_common_types.h"
3231
#include "modules/video_coding/codecs/vp8/include/vp8.h"
3332
#include "modules/video_coding/include/video_codec_interface.h"

Diff for: ‎api/video_codecs/video_encoder_software_fallback_wrapper.cc

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "api/video/video_bitrate_allocation.h"
2222
#include "api/video/video_frame.h"
2323
#include "api/video_codecs/video_codec.h"
24-
#include "common_types.h" // NOLINT(build/include)
2524
#include "modules/video_coding/include/video_error_codes.h"
2625
#include "rtc_base/checks.h"
2726
#include "rtc_base/logging.h"

Diff for: ‎call/BUILD.gn

-6
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ rtc_source_set("call_interfaces") {
3030
deps = [
3131
":rtp_interfaces",
3232
":video_stream_api",
33-
"..:webrtc_common",
3433
"../api:fec_controller_api",
3534
"../api:libjingle_peerconnection_api",
3635
"../api:rtp_headers",
@@ -100,7 +99,6 @@ rtc_source_set("rtp_receiver") {
10099
]
101100
deps = [
102101
":rtp_interfaces",
103-
"..:webrtc_common",
104102
"../api:array_view",
105103
"../api:rtp_headers",
106104
"../modules/rtp_rtcp",
@@ -125,7 +123,6 @@ rtc_source_set("rtp_sender") {
125123
deps = [
126124
":bitrate_configurator",
127125
":rtp_interfaces",
128-
"..:webrtc_common",
129126
"../api:fec_controller_api",
130127
"../api:transport_api",
131128
"../api/transport:field_trial_based_config",
@@ -217,7 +214,6 @@ rtc_static_library("call") {
217214
":rtp_sender",
218215
":simulated_network",
219216
":video_stream_api",
220-
"..:webrtc_common",
221217
"../api:array_view",
222218
"../api:callfactory_api",
223219
"../api:fec_controller_api",
@@ -322,7 +318,6 @@ rtc_source_set("fake_network") {
322318
":call_interfaces",
323319
":simulated_network",
324320
":simulated_packet_receiver",
325-
"..:webrtc_common",
326321
"../api:libjingle_peerconnection_api",
327322
"../api:simulated_network_api",
328323
"../api:transport_api",
@@ -363,7 +358,6 @@ if (rtc_include_tests) {
363358
":rtp_receiver",
364359
":rtp_sender",
365360
":simulated_network",
366-
"../:webrtc_common",
367361
"../api:array_view",
368362
"../api:fake_media_transport",
369363
"../api:fake_media_transport",

Diff for: ‎call/rtp_payload_params.cc

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "absl/container/inlined_vector.h"
1717
#include "absl/types/variant.h"
1818
#include "api/video/video_timing.h"
19-
#include "common_types.h" // NOLINT(build/include)
2019
#include "modules/video_coding/codecs/h264/include/h264_globals.h"
2120
#include "modules/video_coding/codecs/interface/common_constants.h"
2221
#include "modules/video_coding/codecs/vp8/include/vp8_globals.h"

Diff for: ‎call/rtp_payload_params_unittest.cc

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "api/video/video_content_type.h"
1919
#include "api/video/video_rotation.h"
2020
#include "call/rtp_payload_params.h"
21-
#include "common_types.h" // NOLINT(build/include)
2221
#include "modules/video_coding/codecs/h264/include/h264_globals.h"
2322
#include "modules/video_coding/codecs/interface/common_constants.h"
2423
#include "modules/video_coding/codecs/vp8/include/vp8_globals.h"

Diff for: ‎common_video/h264/profile_level_id_unittest.cc

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <string>
1515

1616
#include "absl/types/optional.h"
17-
#include "common_types.h" // NOLINT(build/include)
1817
#include "media/base/h264_profile_level_id.h"
1918
#include "test/gtest.h"
2019

Diff for: ‎media/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ rtc_static_library("rtc_encoder_simulcast_proxy") {
185185
]
186186
deps = [
187187
":rtc_simulcast_encoder_adapter",
188-
"../:webrtc_common",
189188
"../api/video:video_bitrate_allocation",
190189
"../api/video:video_frame",
191190
"../api/video_codecs:video_codecs_api",
@@ -445,7 +444,6 @@ if (rtc_include_tests) {
445444
":rtc_internal_video_codecs",
446445
":rtc_media",
447446
":rtc_media_base",
448-
"..:webrtc_common",
449447
"../api:call_api",
450448
"../api/video:video_bitrate_allocation",
451449
"../api/video:video_frame",

Diff for: ‎media/engine/encoder_simulcast_proxy.h

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "api/video_codecs/video_codec.h"
2424
#include "api/video_codecs/video_encoder.h"
2525
#include "api/video_codecs/video_encoder_factory.h"
26-
#include "common_types.h" // NOLINT(build/include)
2726
#include "modules/video_coding/include/video_codec_interface.h"
2827

2928
namespace webrtc {

Diff for: ‎media/engine/fake_webrtc_video_engine.h

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "api/video_codecs/video_decoder_factory.h"
2727
#include "api/video_codecs/video_encoder.h"
2828
#include "api/video_codecs/video_encoder_factory.h"
29-
#include "common_types.h" // NOLINT(build/include)
3029
#include "modules/video_coding/include/video_codec_interface.h"
3130
#include "rtc_base/critical_section.h"
3231
#include "rtc_base/event.h"

Diff for: ‎modules/audio_processing/BUILD.gn

-6
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ rtc_static_library("audio_processing") {
157157
":gain_control_config_proxy",
158158
":gain_control_interface",
159159
":noise_suppression_proxy",
160-
"../..:webrtc_common",
161160
"../../api:array_view",
162161
"../../api:function_view",
163162
"../../api/audio:aec3_config",
@@ -330,7 +329,6 @@ rtc_source_set("audio_processing_c") {
330329
}
331330

332331
deps = [
333-
"../..:webrtc_common",
334332
"../../common_audio",
335333
"../../common_audio:common_audio_c",
336334
"../../common_audio/third_party/fft4g",
@@ -455,7 +453,6 @@ if (rtc_include_tests) {
455453
":file_audio_generator_unittests",
456454
":gain_control_config_proxy",
457455
":mocks",
458-
"../..:webrtc_common",
459456
"../../api:array_view",
460457
"../../api:scoped_refptr",
461458
"../../api/audio:aec3_config",
@@ -705,7 +702,6 @@ if (rtc_include_tests) {
705702
]
706703
deps = [
707704
":audio_processing",
708-
"../..:webrtc_common",
709705
"../../common_audio",
710706
"../../rtc_base:rtc_base_approved",
711707
"../../rtc_base/system:file_wrapper",
@@ -726,7 +722,6 @@ if (rtc_include_tests) {
726722
]
727723
deps = [
728724
":audio_processing",
729-
"../..:webrtc_common",
730725
"../../rtc_base/system:file_wrapper",
731726
"../../system_wrappers",
732727
]
@@ -748,7 +743,6 @@ if (rtc_include_tests) {
748743

749744
deps = [
750745
":audioproc_debug_proto",
751-
"../..:webrtc_common",
752746
"../../rtc_base:checks",
753747
"../../rtc_base:protobuf_utils",
754748
"../../rtc_base:rtc_base_approved",

Diff for: ‎modules/audio_processing/agc/BUILD.gn

-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ rtc_source_set("agc") {
1919
":level_estimation",
2020
"..:apm_logging",
2121
"..:gain_control_interface",
22-
"../../..:webrtc_common",
2322
"../../../rtc_base:checks",
2423
"../../../rtc_base:gtest_prod",
2524
"../../../rtc_base:logging",
@@ -41,7 +40,6 @@ rtc_source_set("level_estimation") {
4140
"utility.h",
4241
]
4342
deps = [
44-
"../../..:webrtc_common",
4543
"../../../rtc_base:checks",
4644
"../../../rtc_base:macromagic",
4745
"../vad",
@@ -65,7 +63,6 @@ rtc_source_set("agc_legacy_c") {
6563
]
6664

6765
deps = [
68-
"../../..:webrtc_common",
6966
"../../../common_audio",
7067
"../../../common_audio:common_audio_c",
7168
"../../../common_audio/third_party/fft4g",
@@ -112,7 +109,6 @@ if (rtc_include_tests) {
112109
":agc",
113110
":level_estimation",
114111
"..:mocks",
115-
"../../..:webrtc_common",
116112
"../../../test:fileutils",
117113
"../../../test:test_support",
118114
"//testing/gtest",

Diff for: ‎modules/audio_processing/test/conversational_speech/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ rtc_static_library("lib") {
4646
"wavreader_interface.h",
4747
]
4848
deps = [
49-
"../../../..:webrtc_common",
5049
"../../../../api:array_view",
5150
"../../../../common_audio",
5251
"../../../../rtc_base:checks",
@@ -68,7 +67,6 @@ rtc_source_set("unittest") {
6867
]
6968
deps = [
7069
":lib",
71-
"../../../..:webrtc_common",
7270
"../../../../api:array_view",
7371
"../../../../common_audio",
7472
"../../../../rtc_base:rtc_base_approved",

Diff for: ‎modules/audio_processing/test/py_quality_assessment/BUILD.gn

-4
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ rtc_executable("fake_polqa") {
116116
visibility = [ ":*" ] # Only targets in this file can depend on this.
117117
output_dir = "${root_out_dir}/py_quality_assessment/quality_assessment"
118118
deps = [
119-
"../../../..:webrtc_common",
120119
"../../../../rtc_base:checks",
121120
"../../../../rtc_base:rtc_base_approved",
122121
]
@@ -127,7 +126,6 @@ rtc_executable("vad") {
127126
"quality_assessment/vad.cc",
128127
]
129128
deps = [
130-
"../../../..:webrtc_common",
131129
"../../../../common_audio",
132130
"../../../../rtc_base:rtc_base_approved",
133131
]
@@ -139,7 +137,6 @@ rtc_executable("apm_vad") {
139137
]
140138
deps = [
141139
"../..",
142-
"../../../..:webrtc_common",
143140
"../../../../common_audio",
144141
"../../../../rtc_base:rtc_base_approved",
145142
"../../vad",
@@ -152,7 +149,6 @@ rtc_executable("sound_level") {
152149
]
153150
deps = [
154151
"../..",
155-
"../../../..:webrtc_common",
156152
"../../../../common_audio",
157153
"../../../../rtc_base:rtc_base_approved",
158154
]

Diff for: ‎modules/congestion_controller/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ rtc_static_library("congestion_controller") {
3131
deps = [
3232
":transport_feedback",
3333
"..:module_api",
34-
"../..:webrtc_common",
3534
"../../api:scoped_refptr",
3635
"../../api/transport:field_trial_based_config",
3736
"../../api/transport:network_control",

Diff for: ‎modules/congestion_controller/goog_cc/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ rtc_static_library("goog_cc") {
3030
":probe_controller",
3131
":pushback_controller",
3232
"../..:module_api",
33-
"../../..:webrtc_common",
3433
"../../../api/transport:field_trial_based_config",
3534
"../../../api/transport:network_control",
3635
"../../../api/transport:webrtc_key_value_config",
@@ -88,7 +87,6 @@ rtc_source_set("alr_detector") {
8887
"alr_detector.h",
8988
]
9089
deps = [
91-
"../../..:webrtc_common",
9290
"../../../api/transport:webrtc_key_value_config",
9391
"../../../logging:rtc_event_log_api",
9492
"../../../logging:rtc_event_pacing",

Diff for: ‎modules/congestion_controller/include/send_side_congestion_controller.h

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "api/transport/field_trial_based_config.h"
1818
#include "api/transport/webrtc_key_value_config.h"
19-
#include "common_types.h" // NOLINT(build/include)
2019
#include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
2120
#include "modules/congestion_controller/include/network_changed_observer.h"
2221
#include "modules/congestion_controller/include/send_side_congestion_controller_interface.h"

Diff for: ‎modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <map>
1717
#include <vector>
1818

19-
#include "common_types.h" // NOLINT(build/include)
2019
#include "modules/include/module.h"
2120
#include "modules/include/module_common_types.h"
2221
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"

Diff for: ‎modules/remote_bitrate_estimator/overuse_detector_unittest.cc

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <cstdlib>
1515
#include <memory>
1616

17-
#include "common_types.h" // NOLINT(build/include)
1817
#include "modules/remote_bitrate_estimator/inter_arrival.h"
1918
#include "modules/remote_bitrate_estimator/overuse_detector.h"
2019
#include "modules/remote_bitrate_estimator/overuse_estimator.h"

Diff for: ‎modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <utility>
1616

1717
#include "absl/types/optional.h"
18-
#include "common_types.h" // NOLINT(build/include)
1918
#include "modules/remote_bitrate_estimator/aimd_rate_control.h"
2019
#include "modules/remote_bitrate_estimator/include/bwe_defines.h"
2120
#include "modules/remote_bitrate_estimator/inter_arrival.h"

Diff for: ‎modules/remote_bitrate_estimator/test/bwe_test_logging.h

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
#include <stack>
129129
#include <string>
130130

131-
#include "common_types.h" // NOLINT(build/include)
132131
#include "rtc_base/constructor_magic.h"
133132
#include "rtc_base/critical_section.h"
134133

Diff for: ‎modules/rtp_rtcp/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ rtc_source_set("rtp_rtcp_format") {
8989
deps = [
9090
"..:module_api",
9191
"..:module_api_public",
92-
"../..:webrtc_common",
9392
"../../api:array_view",
9493
"../../api:function_view",
9594
"../../api:libjingle_peerconnection_api",

Diff for: ‎modules/rtp_rtcp/include/rtp_rtcp_defines.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "api/audio_codecs/audio_format.h"
2121
#include "api/rtp_headers.h"
2222
#include "api/transport/network_types.h"
23-
#include "common_types.h" // NOLINT(build/include)
2423
#include "modules/include/module_common_types.h"
2524
#include "system_wrappers/include/clock.h"
2625

Diff for: ‎modules/rtp_rtcp/source/nack_rtx_unittest.cc

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "api/transport/field_trial_based_config.h"
2020
#include "call/rtp_stream_receiver_controller.h"
2121
#include "call/rtx_receive_stream.h"
22-
#include "common_types.h" // NOLINT(build/include)
2322
#include "modules/rtp_rtcp/include/receive_statistics.h"
2423
#include "modules/rtp_rtcp/include/rtp_rtcp.h"
2524
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"

Diff for: ‎modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010

1111
#include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
12-
#include "common_types.h" // NOLINT(build/include)
1312
#include "system_wrappers/include/clock.h"
1413
#include "test/gmock.h"
1514
#include "test/gtest.h"

Diff for: ‎modules/rtp_rtcp/source/rtcp_receiver.cc

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "absl/memory/memory.h"
2222
#include "api/video/video_bitrate_allocation.h"
2323
#include "api/video/video_bitrate_allocator.h"
24-
#include "common_types.h" // NOLINT(build/include)
2524
#include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
2625
#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
2726
#include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h"

Diff for: ‎modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "api/array_view.h"
1414
#include "api/video/video_bitrate_allocation.h"
1515
#include "api/video/video_bitrate_allocator.h"
16-
#include "common_types.h" // NOLINT(build/include)
1716
#include "modules/rtp_rtcp/mocks/mock_rtcp_bandwidth_observer.h"
1817
#include "modules/rtp_rtcp/source/byte_io.h"
1918
#include "modules/rtp_rtcp/source/rtcp_packet.h"

0 commit comments

Comments
 (0)