Fix Quit after welcome window triggers crash, #4343 #4356
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
This commit will: - Remove the incorrect fix added to PlayerCore.shutdown for issue #4315 - Add the Atomic property wrapper to the VideoView.isUninited property - Change VideoView.uninit to hold a lock on isUninited when executing - Change VideoView.displayLinkCallback to hold a lock on isUninited when executing - Change VideoLayer.draw to to hold a lock on isUninited as needed - Change VideoLayer.display to to hold a lock on isUninited as needd - Remove the Atomic property wrapper from the VideoLayer properties forceRender and needsMPVRender - Move the method onVideoReconfig from MPVController to PlayerCore - Change the onVideoReconfig method to check for shutdown These changes: - Correct issue #4343 by removing the faulty fix for issue #4315 - Correct issue #4315 by coordinating threads during the shutdown of VideoView - Correct a crash due to onVideoReconfig accessing the mpv core during shutdown
1 task
This commit will: - Remove the incorrect fix added to PlayerCore.shutdown for issue #4315 - Add the Atomic property wrapper to the VideoView.isUninited property - Change VideoView.uninit to hold a lock on isUninited when executing - Change VideoView.displayLinkCallback to hold a lock on isUninited when executing - Change ViewLayer.draw to to hold a lock on isUninited as needed - Change ViewLayer.display to to hold a lock on isUninited as needed - Remove the Atomic property wrapper from the ViewLayer properties forceRender and needsMPVRender - Move the method onVideoReconfig from MPVController to PlayerCore - Change the onVideoReconfig method to check for shutdown These changes: - Correct issue #4343 by removing the faulty fix for issue #4315 - Correct issue #4315 by coordinating threads during the shutdown of VideoView - Correct a crash due to onVideoReconfig accessing the mpv core during shutdown
|
This PR is adding locking to make shutdown of As this involves the critical |
uiryuu
approved these changes
Apr 17, 2023
23 tasks
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 commit will:
PlayerCore.shutdownfor issue Crash in mpv_render_context_report_swap while quitting #4315Atomicproperty wrapper to theVideoView.isUninitedpropertyVideoView.uninitto hold a lock onisUninitedwhen executingVideoView.displayLinkCallbackto hold a lock onisUninitedwhen executingViewLayer.drawto to hold a lock onisUninitedas neededViewLayer.displayto to hold a lock onisUninitedas needdAtomicproperty wrapper from theViewLayerpropertiesforceRenderandneedsMPVRenderonVideoReconfigfromMPVControllertoPlayerCoreonVideoReconfigmethod to check for shutdownThese changes:
Correct issue Quit after welcome window displayed triggers crash #4343 by removing the faulty fix for issue Crash in mpv_render_context_report_swap while quitting #4315
Correct issue Crash in mpv_render_context_report_swap while quitting #4315 by coordinating threads during the shutdown of
VideoViewCorrect a crash due to
onVideoReconfigaccessing the mpv core during shutdownI have read CONTRIBUTING.md
This implements/fixes issue Quit after welcome window displayed triggers crash #4343.
Description: