fix: DesktopCapturer gc'd prior to capture completion #28273
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
desktopCapture.getSources() returns a promise which should resolve when capturing finishes. Internally it creates an instance of DesktopCapturer which is responsible for resolving or rejecting the promise. Between the time DesktopCapturer starts capturing frames and when it finishes, it's possible for its handle to be GC'd leading to it never resolving. These changes pin the instance of DesktopCapturer until it either finishes or errors. fixes electron#25595
nornagon
approved these changes
Mar 18, 2021
codebytere
approved these changes
Mar 18, 2021
MarshallOfSound
approved these changes
Mar 18, 2021
|
Release Notes Persisted
|
|
I have automatically backported this PR to "10-x-y", please check out #28279 |
This was referenced Mar 18, 2021
|
I have automatically backported this PR to "13-x-y", please check out #28280 |
|
I have automatically backported this PR to "12-x-y", please check out #28281 |
|
I have automatically backported this PR to "11-x-y", please check out #28282 |
|
Thank you so much for this, @samuelmaddock! |
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.
Description of Change
desktopCapturer.getSources()returns a promise which should resolvewhen capturing finishes. Internally it creates an instance of
DesktopCapturer which is responsible for resolving or rejecting
the promise.
Between the time DesktopCapturer starts capturing frames and when
it finishes, it's possible for its handle to be GC'd leading to
it never resolving.
These changes pin the instance of DesktopCapturer until it either
finishes or errors.
fixes #25595
To verify the fix, I ran this Fiddle gist which normally fails after 10-30 seconds without the fix
https://gist.github.com/90f43a52e7c48a531a57bec77428e11a
cc @codebytere
Checklist
npm testpassesRelease Notes
Notes: Fixed
desktopCapturer.getSources()promise result sometimes never resolving.