Break out a few more targets from rtc_pc_base

Also use apply-iwyu -r to clean out some not-needed includes.

Bug: webrtc:13805
Change-Id: Id12b6a0e340f686fdfbb9df6fedac324bdcc4b2c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/254680
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36174}
This commit is contained in:
Harald Alvestrand 2022-03-10 13:21:28 +00:00 committed by WebRTC LUCI CQ
parent 6016b2ef8a
commit 7ee138e8fc
4 changed files with 42 additions and 12 deletions

View File

@ -76,10 +76,6 @@ rtc_library("rtc_pc_base") {
"dtls_srtp_transport.h", "dtls_srtp_transport.h",
"dtls_transport.cc", "dtls_transport.cc",
"dtls_transport.h", "dtls_transport.h",
"external_hmac.cc",
"external_hmac.h",
"ice_transport.cc",
"ice_transport.h",
"jsep_transport.cc", "jsep_transport.cc",
"jsep_transport.h", "jsep_transport.h",
"jsep_transport_collection.cc", "jsep_transport_collection.cc",
@ -88,10 +84,6 @@ rtc_library("rtc_pc_base") {
"jsep_transport_controller.h", "jsep_transport_controller.h",
"media_session.cc", "media_session.cc",
"media_session.h", "media_session.h",
"rtcp_mux_filter.cc",
"rtcp_mux_filter.h",
"rtp_media_utils.cc",
"rtp_media_utils.h",
"rtp_transport.cc", "rtp_transport.cc",
"rtp_transport.h", "rtp_transport.h",
"rtp_transport_internal.h", "rtp_transport_internal.h",
@ -224,7 +216,6 @@ rtc_library("rtc_pc_base") {
"//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]
if (rtc_build_libsrtp) { if (rtc_build_libsrtp) {
deps += [ "//third_party/libsrtp" ] deps += [ "//third_party/libsrtp" ]
} }
@ -250,9 +241,28 @@ rtc_source_set("dtls_transport") {
} }
rtc_source_set("external_hmac") { rtc_source_set("external_hmac") {
visibility = [ ":*" ] visibility = [ ":*" ]
sources = [
"external_hmac.cc",
"external_hmac.h",
]
deps = [ "../rtc_base:rtc_base_approved" ]
if (rtc_build_libsrtp) {
deps += [ "//third_party/libsrtp" ]
}
} }
rtc_source_set("ice_transport") { rtc_source_set("ice_transport") {
visibility = [ ":*" ] visibility = [ ":*" ]
sources = [
"ice_transport.cc",
"ice_transport.h",
]
deps = [
"../api:libjingle_peerconnection_api",
"../api:sequence_checker",
"../rtc_base:checks",
"../rtc_base:macromagic",
"../rtc_base:threading",
]
} }
rtc_source_set("jsep_transport") { rtc_source_set("jsep_transport") {
visibility = [ ":*" ] visibility = [ ":*" ]
@ -300,9 +310,25 @@ rtc_source_set("peer_connection_proxy") {
} }
rtc_source_set("rtcp_mux_filter") { rtc_source_set("rtcp_mux_filter") {
visibility = [ ":*" ] visibility = [ ":*" ]
sources = [
"rtcp_mux_filter.cc",
"rtcp_mux_filter.h",
]
deps = [
":session_description",
"../rtc_base:logging",
]
} }
rtc_source_set("rtp_media_utils") { rtc_source_set("rtp_media_utils") {
visibility = [ ":*" ] visibility = [ ":*" ]
sources = [
"rtp_media_utils.cc",
"rtp_media_utils.h",
]
deps = [
"../api:rtp_transceiver_direction",
"../rtc_base:checks",
]
} }
rtc_source_set("rtp_receiver_proxy") { rtc_source_set("rtp_receiver_proxy") {
visibility = [ ":*" ] visibility = [ ":*" ]
@ -764,6 +790,7 @@ rtc_source_set("sdp_offer_answer") {
":peer_connection_message_handler", ":peer_connection_message_handler",
":rtc_pc_base", ":rtc_pc_base",
":rtc_stats_collector", ":rtc_stats_collector",
":rtp_media_utils",
":rtp_receiver", ":rtp_receiver",
":rtp_receiver_proxy", ":rtp_receiver_proxy",
":rtp_sender", ":rtp_sender",
@ -1219,6 +1246,7 @@ rtc_library("rtp_transceiver") {
deps = [ deps = [
":proxy", ":proxy",
":rtc_pc_base", ":rtc_pc_base",
":rtp_media_utils",
":rtp_parameters_conversion", ":rtp_parameters_conversion",
":rtp_receiver", ":rtp_receiver",
":rtp_receiver_proxy", ":rtp_receiver_proxy",
@ -1705,12 +1733,15 @@ if (rtc_include_tests && !build_with_chromium) {
deps = [ deps = [
":audio_rtp_receiver", ":audio_rtp_receiver",
":ice_transport",
":libjingle_peerconnection", ":libjingle_peerconnection",
":media_protocol_names", ":media_protocol_names",
":pc_test_utils", ":pc_test_utils",
":peerconnection", ":peerconnection",
":rtc_pc", ":rtc_pc",
":rtc_pc_base", ":rtc_pc_base",
":rtcp_mux_filter",
":rtp_media_utils",
":session_description", ":session_description",
":video_rtp_receiver", ":video_rtp_receiver",
"../api:array_view", "../api:array_view",
@ -1903,6 +1934,7 @@ if (rtc_include_tests && !build_with_chromium) {
":rtc_pc_base", ":rtc_pc_base",
":rtc_stats_collector", ":rtc_stats_collector",
":rtc_stats_traversal", ":rtc_stats_traversal",
":rtp_media_utils",
":rtp_parameters_conversion", ":rtp_parameters_conversion",
":rtp_receiver", ":rtp_receiver",
":rtp_sender", ":rtp_sender",
@ -2092,6 +2124,7 @@ if (rtc_include_tests && !build_with_chromium) {
":peerconnection", ":peerconnection",
":remote_audio_source", ":remote_audio_source",
":rtc_pc_base", ":rtc_pc_base",
":rtp_media_utils",
":rtp_parameters_conversion", ":rtp_parameters_conversion",
":rtp_receiver", ":rtp_receiver",
":rtp_sender", ":rtp_sender",

View File

@ -30,7 +30,6 @@
#include <stdint.h> #include <stdint.h>
#include "third_party/libsrtp/crypto/include/auth.h"
#include "third_party/libsrtp/crypto/include/crypto_types.h" #include "third_party/libsrtp/crypto/include/crypto_types.h"
#include "third_party/libsrtp/include/srtp.h" #include "third_party/libsrtp/include/srtp.h"
#include "third_party/libsrtp/include/srtp_priv.h" #include "third_party/libsrtp/include/srtp_priv.h"

View File

@ -12,7 +12,6 @@
#define PC_ICE_TRANSPORT_H_ #define PC_ICE_TRANSPORT_H_
#include "api/ice_transport_interface.h" #include "api/ice_transport_interface.h"
#include "api/sequence_checker.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/thread.h" #include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_annotations.h"

View File

@ -14,7 +14,6 @@
#include <ostream> // no-presubmit-check TODO(webrtc:8982) #include <ostream> // no-presubmit-check TODO(webrtc:8982)
#include "api/rtp_transceiver_direction.h" #include "api/rtp_transceiver_direction.h"
#include "api/rtp_transceiver_interface.h"
namespace webrtc { namespace webrtc {