commit 41befcee7d25dabb8f6871dcdef4adc1a0004932
author danilchap <danilchap@webrtc.org> Wed Mar 30 11:11:51 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Mar 30 18:11:55 2016 +0000
tree e80fd77d13d94864dc762bb1d8c0bcdfb58d2fa0
parent 367bbbf76dbd28ca1e9ff107ec3e83604b65c2dd

Make rtcp sender use max transfer unit.
Remove packet overhead from rtp sender as unused.

R=philipel, åsapersson

Review URL: https://codereview.webrtc.org/1827953002

Cr-Commit-Position: refs/heads/master@{#12165}

webrtc/modules/rtp_rtcp/source/rtcp_sender.cc

diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
index a5fcceb..440bd50 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -99,8 +99,10 @@
     }
   }
 
-  size_t SendPackets() {
-    rtcp::CompoundPacket::Build(this);
+  size_t SendPackets(size_t max_payload_length) {
+    RTC_DCHECK_LE(max_payload_length, static_cast<size_t>(IP_PACKET_SIZE));
+    uint8_t buffer[IP_PACKET_SIZE];
+    BuildExternalBuffer(buffer, max_payload_length, this);
     return bytes_sent_;
   }
 
@@ -169,6 +171,7 @@
       tmmbr_help_(),
       tmmbr_send_(0),
       packet_oh_send_(0),
+      max_payload_length_(IP_PACKET_SIZE - 28),  // IPv4 + UDP by default.
 
       app_sub_type_(0),
       app_name_(0),
@@ -277,6 +280,10 @@
   }
 }
 
+void RTCPSender::SetMaxPayloadLength(size_t max_payload_length) {
+  max_payload_length_ = max_payload_length;
+}
+
 void RTCPSender::SetStartTimestamp(uint32_t start_timestamp) {
   rtc::CritScope lock(&critical_section_rtcp_sender_);
   start_timestamp_ = start_timestamp;
@@ -809,7 +816,7 @@
     RTC_DCHECK(AllVolatileFlagsConsumed());
   }
 
-  size_t bytes_sent = container.SendPackets();
+  size_t bytes_sent = container.SendPackets(max_payload_length_);
   return bytes_sent == 0 ? -1 : 0;
 }
 
@@ -1030,8 +1037,9 @@
     // but we can't because of an incorrect warning (C4822) in MVS 2013.
   } sender(transport_, event_log_);
 
+  RTC_DCHECK_LE(max_payload_length_, static_cast<size_t>(IP_PACKET_SIZE));
   uint8_t buffer[IP_PACKET_SIZE];
-  return packet.BuildExternalBuffer(buffer, IP_PACKET_SIZE, &sender) &&
+  return packet.BuildExternalBuffer(buffer, max_payload_length_, &sender) &&
          !sender.send_failure_;
 }