Set actual transport overhead in rtp_rtcp

webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 394 matching lines @@
 }
 
 uint16_t ModuleRtpRtcpImpl::MaxPayloadLength() const {
   return rtp_sender_.MaxPayloadLength();
 }
 
 uint16_t ModuleRtpRtcpImpl::MaxDataPayloadLength() const {
   return rtp_sender_.MaxDataPayloadLength();
 }
 
 int32_t ModuleRtpRtcpImpl::SetTransportOverhead(

[the sun, 2016/10/20 08:56:46]

Remove the return value from this API - the result is always 0.

[michaelt, 2016/10/20 09:38:05]

Done.

-    const bool tcp,
-    const bool ipv6,
-    const uint8_t authentication_overhead) {
-  uint16_t packet_overhead = 0;
-  if (ipv6) {
-    packet_overhead = 40;
-  } else {
-    packet_overhead = 20;
-  }
-  if (tcp) {
-    // TCP.
-    packet_overhead += 20;
-  } else {
-    // UDP.
-    packet_overhead += 8;
-  }
-  packet_overhead += authentication_overhead;
-
-  if (packet_overhead == packet_overhead_) {
+    int transport_overhead_per_packet_byte) {
+  if (transport_overhead_per_packet_byte == packet_overhead_) {
     // Ok same as before.
     return 0;
   }
 
   size_t mtu = rtp_sender_.MaxPayloadLength() + packet_overhead_;
-  size_t max_payload_length = mtu - packet_overhead;
-  packet_overhead_ = packet_overhead;
+  size_t max_payload_length = mtu - transport_overhead_per_packet_byte;
+  packet_overhead_ = transport_overhead_per_packet_byte;
   rtcp_sender_.SetMaxPayloadLength(max_payload_length);
   rtp_sender_.SetMaxPayloadLength(max_payload_length);
   return 0;
 }
 
 int32_t ModuleRtpRtcpImpl::SetMaxTransferUnit(uint16_t mtu) {
   RTC_DCHECK_LE(mtu, IP_PACKET_SIZE) << "MTU too large: " << mtu;
   RTC_DCHECK_GT(mtu, packet_overhead_) << "MTU too small: " << mtu;
   size_t max_payload_length = mtu - packet_overhead_;
   rtcp_sender_.SetMaxPayloadLength(max_payload_length);
@@ skipping 481 matching lines @@
 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
     StreamDataCountersCallback* callback) {
   rtp_sender_.RegisterRtpStatisticsCallback(callback);
 }
 
 StreamDataCountersCallback*
     ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
   return rtp_sender_.GetRtpStatisticsCallback();
 }
 }  // namespace webrtc