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.

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

libobs: Add Windows X64 Emulation on ARM64 and move Rosetta Detection #7609

Merged

Conversation

tommyvct
Copy link
Contributor

Description

Adds a check that detects if OBS is running on Windows ARM64 emulation and logs the result.

Motivation and Context

#5644
I messed up #5738, this is the new PR.

How Has This Been Tested?

Running X64 OBS Studio gives the following log:

Windows:

23:10:09.304: CPU Name: Microsoft SQ1 @ 3.0 GHz
23:10:09.305: CPU Speed: 1670MHz
23:10:09.305: Physical Cores: 8, Logical Cores: 8
23:10:09.305: Physical Memory: 7718MB Total, 3202MB Free
23:10:09.305: Windows Version: 10.0 Build 22538 (release: 2009; revision: 1010; ARM 64-bit)
23:10:09.305: Windows ARM64: Running with X64 Emulation
23:10:09.306: Running as administrator: false
23:10:09.307: Aero is Enabled (Aero is always on for windows 8 and above)
23:10:09.307: Windows 10 Gaming Features:
23:10:09.307: 	Game Bar: On
23:10:09.307: 	Game DVR: On
23:10:09.307: 	Game DVR Background Recording: Off
23:10:09.317: Current Date/Time: 2022-01-25, 23:10:09
23:10:09.317: Browser Hardware Acceleration: false
23:10:09.317: Qt Version: 5.15.2 (runtime), 5.15.2 (compiled)
23:10:09.317: Portable mode: false
23:10:10.338: OBS 27.2.0-beta4-23-g026987a2b (64-bit, windows)

macOS:

17:58:05.833: CPU Name: Apple M1 Pro
17:58:05.833: CPU Speed: 2400MHz
17:58:05.833: Physical Cores: 10, Logical Cores: 10
17:58:05.833: Physical Memory: 16384MB Total
17:58:05.833: OS Name: macOS
17:58:05.833: OS Version: Version 12.1 (Build 21C52)
17:58:05.833: Rosetta translation used: true
17:58:05.833: Kernel Version: 21.2.0
17:58:05.842: hotkeys-cocoa: Getting keyboard keys failed
17:58:05.842: hotkeys-cocoa: Using layout 'com.apple.keylayout.Dvorak'
17:58:05.843: Current Date/Time: 2022-01-26, 17:58:05
17:58:05.843: Browser Hardware Acceleration: true
17:58:05.843: Qt Version: 5.15.2 (runtime), 5.15.2 (compiled)
17:58:05.843: Portable mode: false
17:58:05.965: OBS 27.2.0-beta4-23-g026987a2b (mac)

Types of changes

  • New feature (non-breaking change which adds functionality)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@tytan652 tytan652 added the New Feature New feature or plugin label Oct 16, 2022
@tytan652 tytan652 added this to the OBS Studio 29.0 milestone Oct 16, 2022
@tommyvct tommyvct force-pushed the windows-arm64-emulation-detection branch from 00721fe to 5c6b349 Compare October 16, 2022 12:28
libobs/obs-cocoa.m Outdated Show resolved Hide resolved
@tommyvct tommyvct force-pushed the windows-arm64-emulation-detection branch from 5c6b349 to 1739eef Compare October 16, 2022 12:34
@tommyvct tommyvct mentioned this pull request Oct 18, 2022
19 tasks
libobs/util/platform-windows.c Outdated Show resolved Hide resolved
libobs/util/platform-windows.c Outdated Show resolved Hide resolved
libobs/util/platform-windows.c Outdated Show resolved Hide resolved
@tommyvct tommyvct force-pushed the windows-arm64-emulation-detection branch from 1739eef to 996e748 Compare October 21, 2022 23:39
@tommyvct tommyvct force-pushed the windows-arm64-emulation-detection branch from 996e748 to 80b9639 Compare October 22, 2022 02:25
@jp9000 jp9000 merged commit 1adb984 into obsproject:master Nov 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
New Feature New feature or plugin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants