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

Ensure DirectX capturer is supported. #13543

Merged
merged 2 commits into from Jul 19, 2018
Merged

Ensure DirectX capturer is supported. #13543

merged 2 commits into from Jul 19, 2018

Conversation

ajmacd
Copy link
Contributor

@ajmacd ajmacd commented Jul 3, 2018 •
edited

Should resolve #13426

@ajmacd ajmacd requested a review from a team July 3, 2018 04:39
@MarshallOfSound
Copy link
Member

refs: https://cs.chromium.org/chromium/src/third_party/webrtc/modules/desktop_capture/screen_capturer_win.cc?q=allow_directx_capturer&dr=C&l=37

@ajmacd ajmacd changed the title [WiP] Ensure DirectX capturer is supported. Ensure DirectX capturer is supported. Jul 4, 2018
@ajmacd
Copy link
Contributor Author

ajmacd commented Jul 4, 2018

@MarshallOfSound I haven't succeeded in packaging a Windows build to test on my Win7 machine, but this works as before on Win10 and I suspect will resolve the Win7 crash. Want to merge?

alexeykuzmin
alexeykuzmin suggested changes Jul 4, 2018
View reviewed changes
Copy link
Contributor

@alexeykuzmin alexeykuzmin left a comment

Choose a reason for hiding this comment

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

I suspect will resolve the Win7 crash

Can you please actually test you changes on Windows 7?

@ajmacd
Copy link
Contributor Author

ajmacd commented Jul 4, 2018

I'd love to, but haven't been able to produce a distributable package on Windows to test on my Win7 machine. Is there any way to have CI produce one?

@alexeykuzmin
Copy link
Contributor

haven't been able to produce a distributable package on Windows to test on my Win7 machine. Is there any way to have CI produce one?

@jkleinsc ?

@MarshallOfSound
Copy link
Member

@ajmacd I'll try building this on my local today and send you a build on Slack 👍

@ckerr
Copy link
Member

ckerr commented Jul 18, 2018

@MarshallOfSound any progress on this?

@ajmacd
Copy link
Contributor Author

ajmacd commented Jul 18, 2018

Sorry for the delay. Finally got a working build on a Win7 machine and verified this PR resolves the crash in #13426.

The display IDs don't match between the desktopCapturer and screen APIs, but that's not a regression. Let's merge this!

@ajmacd
Copy link
Contributor Author

ajmacd commented Jul 19, 2018

@alexeykuzmin Good to merge?

@jkleinsc jkleinsc merged commit f8b646c into master Jul 19, 2018
@jkleinsc
Copy link
Contributor

/trop run backport-to 3-0-x

@trop
Copy link
Contributor

trop bot commented Jul 19, 2018

The backport process for this PR has been manually initiated, sending your 1's and 0's to "3-0-x" here we go! :D

@trop trop bot mentioned this pull request Jul 19, 2018
Merged
@trop
Copy link
Contributor

trop bot commented Jul 19, 2018

We have automatically backported this PR to "3-0-x", please check out #13738

@trop trop bot added the merged/3-0-x label Jul 19, 2018
@jkleinsc jkleinsc deleted the ajm-win7-crash branch July 19, 2018 19:16
@ajmacd ajmacd mentioned this pull request Jul 25, 2018
Merged
@ckerr
Copy link
Member

ckerr commented Aug 8, 2018

/trop run backport-to 2-1-x

@trop
Copy link
Contributor

trop bot commented Aug 8, 2018

The backport process for this PR has been manually initiated, sending your 1's and 0's to "2-1-x" here we go! :D

@trop
Copy link
Contributor

trop bot commented Aug 8, 2018

An error occurred while attempting to backport this PR to "2-1-x", you will need to perform this backport manually

@ckerr
Copy link
Member

ckerr commented Aug 8, 2018

Oop. My first guess is this failed because #13986 needed to be merged first.. let's try again.

@ckerr
Copy link
Member

ckerr commented Aug 8, 2018

/trop run backport-to 2-1-x

@trop
Copy link
Contributor

trop bot commented Aug 8, 2018

The backport process for this PR has been manually initiated, sending your 1's and 0's to "2-1-x" here we go! :D

@trop
Copy link
Contributor

trop bot commented Aug 8, 2018

An error occurred while attempting to backport this PR to "2-1-x", you will need to perform this backport manually

@ckerr
Copy link
Member

ckerr commented Aug 8, 2018

Bah.

ckerr pushed a commit that referenced this pull request Aug 9, 2018
@ckerr
Merge PR #13543 from electron/ajm-win7-crash
5298cf7 
Ensure DirectX capturer is supported.
@ckerr ckerr mentioned this pull request Aug 9, 2018
Merged
ckerr added a commit that referenced this pull request Aug 9, 2018
@ckerr
fix: Ensure DirectX capturer is supported (#13993)
9694cdc 
* Merge PR #13543 from electron/ajm-win7-crash

Ensure DirectX capturer is supported.

* chore: remove unnecessary whitespace change

* refactor: update desktop capturer backport to old content namespace
@ckerr ckerr mentioned this pull request Dec 18, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexeykuzmin alexeykuzmin alexeykuzmin approved these changes

@MarshallOfSound MarshallOfSound MarshallOfSound approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[3.0.0-beta.1] desktopCapturer API is broken on Windows 7
5 participants
@ajmacd @MarshallOfSound @alexeykuzmin @ckerr @jkleinsc