zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove IsUlpfecEnabled()

Browse Source 
Bug: none
Change-Id: Ibd379afda6271b3cf320cf18a75ab4f4e9c12d42
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/270980
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37720}
This commit is contained in:
Tommi
2022-08-09 12:24:12 +02:00
committed by WebRTC LUCI CQ
parent 3b205da7e4
commit b38d2c35d5
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
video/rtp_video_stream_receiver2.cc
View File

@ -703,10 +703,6 @@ void RtpVideoStreamReceiver2::SendLossNotification(
decodability_flag, buffering_allowed);
}
bool RtpVideoStreamReceiver2::IsUlpfecEnabled() const {
return config_.rtp.ulpfec_payload_type != -1;
}
bool RtpVideoStreamReceiver2::IsDecryptable() const {
RTC_DCHECK_RUN_ON(&worker_task_checker_);
return frames_decryptable_;

2
video/rtp_video_stream_receiver2.h
View File

@ -148,8 +148,6 @@ class RtpVideoStreamReceiver2 : public LossNotificationSender,
bool decodability_flag,
bool buffering_allowed) override;
bool IsUlpfecEnabled() const;
// Returns true if a decryptor is attached and frames can be decrypted.
// Updated by OnDecryptionStatusChangeCallback. Note this refers to Frame
// Decryption not SRTP.

8
video/video_receive_stream2.cc
View File

@ -351,8 +351,8 @@ void VideoReceiveStream2::Start() {
return;
}
const bool protected_by_fec = config_.rtp.protected_by_flexfec ||
rtp_video_stream_receiver_.IsUlpfecEnabled();
const bool protected_by_fec =
config_.rtp.protected_by_flexfec || config_.rtp.ulpfec_payload_type != -1;
if (config_.rtp.nack.rtp_history_ms > 0 && protected_by_fec) {
frame_buffer_->SetProtectionMode(kProtectionNackFEC);
@ -532,8 +532,8 @@ void VideoReceiveStream2::SetNackHistory(TimeDelta history) {
// TODO(tommi): Stop using the config struct for the internal state.
const_cast<int&>(config_.rtp.nack.rtp_history_ms) = history.ms();
const bool protected_by_fec = config_.rtp.protected_by_flexfec ||
rtp_video_stream_receiver_.IsUlpfecEnabled();
const bool protected_by_fec =
config_.rtp.protected_by_flexfec || config_.rtp.ulpfec_payload_type != -1;
frame_buffer_->SetProtectionMode(history.ms() > 0 && protected_by_fec
? kProtectionNackFEC