admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename RtpStreamReceiver::IsFecEnabled to RtpStreamReceiver::IsUlpfecEnabled.

Browse Source 
BUG=webrtc:5654
R=stefan@webrtc.org

Review-Url: https://codereview.webrtc.org/2548523002
Cr-Commit-Position: refs/heads/master@{#15487}
This commit is contained in:
brandtr 2016-12-08 08:25:47 -08:00 committed by Commit bot
parent 8d193a72bc
commit f7c6d7231c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/video/rtp_stream_receiver.cc
View File

@ -168,7 +168,7 @@ RtpStreamReceiver::RtpStreamReceiver(
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 @@ int32_t RtpStreamReceiver::SliceLossIndicationRequest(
static_cast<uint8_t>(picture_id));
}
bool RtpStreamReceiver::IsFecEnabled() const {
bool RtpStreamReceiver::IsUlpfecEnabled() const {
return config_.rtp.ulpfec.ulpfec_payload_type != -1;
}

2
webrtc/video/rtp_stream_receiver.h
View File

@ -123,7 +123,7 @@ class RtpStreamReceiver : public RtpData,
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);

4
webrtc/video/video_receive_stream.cc
View File

@ -295,7 +295,7 @@ void VideoReceiveStream::Start() {
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 @@ void VideoReceiveStream::Start() {
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());