Index: webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc |
index a7d553781e78d363cf85826ff3d1fdcac780ac82..4194b3c48c6ef3414404f8c6238bfd3f2b745d65 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc |
@@ -28,13 +28,11 @@ |
namespace webrtc { |
-enum { REDForFECHeaderLength = 1 }; |
+enum { RedForFecHeaderLength = 1 }; |
danilchap
2016/08/22 13:00:41
constexpr size_t kRedForFecHeaderLength = 1;
i.e.
brandtr
2016/08/23 08:19:11
Done, see https://codereview.webrtc.org/2275443002
|
RTPSenderVideo::RTPSenderVideo(Clock* clock, RTPSender* rtp_sender) |
: rtp_sender_(rtp_sender), |
clock_(clock), |
- // Generic FEC |
- producer_fec_(&fec_), |
fec_bitrate_(1000, RateStatistics::kBpsScale), |
video_bitrate_(1000, RateStatistics::kBpsScale) {} |
@@ -177,7 +175,7 @@ void RTPSenderVideo::GenericFECStatus(bool* enable, |
*payload_type_fec = fec_payload_type_; |
} |
-size_t RTPSenderVideo::FECPacketOverhead() const { |
+size_t RTPSenderVideo::FecPacketOverhead() const { |
rtc::CritScope cs(&crit_); |
size_t overhead = 0; |
if (red_payload_type_ != 0) { |
@@ -186,11 +184,11 @@ size_t RTPSenderVideo::FECPacketOverhead() const { |
// This reason for the header extensions to be included here is that |
// from an FEC viewpoint, they are part of the payload to be protected. |
// (The base RTP header is already protected by the FEC header.) |
- return ForwardErrorCorrection::PacketOverhead() + REDForFECHeaderLength + |
+ return producer_fec_.MaxPacketOverhead() + RedForFecHeaderLength + |
(rtp_sender_->RtpHeaderLength() - kRtpHeaderSize); |
} |
if (fec_enabled_) |
- overhead += ForwardErrorCorrection::PacketOverhead(); |
+ overhead += producer_fec_.MaxPacketOverhead(); |
return overhead; |
} |