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

Unified Diff: webrtc/video/rtp_stream_receiver.cc

Issue 2391963002: Rename FecConfig to UlpfecConfig in config.h. (Closed)
Patch Set: Rebase. Created 4 years, 2 months 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/video/replay.cc ('k') | webrtc/video/send_statistics_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/rtp_stream_receiver.cc
diff --git a/webrtc/video/rtp_stream_receiver.cc b/webrtc/video/rtp_stream_receiver.cc
index fc299701f88954172dbcc20002b6cd2371f0d657..984cc0ec2d464e1d96f290903d585fa72ce5ebd4 100644
--- a/webrtc/video/rtp_stream_receiver.cc
+++ b/webrtc/video/rtp_stream_receiver.cc
@@ -165,23 +165,22 @@ RtpStreamReceiver::RtpStreamReceiver(
VideoCodec ulpfec_codec = {};
ulpfec_codec.codecType = kVideoCodecULPFEC;
strncpy(ulpfec_codec.plName, "ulpfec", sizeof(ulpfec_codec.plName));
- ulpfec_codec.plType = config_.rtp.fec.ulpfec_payload_type;
+ ulpfec_codec.plType = config_.rtp.ulpfec.ulpfec_payload_type;
RTC_CHECK(SetReceiveCodec(ulpfec_codec));
VideoCodec red_codec = {};
red_codec.codecType = kVideoCodecRED;
strncpy(red_codec.plName, "red", sizeof(red_codec.plName));
- red_codec.plType = config_.rtp.fec.red_payload_type;
+ red_codec.plType = config_.rtp.ulpfec.red_payload_type;
RTC_CHECK(SetReceiveCodec(red_codec));
- if (config_.rtp.fec.red_rtx_payload_type != -1) {
+ if (config_.rtp.ulpfec.red_rtx_payload_type != -1) {
rtp_payload_registry_.SetRtxPayloadType(
- config_.rtp.fec.red_rtx_payload_type,
- config_.rtp.fec.red_payload_type);
+ config_.rtp.ulpfec.red_rtx_payload_type,
+ config_.rtp.ulpfec.red_payload_type);
}
- rtp_rtcp_->SetGenericFECStatus(true,
- config_.rtp.fec.red_payload_type,
- config_.rtp.fec.ulpfec_payload_type);
+ rtp_rtcp_->SetGenericFECStatus(true, config_.rtp.ulpfec.red_payload_type,
+ config_.rtp.ulpfec.ulpfec_payload_type);
}
if (config_.rtp.rtcp_xr.receiver_reference_time_report)
@@ -338,8 +337,8 @@ int32_t RtpStreamReceiver::SliceLossIndicationRequest(
}
bool RtpStreamReceiver::IsFecEnabled() const {
- return config_.rtp.fec.red_payload_type != -1 &&
- config_.rtp.fec.ulpfec_payload_type != -1;
+ return config_.rtp.ulpfec.red_payload_type != -1 &&
+ config_.rtp.ulpfec.ulpfec_payload_type != -1;
}
bool RtpStreamReceiver::IsRetransmissionsEnabled() const {
« no previous file with comments | « webrtc/video/replay.cc ('k') | webrtc/video/send_statistics_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698