Break out peer_connection_internal from peerconnection target

Also make peer_connection_internal not depend on the data_channel_controller
(dependency should be in the other direction only).

Bug: webrtc:13634
Change-Id: If51358d923348059485928b626a75a1df012ce8a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251040
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35926}
This commit is contained in:
Harald Alvestrand
2022-02-07 05:07:03 +00:00
committed by WebRTC LUCI CQ
parent ab0152d6d2
commit 67a68d57bf
2 changed files with 17 additions and 7 deletions

View File

@ -242,7 +242,6 @@ rtc_library("peerconnection") {
"peer_connection.h", "peer_connection.h",
"peer_connection_factory.cc", "peer_connection_factory.cc",
"peer_connection_factory.h", "peer_connection_factory.h",
"peer_connection_internal.h",
"rtc_stats_collector.cc", "rtc_stats_collector.cc",
"rtc_stats_collector.h", "rtc_stats_collector.h",
"rtc_stats_traversal.cc", "rtc_stats_traversal.cc",
@ -473,6 +472,16 @@ rtc_source_set("peer_connection_factory") {
} }
rtc_source_set("peer_connection_internal") { rtc_source_set("peer_connection_internal") {
visibility = [ ":*" ] visibility = [ ":*" ]
sources = [ "peer_connection_internal.h" ]
deps = [
":peer_connection_message_handler",
":rtc_pc_base",
":rtp_transceiver",
":rtp_transmission_manager",
":sctp_data_channel",
"../api:libjingle_peerconnection_api",
"../call:call_interfaces",
]
} }
rtc_source_set("rtc_stats_collector") { rtc_source_set("rtc_stats_collector") {
visibility = [ ":*" ] visibility = [ ":*" ]
@ -536,9 +545,9 @@ rtc_source_set("sdp_utils") {
"sdp_utils.h", "sdp_utils.h",
] ]
deps = [ deps = [
":session_description",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../p2p:rtc_p2p", "../p2p:rtc_p2p",
"../pc:session_description",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base/system:rtc_export", "../rtc_base/system:rtc_export",
] ]
@ -580,13 +589,13 @@ rtc_source_set("webrtc_session_description_factory") {
"webrtc_session_description_factory.h", "webrtc_session_description_factory.h",
] ]
deps = [ deps = [
":rtc_pc_base",
":sdp_state_provider", ":sdp_state_provider",
":session_description", ":session_description",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:rtc_error", "../api:rtc_error",
"../api:scoped_refptr", "../api:scoped_refptr",
"../p2p:rtc_p2p", "../p2p:rtc_p2p",
"../pc:rtc_pc_base",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base:logging", "../rtc_base:logging",
"../rtc_base:refcount", "../rtc_base:refcount",
@ -1190,6 +1199,7 @@ if (rtc_include_tests && !build_with_chromium) {
sources = [ "peer_connection_rampup_tests.cc" ] sources = [ "peer_connection_rampup_tests.cc" ]
deps = [ deps = [
":pc_test_utils", ":pc_test_utils",
":peerconnection",
":peerconnection_wrapper", ":peerconnection_wrapper",
"../api:audio_options_api", "../api:audio_options_api",
"../api:create_peerconnection_factory", "../api:create_peerconnection_factory",
@ -1209,7 +1219,6 @@ if (rtc_include_tests && !build_with_chromium) {
"../modules/audio_processing:api", "../modules/audio_processing:api",
"../p2p:p2p_test_utils", "../p2p:p2p_test_utils",
"../p2p:rtc_p2p", "../p2p:rtc_p2p",
"../pc:peerconnection",
"../rtc_base", "../rtc_base",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base:gunit_helpers", "../rtc_base:gunit_helpers",
@ -1231,6 +1240,7 @@ if (rtc_include_tests && !build_with_chromium) {
] ]
deps = [ deps = [
":pc_test_utils", ":pc_test_utils",
":peerconnection",
":sdp_utils", ":sdp_utils",
"../api:function_view", "../api:function_view",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
@ -1239,7 +1249,6 @@ if (rtc_include_tests && !build_with_chromium) {
"../api:rtc_stats_api", "../api:rtc_stats_api",
"../api:rtp_parameters", "../api:rtp_parameters",
"../api:scoped_refptr", "../api:scoped_refptr",
"../pc:peerconnection",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base:gunit_helpers", "../rtc_base:gunit_helpers",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
@ -1395,6 +1404,7 @@ if (rtc_include_tests && !build_with_chromium) {
deps += [ deps += [
":libjingle_peerconnection", ":libjingle_peerconnection",
":pc_test_utils", ":pc_test_utils",
":rtc_pc",
"../api:callfactory_api", "../api:callfactory_api",
"../api:rtc_event_log_output_file", "../api:rtc_event_log_output_file",
"../api:rtc_stats_api", "../api:rtc_stats_api",
@ -1418,7 +1428,6 @@ if (rtc_include_tests && !build_with_chromium) {
"../modules/utility", "../modules/utility",
"../p2p:p2p_test_utils", "../p2p:p2p_test_utils",
"../p2p:rtc_p2p", "../p2p:rtc_p2p",
"../pc:rtc_pc",
"../rtc_base", "../rtc_base",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue", "../rtc_base:rtc_task_queue",
@ -1594,6 +1603,7 @@ if (rtc_include_tests && !build_with_chromium) {
deps = [ deps = [
":jitter_buffer_delay", ":jitter_buffer_delay",
":libjingle_peerconnection", ":libjingle_peerconnection",
":peer_connection_internal",
":peerconnection", ":peerconnection",
":rtc_pc_base", ":rtc_pc_base",
":rtp_receiver", ":rtp_receiver",

View File

@ -19,7 +19,6 @@
#include "api/peer_connection_interface.h" #include "api/peer_connection_interface.h"
#include "call/call.h" #include "call/call.h"
#include "pc/data_channel_controller.h"
#include "pc/jsep_transport_controller.h" #include "pc/jsep_transport_controller.h"
#include "pc/peer_connection_message_handler.h" #include "pc/peer_connection_message_handler.h"
#include "pc/rtp_transceiver.h" #include "pc/rtp_transceiver.h"
@ -28,6 +27,7 @@
namespace webrtc { namespace webrtc {
class DataChannelController;
class StatsCollector; class StatsCollector;
// This interface defines the functions that are needed for // This interface defines the functions that are needed for