Rename RtpStreamReceiver::IsFecEnabled to RtpStreamReceiver::IsUlpfecEnabled.
BUG=webrtc:5654
R=stefan@webrtc.org
Review-Url: https://codereview.webrtc.org/2548523002
Cr-Original-Commit-Position: refs/heads/master@{#15487}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: f7c6d7231c5595a3bd4ac182da64779f05fafebf
diff --git a/video/rtp_stream_receiver.cc b/video/rtp_stream_receiver.cc
index 3bbf69e..972e6de 100644
--- a/video/rtp_stream_receiver.cc
+++ b/video/rtp_stream_receiver.cc
@@ -168,7 +168,7 @@
kv.first);
}
- if (IsFecEnabled()) {
+ if (IsUlpfecEnabled()) {
VideoCodec ulpfec_codec = {};
ulpfec_codec.codecType = kVideoCodecULPFEC;
strncpy(ulpfec_codec.plName, "ulpfec", sizeof(ulpfec_codec.plName));
@@ -379,7 +379,7 @@
static_cast<uint8_t>(picture_id));
}
-bool RtpStreamReceiver::IsFecEnabled() const {
+bool RtpStreamReceiver::IsUlpfecEnabled() const {
return config_.rtp.ulpfec.ulpfec_payload_type != -1;
}
diff --git a/video/rtp_stream_receiver.h b/video/rtp_stream_receiver.h
index 3668984..082f105 100644
--- a/video/rtp_stream_receiver.h
+++ b/video/rtp_stream_receiver.h
@@ -123,7 +123,7 @@
int32_t RequestKeyFrame() override;
int32_t SliceLossIndicationRequest(const uint64_t picture_id) override;
- bool IsFecEnabled() const;
+ bool IsUlpfecEnabled() const;
bool IsRetransmissionsEnabled() const;
// Don't use, still experimental.
void RequestPacketRetransmit(const std::vector<uint16_t>& sequence_numbers);
diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc
index eb2f10e..1a4edeb 100644
--- a/video/video_receive_stream.cc
+++ b/video/video_receive_stream.cc
@@ -295,7 +295,7 @@
call_stats_->RegisterStatsObserver(&rtp_stream_receiver_);
if (rtp_stream_receiver_.IsRetransmissionsEnabled() &&
- rtp_stream_receiver_.IsFecEnabled()) {
+ rtp_stream_receiver_.IsUlpfecEnabled()) {
frame_buffer_->SetProtectionMode(kProtectionNackFEC);
}
}
@@ -325,7 +325,7 @@
video_stream_decoder_.reset(new VideoStreamDecoder(
&video_receiver_, &rtp_stream_receiver_, &rtp_stream_receiver_,
rtp_stream_receiver_.IsRetransmissionsEnabled(),
- rtp_stream_receiver_.IsFecEnabled(), &stats_proxy_, renderer,
+ rtp_stream_receiver_.IsUlpfecEnabled(), &stats_proxy_, renderer,
config_.pre_render_callback));
// Register the channel to receive stats updates.
call_stats_->RegisterStatsObserver(video_stream_decoder_.get());
