diff --git a/call/BUILD.gn b/call/BUILD.gn index 684b076d27..f57f9e0d3c 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -111,6 +111,7 @@ rtc_library("rtp_interfaces") { "../api:frame_transformer_interface", "../api:network_state_predictor_api", "../api:rtp_headers", + "../api:rtp_packet_sender", "../api:rtp_parameters", "../api/crypto:options", "../api/environment", diff --git a/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h index bb995f9cb4..aa716987ad 100644 --- a/call/rtp_transport_controller_send_interface.h +++ b/call/rtp_transport_controller_send_interface.h @@ -23,6 +23,7 @@ #include "api/crypto/crypto_options.h" #include "api/fec_controller.h" #include "api/frame_transformer_interface.h" +#include "api/rtp_packet_sender.h" #include "api/transport/bandwidth_estimation_settings.h" #include "api/transport/bitrate_settings.h" #include "api/transport/network_control.h" @@ -31,7 +32,6 @@ #include "common_video/frame_counts.h" #include "modules/rtp_rtcp/include/report_block_data.h" #include "modules/rtp_rtcp/include/rtcp_statistics.h" -#include "modules/rtp_rtcp/include/rtp_packet_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn index 2d78fd8ed6..b560557190 100644 --- a/modules/pacing/BUILD.gn +++ b/modules/pacing/BUILD.gn @@ -33,6 +33,7 @@ rtc_library("pacing") { "../../api:field_trials_view", "../../api:field_trials_view", "../../api:function_view", + "../../api:rtp_packet_sender", "../../api:sequence_checker", "../../api/rtc_event_log", "../../api/task_queue:pending_task_safety_flag", diff --git a/modules/pacing/g3doc/index.md b/modules/pacing/g3doc/index.md index 69f1e69513..bd17746704 100644 --- a/modules/pacing/g3doc/index.md +++ b/modules/pacing/g3doc/index.md @@ -157,7 +157,7 @@ Several methods are used to gather statistics in pacer state: * `ExpectedQueueTime()` total bytes in the queue divided by the send rate. [RTPSender]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/modules/rtp_rtcp/source/rtp_sender.h;drc=77ee8542dd35d5143b5788ddf47fb7cdb96eb08e -[RtpPacketSender]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/modules/rtp_rtcp/include/rtp_packet_sender.h;drc=ea55b0872f14faab23a4e5dbcb6956369c8ed5dc +[RtpPacketSender]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/api/rtp_packet_sender.h;drc=ea55b0872f14faab23a4e5dbcb6956369c8ed5dc [RtpPacketPacer]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/modules/pacing/rtp_packet_pacer.h;drc=e7bc3a347760023dd4840cf6ebdd1e6c8592f4d7 [PacketRouter]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/modules/pacing/packet_router.h;drc=3d2210876e31d0bb5c7de88b27fd02ceb1f4e03e [TaskQueuePacedSender]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/modules/pacing/task_queue_paced_sender.h;drc=5051693ada61bc7b78855c6fb3fa87a0394fa813 diff --git a/modules/pacing/pacing_controller.h b/modules/pacing/pacing_controller.h index bdf8bef392..9d7891266b 100644 --- a/modules/pacing/pacing_controller.h +++ b/modules/pacing/pacing_controller.h @@ -22,6 +22,7 @@ #include "absl/types/optional.h" #include "api/field_trials_view.h" #include "api/function_view.h" +#include "api/rtp_packet_sender.h" #include "api/transport/field_trial_based_config.h" #include "api/transport/network_types.h" #include "api/units/data_size.h" @@ -30,7 +31,6 @@ #include "modules/pacing/interval_budget.h" #include "modules/pacing/prioritized_packet_queue.h" #include "modules/pacing/rtp_packet_pacer.h" -#include "modules/rtp_rtcp/include/rtp_packet_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "rtc_base/experiments/field_trial_parser.h" diff --git a/modules/pacing/rtp_packet_pacer.h b/modules/pacing/rtp_packet_pacer.h index e2cf806385..2caa665c51 100644 --- a/modules/pacing/rtp_packet_pacer.h +++ b/modules/pacing/rtp_packet_pacer.h @@ -16,11 +16,11 @@ #include #include "absl/types/optional.h" +#include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/data_size.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" -#include "modules/rtp_rtcp/include/rtp_packet_sender.h" namespace webrtc { diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index b5817106ea..a1f563bcc7 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -21,8 +21,6 @@ rtc_library("rtp_rtcp_format") { "include/rtcp_statistics.h", "include/rtp_cvo.h", "include/rtp_header_extension_map.h", - "include/rtp_packet_sender.h", # Kept for compatibility with downstream - # projects "include/rtp_rtcp_defines.h", "source/byte_io.h", "source/rtcp_packet.h", diff --git a/modules/rtp_rtcp/include/rtp_packet_sender.h b/modules/rtp_rtcp/include/rtp_packet_sender.h deleted file mode 100644 index 9889d77ada..0000000000 --- a/modules/rtp_rtcp/include/rtp_packet_sender.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2019 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef MODULES_RTP_RTCP_INCLUDE_RTP_PACKET_SENDER_H_ -#define MODULES_RTP_RTCP_INCLUDE_RTP_PACKET_SENDER_H_ - -#include -#include - -#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "modules/rtp_rtcp/source/rtp_packet_to_send.h" - -// Kept for compatibility with the newer location of the header -#include "api/rtp_packet_sender.h" - -#endif // MODULES_RTP_RTCP_INCLUDE_RTP_PACKET_SENDER_H_ diff --git a/modules/rtp_rtcp/source/rtp_rtcp_interface.h b/modules/rtp_rtcp/source/rtp_rtcp_interface.h index 9fbe93fff1..406942a7eb 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_interface.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_interface.h @@ -19,12 +19,12 @@ #include "absl/types/optional.h" #include "api/field_trials_view.h" #include "api/frame_transformer_interface.h" +#include "api/rtp_packet_sender.h" #include "api/scoped_refptr.h" #include "api/units/time_delta.h" #include "api/video/video_bitrate_allocation.h" #include "modules/rtp_rtcp/include/receive_statistics.h" #include "modules/rtp_rtcp/include/report_block_data.h" -#include "modules/rtp_rtcp/include/rtp_packet_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/rtp_rtcp/source/rtp_sequence_number_map.h" diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index a398f16d46..61a1a5fbfe 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -22,9 +22,9 @@ #include "api/array_view.h" #include "api/call/transport.h" #include "api/field_trials_view.h" +#include "api/rtp_packet_sender.h" #include "modules/rtp_rtcp/include/flexfec_sender.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" -#include "modules/rtp_rtcp/include/rtp_packet_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/rtp_packet_history.h" #include "modules/rtp_rtcp/source/rtp_rtcp_config.h"