Fix safari not capturing both display and camera #1127
Merged
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.
Safari needs a "user gesture" (i.e. a button click) to call
getDisplayMedia
. Calling the user capture first would prevent the display capture to register the triggering button click, so this switches the ordering (for safari only).So in Safari, the user will always get asked to share their screen before they get asked to share their webcam.
(I did notice that when calling both
startUserCapture
andstartDisplayCapture
inside aPromise.all()
, the ordering in Safari is consistently switched again, but with no issues (meaning user capture is asked before screen capture). This would be preferrable, but I'm not sure if we can rely on this always being the case. So in the interest of consistency I chose to just callstartDisplayCapture
first...)Closes #934