From ef85f2bdb82d30d2c2766640ed2efcf0a4ebad33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Thu, 12 Sep 2019 15:20:41 +0200 Subject: [PATCH] Clean away unused enum RtpPacketSendResult MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also updates outdated comment. Bug: webrtc:8052 Change-Id: Ib88c2894bdda5efcf36d8d7dfbacbe96edf1b549 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/152180 Commit-Queue: Erik Språng Reviewed-by: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#29168} --- modules/rtp_rtcp/include/rtp_rtcp_defines.h | 8 -------- modules/rtp_rtcp/source/rtp_sender.h | 5 +++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index 5856ecbb4b..f58193928f 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -492,13 +492,5 @@ class SendPacketObserver { int64_t capture_time_ms, uint32_t ssrc) = 0; }; - -// Status returned from TimeToSendPacket() family of callbacks. -enum class RtpPacketSendResult { - kSuccess, // Packet sent OK. - kTransportUnavailable, // Network unavailable, try again later. - kPacketNotFound // SSRC/sequence number does not map to an available packet. -}; - } // namespace webrtc #endif // MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index 4c59d3bc1f..bff209021b 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -89,8 +89,9 @@ class RTPSender { bool IsRtpHeaderExtensionRegistered(RTPExtensionType type) const; int32_t DeregisterRtpHeaderExtension(RTPExtensionType type); - // Returns an RtpPacketSendResult indicating success, network unavailable, - // or packet not found. + // Tries to send packet to transport. Also updates any timing extensions, + // calls observers waiting for packet send events, and updates stats. + // Returns true if packet belongs to this RTP module, false otherwise. bool TrySendPacket(RtpPacketToSend* packet, const PacedPacketInfo& pacing_info); bool SupportsPadding() const;