diff --git a/webrtc/video/rtp_stream_receiver.cc b/webrtc/video/rtp_stream_receiver.cc index 3bbf69e9b2..972e6dea92 100644 --- a/webrtc/video/rtp_stream_receiver.cc +++ b/webrtc/video/rtp_stream_receiver.cc @@ -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(picture_id)); } -bool RtpStreamReceiver::IsFecEnabled() const { +bool RtpStreamReceiver::IsUlpfecEnabled() const { return config_.rtp.ulpfec.ulpfec_payload_type != -1; } diff --git a/webrtc/video/rtp_stream_receiver.h b/webrtc/video/rtp_stream_receiver.h index 36689848eb..082f1056da 100644 --- a/webrtc/video/rtp_stream_receiver.h +++ b/webrtc/video/rtp_stream_receiver.h @@ -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& sequence_numbers); diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc index eb2f10eaf7..1a4edeb166 100644 --- a/webrtc/video/video_receive_stream.cc +++ b/webrtc/video/video_receive_stream.cc @@ -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());