Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: cherry-pick 8fcc6df from webrtc #39264

Merged
merged 1 commit into from Jul 31, 2023
Merged

chore: cherry-pick 8fcc6df from webrtc #39264

merged 1 commit into from Jul 31, 2023

Conversation

aiddya
Copy link
Contributor

@aiddya aiddya commented Jul 28, 2023 •
edited

Description of Change

Cherry pick https://webrtc-review.googlesource.com/c/src/+/311541 from WebRTC to fix a crash during stream renegotiation.

Fixes #39131

cc @VerteDinde

Checklist

Release Notes

Notes: Fixed a crash while screen sharing on Wayland with PipeWire.

@aiddya aiddya requested a review from a team as a code owner July 28, 2023 02:07
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Jul 28, 2023
@VerteDinde VerteDinde added the semver/patch backwards-compatible bug fixes label Jul 28, 2023
@VerteDinde
Copy link
Member

VerteDinde commented Jul 28, 2023 •
edited

@aiddya Nice, great find!

Just confirming, I'll add backport labels to send this to all current stable branches, but let me know if you think it's only needed in specific branches. EDIT: Sorry, just noticed this was for 26-x-y specifically, since it landed in main already - let me know if you think this also needs to be backported to other stable branches and I'll manually create them 🙂

Also, I noticed you called out https://webrtc-review.googlesource.com/c/src/+/305120 in the issue, would you like me to cherry-pick this one and backport this to the other stable branches? Happy to do so 🙇‍♀️

@VerteDinde VerteDinde added target/23-x-y PR should also be added to the "23-x-y" branch. target/24-x-y PR should also be added to the "24-x-y" branch. target/25-x-y PR should also be added to the "25-x-y" branch. target/26-x-y PR should also be added to the "26-x-y" branch. backport-check-skip Skip trop's backport validity checking and removed target/23-x-y PR should also be added to the "23-x-y" branch. target/24-x-y PR should also be added to the "24-x-y" branch. target/25-x-y PR should also be added to the "25-x-y" branch. target/26-x-y PR should also be added to the "26-x-y" branch. labels Jul 28, 2023
@electron-cation electron-cation bot added new-pr 🌱 PR opened in the last 24 hours and removed new-pr 🌱 PR opened in the last 24 hours labels Jul 28, 2023
VerteDinde
VerteDinde approved these changes Jul 28, 2023
View reviewed changes
Copy link
Member

@VerteDinde VerteDinde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good - this patch already exists in main, hence the PR straight to 26-x-y.

@aiddya
Copy link
Contributor Author

aiddya commented Jul 28, 2023

@VerteDinde Thanks for the offer! I've already pulled in other stable branches, so I'll finish opening PRs for them. I want to pull in another patch for 25-x-y and older that fixes a failure during the initial PipeWire stream setup.

@maymage maymage mentioned this pull request Jul 29, 2023
Open
1 task
@jkleinsc jkleinsc merged commit 63a60b8 into electron:26-x-y Jul 31, 2023
18 checks passed
@release-clerk
Copy link

release-clerk bot commented Jul 31, 2023

Release Notes Persisted

Fixed a crash while screen sharing on Wayland with PipeWire.

@aiddya aiddya deleted the 26-x-y-pipewire-buf-size branch August 2, 2023 02:24
This was referenced Sep 2, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codebytere codebytere codebytere approved these changes

@VerteDinde VerteDinde VerteDinde approved these changes

Assignees
No one assigned
Labels
backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@aiddya @VerteDinde @codebytere @jkleinsc