worker: Fix NACK timer and avoid negative RTT #1082
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Based on PR #1076 of @o-u-p ### Details - Stop NACK timer when NACK list is empty as explained in #1076 (comment). - Avoid RTT becoming negative in `RtpStreamSend` and `RtpStreamRecv`. If so, assign it with 0.0f. - And if 0.0f, use `DefaultRtt` (100 ms) in `NackGenerator`. - Remove useless `RtpStream::hasRtt` and check `RtpStream::rtt > 0.0f` instead. - Add some brackets in condition blocks.
jmillan
reviewed
May 18, 2023
| if ( | ||
| filter == NackFilter::TIME && | ||
| (nackInfo.sentAtMs == 0 || | ||
| nowMs - nackInfo.sentAtMs >= (this->rtt > 0u ? this->rtt : DefaultRtt))) |
There was a problem hiding this comment.
Suggested change
| nowMs - nackInfo.sentAtMs >= (this->rtt > 0u ? this->rtt : DefaultRtt))) | |
| nowMs - nackInfo.sentAtMs >= (this->rtt > 0.0f ? this->rtt : DefaultRtt))) |
There was a problem hiding this comment.
Nope. this->rtt in NackGenerator is uint32_t.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on PR #1076 of @o-u-p
Details
RtpStreamSendandRtpStreamRecv. If so, assign it with 0.0f.DefaultRtt(100 ms) inNackGenerator.RtpStream::hasRttand checkRtpStream::rtt > 0.0finstead.