| 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 3e364021ab0adcd7e06e8f1291bd2454bdcef626..4e0e4c5f4c44258275102e6979c1ea5221322e98 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
| @@ -818,11 +818,11 @@ bool RTPSender::IsFecPacket(const RtpPacketToSend& packet) const {
|
| return false;
|
| }
|
| bool fec_enabled;
|
| - uint8_t pt_red;
|
| - uint8_t pt_fec;
|
| - video_->GenericFECStatus(&fec_enabled, &pt_red, &pt_fec);
|
| - return fec_enabled && packet.PayloadType() == pt_red &&
|
| - packet.payload()[0] == pt_fec;
|
| + int pt_red;
|
| + int pt_fec;
|
| + video_->UlpfecConfig(&fec_enabled, &pt_red, &pt_fec);
|
| + return fec_enabled && static_cast<int>(packet.PayloadType()) == pt_red &&
|
| + static_cast<int>(packet.payload()[0]) == pt_fec;
|
| }
|
|
|
| size_t RTPSender::TimeToSendPadding(size_t bytes, int probe_cluster_id) {
|
| @@ -1197,18 +1197,19 @@ RtpVideoCodecTypes RTPSender::VideoCodecType() const {
|
| return video_->VideoCodecType();
|
| }
|
|
|
| -void RTPSender::SetGenericFECStatus(bool enable,
|
| - uint8_t payload_type_red,
|
| - uint8_t payload_type_fec) {
|
| +void RTPSender::SetUlpfecConfig(bool ulpfec_enabled,
|
| + int red_payload_type,
|
| + int ulpfec_payload_type) {
|
| RTC_DCHECK(!audio_configured_);
|
| - video_->SetGenericFECStatus(enable, payload_type_red, payload_type_fec);
|
| + video_->SetUlpfecConfig(ulpfec_enabled, red_payload_type,
|
| + ulpfec_payload_type);
|
| }
|
|
|
| -void RTPSender::GenericFECStatus(bool* enable,
|
| - uint8_t* payload_type_red,
|
| - uint8_t* payload_type_fec) const {
|
| +void RTPSender::UlpfecConfig(bool* ulpfec_enabled,
|
| + int* red_payload_type,
|
| + int* ulpfec_payload_type) const {
|
| RTC_DCHECK(!audio_configured_);
|
| - video_->GenericFECStatus(enable, payload_type_red, payload_type_fec);
|
| + video_->UlpfecConfig(ulpfec_enabled, red_payload_type, ulpfec_payload_type);
|
| }
|
|
|
| int32_t RTPSender::SetFecParameters(
|
|
|