From 04eaa154689ae77434e1c0805cca133a0784ca85 Mon Sep 17 00:00:00 2001 From: Zhi Huang Date: Wed, 4 Oct 2017 14:08:30 -0700 Subject: [PATCH] Change the flag when RtpTransport objects send packet. Always use the PF_SRTP_BYPASS when sending RTP/RTCP packets. Change the condition in BaseChannel::GetSrtpOverhead. Get the SRTP overhead when using either SDES or DTLS-SRTP. Bug: None Change-Id: I44aeff8b75e56b12acefd73299a95a3e38cd401b Reviewed-on: https://webrtc-review.googlesource.com/6580 Reviewed-by: Taylor Brandstetter Commit-Queue: Zhi Huang Cr-Commit-Position: refs/heads/master@{#20152} --- pc/channel.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pc/channel.cc b/pc/channel.cc index 7ddf5de7dd..1185ec6c93 100644 --- a/pc/channel.cc +++ b/pc/channel.cc @@ -680,8 +680,9 @@ bool BaseChannel::SendPacket(bool rtcp, return false; } // Bon voyage. - return rtcp ? rtp_transport_->SendRtcpPacket(packet, options, PF_NORMAL) - : rtp_transport_->SendRtpPacket(packet, options, PF_NORMAL); + return rtcp + ? rtp_transport_->SendRtcpPacket(packet, options, PF_SRTP_BYPASS) + : rtp_transport_->SendRtpPacket(packet, options, PF_SRTP_BYPASS); } RTC_DCHECK(srtp_transport_); RTC_DCHECK(srtp_transport_->IsActive()); @@ -1661,7 +1662,7 @@ int BaseChannel::GetTransportOverheadPerPacket() const { ? kTcpOverhaed : kUdpOverhaed; - if (sdes_active()) { + if (srtp_active()) { int srtp_overhead = 0; if (srtp_transport_->GetSrtpOverhead(&srtp_overhead)) transport_overhead_per_packet += srtp_overhead;