fallback to audio sync logic if mpv window isn't visible #15552
+109
−49
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
x11 and wayland VOs + backends all have logic that skips drawing frames when the mpv isn't visible for efficiency reasons. This is implemented in each individual VO, but it is useful for the core to be aware of this as well. Currently, the display-sync modes on x11 do not try to be efficient and always render anyways because there is no blocking on the graphics API level if you skip rendering a frame (wayland works here by accident). This means mpv would otherwise blaze through frames which is not what anyone wants. We can instead improve this by implementing the blocking mechanism in the core and using that when appropriate. This commit does not implement that yet, but simply switches the draw_frame to a boolean. Receiving false means that the VO is not drawing frames and it should be treated as if the surface was hidden.
|
Download the artifacts for this pull request: |
The previous commit put all the pieces in place so now this can be implemented. Scheduling frames is already written with the assumption that display sync maybe turn on/off at any time. So all that needs to be done is check if the VO reports that it is not visible. If so, simply flip mpctx->display_sync_active to false for that frame and skip the display sync frame handling. It will become true again when the mpv window comes back into view.
When this was originally implemented, I lazily skipped the optimization when using display sync because mpv would rip through all the frames without waiting since there was no blocking. With the previous commits, we now fall back on the audio sync logic when the window is not visible, so the extra condition can be removed.
Dudemanguy
force-pushed
the
visibility-improvements
branch
from
cf50805 to
7715172
Compare
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.
This solves the problem mentioned here. If we skip rendering while the player is in display-sync mode, then there is no driver-level blocking which means mpv will go through the render loop unthrottled. Not good of course. On X11, I just ignored this problem and made it always render if we were using display sync. Wayland has its own blocking thing so it works there. So fix this by simply repurposing the already existing code path for audio sync when we hit this case. display sync is meaningless if the window is obscured and the audio sync stuff already handles all the appropriate throttling/timings for us.