commit 04eaa154689ae77434e1c0805cca133a0784ca85
author Zhi Huang <zhihuang@webrtc.org> Wed Oct 04 21:08:30 2017
committer Commit Bot <commit-bot@chromium.org> Thu Oct 05 04:41:55 2017
tree 79864da3b2e3ce8318ffdf2800b0132045d132e8
parent c177168d1e5df4c8683d13d065ea8d27f32b7d65

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 <deadbeef@webrtc.org>
Commit-Queue: Zhi Huang <zhihuang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20152}

pc/channel.cc

diff --git a/pc/channel.cc b/pc/channel.cc
index 7ddf5de..1185ec6 100644
--- a/pc/channel.cc
+++ b/pc/channel.cc
@@ -680,8 +680,9 @@
       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 @@
           ? kTcpOverhaed
           : kUdpOverhaed;
 
-  if (sdes_active()) {
+  if (srtp_active()) {
     int srtp_overhead = 0;
     if (srtp_transport_->GetSrtpOverhead(&srtp_overhead))
       transport_overhead_per_packet += srtp_overhead;