Simplify seeking and cursor logic #543
Merged
Conversation
This file contains hidden or 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
facebook-github-bot
added
the
CLA Signed
NicolasHug
commented
Mar 9, 2025
| if (cursorWasJustSet_) { | ||
| maybeSeekToBeforeDesiredPts(); | ||
| desiredPtsSeconds_ = std::nullopt; | ||
| cursorWasJustSet_ = false; |
There was a problem hiding this comment.
I'm not particularly fond of this logic, but don't shoot the messenger. This PR is only making an existing stateful logic a little bit more obvious. I.e. now we have an obvious bool field, while before we had a slightly obscure std::optional logic.
We could try to simplify this further, I gave it a quick try but our tests failed in some weird edge-cases, so I'm leaving this for later.
|
This is great! I also tried simplifying this logic in PR #262, but I abandoned it because I there was concern it would undo the lazy behavior that we want. Now that we've simplified other stuff, and there's only one active stream, I think this is obviously maintaining the lazy behavior we want. |
scotts
approved these changes
Mar 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
In main, we have 2 different fields to indicate where the user requested a seek:
desiredPtsSeconds_field of the decoderdiscardFramesBeforePtsfield of active stream'sstreamInfoThey both morally represent the exact same thing. But one's a
std::optional<double>, the other one's anint_64_t. One is set insetCursorPtsInSeconds, the other one is set indecodeAVFrame().This is all pretty confusing, so this PR simplify things: there is now only one single
cursor_field, for the decoder, and it's set in one single place.