| Index: webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| index 792f2811d24ad97189316bc3704d20f4fd5d0930..383924ce0c68159f0699275a6b90e43f4aacaf30 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| @@ -817,10 +817,10 @@ bool RTPSender::IsFecPacket(const RtpPacketToSend& packet) const {
|
| if (!video_) {
|
| return false;
|
| }
|
| - bool fec_enabled;
|
| int pt_red;
|
| int pt_fec;
|
| - video_->UlpfecConfig(&fec_enabled, &pt_red, &pt_fec);
|
| + video_->UlpfecConfig(&pt_red, &pt_fec);
|
| + const bool fec_enabled = (pt_fec != -1);
|
| return fec_enabled && static_cast<int>(packet.PayloadType()) == pt_red &&
|
| static_cast<int>(packet.payload()[0]) == pt_fec;
|
| }
|
| @@ -1197,11 +1197,9 @@ RtpVideoCodecTypes RTPSender::VideoCodecType() const {
|
| return video_->VideoCodecType();
|
| }
|
|
|
| -void RTPSender::SetUlpfecConfig(bool enabled,
|
| - int red_payload_type,
|
| - int ulpfec_payload_type) {
|
| +void RTPSender::SetUlpfecConfig(int red_payload_type, int ulpfec_payload_type) {
|
| RTC_DCHECK(!audio_configured_);
|
| - video_->SetUlpfecConfig(enabled, red_payload_type, ulpfec_payload_type);
|
| + video_->SetUlpfecConfig(red_payload_type, ulpfec_payload_type);
|
| }
|
|
|
| int32_t RTPSender::SetFecParameters(
|
|
|