From a67050debcb5a3461a452a7928d7aaea1562747e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 20 Mar 2019 08:40:23 +0100 Subject: [PATCH] Move api/rtp_headers.h to its own build target. Reduces dependencies on the libjingle_peerconnection_api target from lower-level code. Bug: None Change-Id: I98576fc718c396cc0f720c3770acd2b696b9df89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128565 Reviewed-by: Danil Chapovalov Reviewed-by: Karl Wiberg Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#27213} --- api/BUILD.gn | 12 ++++++++++-- audio/BUILD.gn | 1 + call/BUILD.gn | 7 ++++++- logging/BUILD.gn | 5 +++++ modules/BUILD.gn | 2 +- modules/audio_coding/BUILD.gn | 7 +++---- modules/remote_bitrate_estimator/BUILD.gn | 4 ++-- modules/rtp_rtcp/BUILD.gn | 4 +++- modules/rtp_rtcp/include/flexfec_sender.h | 1 - modules/rtp_rtcp/source/rtp_packet.cc | 1 - modules/video_capture/BUILD.gn | 1 - modules/video_coding/BUILD.gn | 4 ++-- pc/BUILD.gn | 2 ++ test/BUILD.gn | 1 + video/BUILD.gn | 1 + 15 files changed, 37 insertions(+), 16 deletions(-) diff --git a/api/BUILD.gn b/api/BUILD.gn index c1a7275a9c..f079aba93a 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -65,6 +65,16 @@ rtc_static_library("create_peerconnection_factory") { rtc_source_set("rtp_headers") { visibility = [ "*" ] + sources = [ + "rtp_headers.cc", + "rtp_headers.h", + ] + deps = [ + ":array_view", + "..:webrtc_common", + "video:video_frame", + "//third_party/abseil-cpp/absl/types:optional", + ] } rtc_static_library("libjingle_peerconnection_api") { @@ -107,8 +117,6 @@ rtc_static_library("libjingle_peerconnection_api") { "proxy.h", "rtc_error.cc", "rtc_error.h", - "rtp_headers.cc", - "rtp_headers.h", "rtp_parameters.cc", "rtp_parameters.h", "rtp_receiver_interface.cc", diff --git a/audio/BUILD.gn b/audio/BUILD.gn index 82c64821f2..fc42002704 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -41,6 +41,7 @@ rtc_static_library("audio") { "../api:array_view", "../api:call_api", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../api:scoped_refptr", "../api:transport_api", "../api/audio:aec3_factory", diff --git a/call/BUILD.gn b/call/BUILD.gn index 3a16757cef..05d30fc714 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -33,6 +33,7 @@ rtc_source_set("call_interfaces") { "..:webrtc_common", "../api:fec_controller_api", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../api:scoped_refptr", "../api:transport_api", "../api/audio:audio_mixer_api", @@ -73,6 +74,7 @@ rtc_source_set("rtp_interfaces") { "../api:array_view", "../api:fec_controller_api", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../api/transport:bitrate_settings", "../logging:rtc_event_log_api", "../modules/rtp_rtcp:rtp_rtcp_format", @@ -100,7 +102,7 @@ rtc_source_set("rtp_receiver") { ":rtp_interfaces", "..:webrtc_common", "../api:array_view", - "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../modules/rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp_format", "../rtc_base:checks", @@ -220,6 +222,7 @@ rtc_static_library("call") { "../api:callfactory_api", "../api:fec_controller_api", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../api:simulated_network_api", "../api:transport_api", "../api/task_queue:global_task_queue_factory", @@ -268,6 +271,7 @@ rtc_source_set("video_stream_api") { deps = [ ":rtp_interfaces", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../api:transport_api", "../api/video:video_frame", "../api/video:video_stream_encoder", @@ -365,6 +369,7 @@ if (rtc_include_tests) { "../api:fake_media_transport", "../api:libjingle_peerconnection_api", "../api:mock_audio_mixer", + "../api:rtp_headers", "../api:transport_api", "../api/audio_codecs:builtin_audio_decoder_factory", "../api/task_queue:global_task_queue_factory", diff --git a/logging/BUILD.gn b/logging/BUILD.gn index 75be86d1a2..fc8c65ba4a 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -55,6 +55,7 @@ rtc_source_set("rtc_stream_config") { deps = [ ":rtc_event_log_api", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", ] } @@ -189,6 +190,7 @@ rtc_static_library("rtc_event_log_impl_encoder") { deps = [ "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../api/transport:network_control", "../rtc_base:checks", "../rtc_base:rtc_base_approved", @@ -327,6 +329,7 @@ if (rtc_enable_protobuf) { ":rtc_event_log_proto", ":rtc_stream_config", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../api/units:data_rate", "../api/units:time_delta", "../api/units:timestamp", @@ -380,6 +383,7 @@ if (rtc_enable_protobuf) { ":rtc_stream_config", "../api:array_view", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../call", "../call:call_interfaces", "../modules/audio_coding:audio_network_adaptor", @@ -407,6 +411,7 @@ if (rtc_enable_protobuf) { ":rtc_event_log_parser", "../api:array_view", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../modules/rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp_format", "../rtc_base:checks", diff --git a/modules/BUILD.gn b/modules/BUILD.gn index 501ba2a449..519c44a6dc 100644 --- a/modules/BUILD.gn +++ b/modules/BUILD.gn @@ -51,7 +51,7 @@ rtc_source_set("module_api") { ":module_api_public", ":module_fec_api", "..:webrtc_common", - "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../modules/rtp_rtcp:rtp_video_header", "../rtc_base:safe_conversions", "../rtc_base/system:rtc_export", diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index 4875a54d38..56792e97ac 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -960,7 +960,7 @@ rtc_static_library("neteq") { "..:module_api", "..:module_api_public", "../../api:array_view", - "../../api:libjingle_peerconnection_api", + "../../api:rtp_headers", "../../api:scoped_refptr", "../../api/audio:audio_frame_api", "../../api/audio_codecs:audio_codecs_api", @@ -1004,8 +1004,8 @@ rtc_source_set("neteq_tools_minimal") { deps = [ ":neteq", - "../../api:libjingle_peerconnection_api", "../../api:neteq_simulator_api", + "../../api:rtp_headers", "../../api/audio:audio_frame_api", "../../api/audio_codecs:audio_codecs_api", "../../rtc_base:checks", @@ -1039,7 +1039,7 @@ rtc_source_set("neteq_test_tools") { deps = [ ":pcm16b", "../../api:array_view", - "../../api:libjingle_peerconnection_api", + "../../api:rtp_headers", "../../common_audio", "../../rtc_base:checks", "../../rtc_base:rtc_base", @@ -1491,7 +1491,6 @@ if (rtc_include_tests) { deps += [ ":isac_fix", ":webrtc_opus", - "../../api:libjingle_peerconnection_api", "../../rtc_base:rtc_base_approved", "../../test:test_main", "../../test:test_support", diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn index 43315d3b95..12d3086dc3 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -41,7 +41,7 @@ rtc_static_library("remote_bitrate_estimator") { deps = [ "../..:webrtc_common", - "../../api:libjingle_peerconnection_api", + "../../api:rtp_headers", "../../api/units:data_rate", "../../api/units:timestamp", "../../modules:module_api", @@ -128,7 +128,7 @@ if (rtc_include_tests) { "..:module_api", "..:module_api_public", "../..:webrtc_common", - "../../api:libjingle_peerconnection_api", + "../../api:rtp_headers", "../../api/transport:field_trial_based_config", "../../api/transport:network_control", "../../logging:mocks", diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index 1e61988210..3c247dab59 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -92,6 +92,7 @@ rtc_source_set("rtp_rtcp_format") { "../..:webrtc_common", "../../api:array_view", "../../api:libjingle_peerconnection_api", + "../../api:rtp_headers", "../../api/audio_codecs:audio_codecs_api", "../../api/transport:network_control", "../../api/video:video_frame", @@ -199,6 +200,7 @@ rtc_static_library("rtp_rtcp") { "../..:webrtc_common", "../../api:array_view", "../../api:libjingle_peerconnection_api", + "../../api:rtp_headers", "../../api:scoped_refptr", "../../api:transport_api", "../../api/audio_codecs:audio_codecs_api", @@ -253,7 +255,7 @@ rtc_source_set("rtcp_transceiver") { ":rtp_rtcp_format", "../../:webrtc_common", "../../api:array_view", - "../../api:libjingle_peerconnection_api", + "../../api:rtp_headers", "../../api:transport_api", "../../api/video:video_bitrate_allocation", "../../rtc_base:checks", diff --git a/modules/rtp_rtcp/include/flexfec_sender.h b/modules/rtp_rtcp/include/flexfec_sender.h index aa0e8e04d9..0653ef55d6 100644 --- a/modules/rtp_rtcp/include/flexfec_sender.h +++ b/modules/rtp_rtcp/include/flexfec_sender.h @@ -16,7 +16,6 @@ #include #include "api/array_view.h" -#include "api/rtp_parameters.h" #include "modules/include/module_common_types.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_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc index 91f0c595ba..7e7a6975ac 100644 --- a/modules/rtp_rtcp/source/rtp_packet.cc +++ b/modules/rtp_rtcp/source/rtp_packet.cc @@ -14,7 +14,6 @@ #include #include -#include "api/rtp_parameters.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn index f126e2f798..b999121961 100644 --- a/modules/video_capture/BUILD.gn +++ b/modules/video_capture/BUILD.gn @@ -29,7 +29,6 @@ rtc_static_library("video_capture_module") { deps = [ "..:module_api", "../..:webrtc_common", - "../../api:libjingle_peerconnection_api", "../../api:scoped_refptr", "../../api/video:video_frame", "../../api/video:video_frame_i420", diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index afd68372d7..7a5ac842d0 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -63,7 +63,7 @@ rtc_static_library("packet") { deps = [ "..:module_api", "../../:webrtc_common", - "../../api:libjingle_peerconnection_api", + "../../api:rtp_headers", "../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_video_header", "//third_party/abseil-cpp/absl/types:optional", @@ -74,7 +74,6 @@ rtc_static_library("video_coding") { visibility = [ "*" ] deps = [ "..:module_fec_api", - "../../api:libjingle_peerconnection_api", "../../api:scoped_refptr", "../../api/video:encoded_image", "../../api/video:video_bitrate_allocation", @@ -152,6 +151,7 @@ rtc_static_library("video_coding") { "..:module_api_public", "../..:webrtc_common", "../../api:fec_controller_api", + "../../api:rtp_headers", "../../api/units:data_rate", "../../api/video:builtin_video_bitrate_allocator_factory", "../../api/video:encoded_frame", diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 24834321e5..c5089706c9 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -78,6 +78,7 @@ rtc_static_library("rtc_pc_base") { "../api:call_api", "../api:libjingle_peerconnection_api", "../api:ortc_api", + "../api:rtp_headers", "../api:scoped_refptr", "../api/video:video_frame", "../call:call_interfaces", @@ -276,6 +277,7 @@ if (rtc_include_tests) { "../api:ice_transport_factory", "../api:libjingle_peerconnection_api", "../api:loopback_media_transport", + "../api:rtp_headers", "../call:rtp_interfaces", "../call:rtp_receiver", "../logging:rtc_event_log_api", diff --git a/test/BUILD.gn b/test/BUILD.gn index bce875fce9..93b1bf2688 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -713,6 +713,7 @@ rtc_source_set("test_common") { ":video_test_common", "../:webrtc_common", "../api:libjingle_peerconnection_api", + "../api:rtp_headers", "../api:scoped_refptr", "../api:simulated_network_api", "../api:transport_api", diff --git a/video/BUILD.gn b/video/BUILD.gn index a00f144b36..2e00d13f0a 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -508,6 +508,7 @@ if (rtc_include_tests) { "../api:fake_frame_encryptor", "../api:libjingle_peerconnection_api", "../api:mock_frame_decryptor", + "../api:rtp_headers", "../api:scoped_refptr", "../api:simulated_network_api", "../api/task_queue:default_task_queue_factory",