Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(964)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.cc

Issue 2448463003: Rename {,Set}GenericFECStatus to {,Set}UlpfecConfig. (Closed)
Patch Set: Rebase. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f3fac77d548acca6fb955ddf682a382d92c8948e..f0e323a4b2869a1f0dd00b3767eb9e557e6ee494 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
@@ -790,11 +790,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_->GetUlpfecConfig(&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) {
@@ -1131,18 +1131,11 @@ 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 enabled,
+ int red_payload_type,
+ int ulpfec_payload_type) {
RTC_DCHECK(!audio_configured_);
- video_->SetGenericFECStatus(enable, payload_type_red, payload_type_fec);
-}
-
-void RTPSender::GenericFECStatus(bool* enable,
- uint8_t* payload_type_red,
- uint8_t* payload_type_fec) const {
- RTC_DCHECK(!audio_configured_);
- video_->GenericFECStatus(enable, payload_type_red, payload_type_fec);
+ video_->SetUlpfecConfig(enabled, red_payload_type, ulpfec_payload_type);
}
int32_t RTPSender::SetFecParameters(
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698