From 76a5593835af6a6696125973005c487b4d7cf76b Mon Sep 17 00:00:00 2001 From: erikvarga Date: Wed, 17 May 2017 07:50:17 -0700 Subject: [PATCH] Don't add FEC and RTX overheads when calculating a padding packet's maximum payload size. BUG=webrtc:7433 Review-Url: https://codereview.webrtc.org/2892583002 Cr-Commit-Position: refs/heads/master@{#18184} --- webrtc/modules/rtp_rtcp/source/rtp_sender.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index 17bcc7c625..d1de668e69 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -464,10 +464,10 @@ size_t RTPSender::TrySendRedundantPayloads(size_t bytes_to_send, size_t RTPSender::SendPadData(size_t bytes, const PacedPacketInfo& pacing_info) { size_t padding_bytes_in_packet; + size_t max_payload_size = max_packet_size_ - RtpHeaderLength(); if (audio_configured_) { // Allow smaller padding packets for audio. - size_t max_payload_size = max_packet_size_ - RtpHeaderLength(); padding_bytes_in_packet = std::min(std::max(bytes, kMinAudioPaddingLength), max_payload_size); if (padding_bytes_in_packet > kMaxPaddingLength) @@ -477,10 +477,6 @@ size_t RTPSender::SendPadData(size_t bytes, // RtpPacketSender, which will make sure we don't send too much padding even // if a single packet is larger than requested. // We do this to avoid frequently sending small packets on higher bitrates. - size_t max_payload_size = - max_packet_size_ - RtpHeaderLength() // RTP overhead. - - video_->FecPacketOverhead() // FEC/ULP/RED overhead. - - (RtxStatus() ? kRtxHeaderSize : 0); // RTX overhead. padding_bytes_in_packet = std::min(max_payload_size, kMaxPaddingLength); } size_t bytes_sent = 0;