moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-02-16 02:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use CAMetalDisplayLink on Intel Macs

Browse Source 
When in Direct mode, skipping a frame will cause the display to flash black on Tahoe.
This commit is contained in:
Cameron Gutman
2025-10-23 21:16:53 -05:00
parent 57db20016a
commit ccaca68570
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/streaming/video/ffmpeg-renderers/vt.h
View File

@@ -12,6 +12,8 @@ public:
void setHdrMode(bool enabled) override;
protected:
bool isAppleSilicon();
bool m_HdrMetadataChanged; // Manual reset
CFDataRef m_MasteringDisplayColorVolume;
CFDataRef m_ContentLightLevelInfo;

21
app/streaming/video/ffmpeg-renderers/vt_avsamplelayer.mm
View File

@@ -10,8 +10,6 @@
#include <streaming/session.h>
#include <mach/mach_time.h>
#include <mach/machine.h>
#include <sys/sysctl.h>
#import <Cocoa/Cocoa.h>
#import <VideoToolbox/VideoToolbox.h>
#import <AVFoundation/AVFoundation.h>
@@ -325,23 +323,6 @@ public:
return false;
}
bool isAppleSilicon = false;
{
uint32_t cpuType;
size_t size = sizeof(cpuType);
err = sysctlbyname("hw.cputype", &cpuType, &size, NULL, 0);
if (err == 0) {
// Apple Silicon Macs have CPU_ARCH_ABI64 set, so we need to mask that off.
// For some reason, 64-bit Intel Macs don't seem to have CPU_ARCH_ABI64 set.
isAppleSilicon = (cpuType & ~CPU_ARCH_MASK) == CPU_TYPE_ARM;
}
else {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
"sysctlbyname(hw.cputype) failed: %d", err);
}
}
if (qgetenv("VT_FORCE_INDIRECT") == "1") {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Using indirect rendering due to environment variable");
@@ -385,7 +366,7 @@ public:
//
// https://github.com/moonlight-stream/moonlight-qt/issues/493
// https://github.com/moonlight-stream/moonlight-qt/issues/722
if (isAppleSilicon && !(params->videoFormat & VIDEO_FORMAT_MASK_10BIT)) {
if (isAppleSilicon() && !(params->videoFormat & VIDEO_FORMAT_MASK_10BIT)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Using layer rasterization workaround");
if (info.info.cocoa.window.screen != nullptr) {

20
app/streaming/video/ffmpeg-renderers/vt_base.mm
View File

@@ -9,6 +9,9 @@
#import <AVFoundation/AVFoundation.h>
#import <Metal/Metal.h>
#include <mach/machine.h>
#include <sys/sysctl.h>
VTBaseRenderer::VTBaseRenderer(IFFmpegRenderer::RendererType type) :
IFFmpegRenderer(type),
m_HdrMetadataChanged(false),
@@ -27,6 +30,23 @@ VTBaseRenderer::~VTBaseRenderer() {
}
}
bool VTBaseRenderer::isAppleSilicon() {
static uint32_t cpuType = 0;
if (cpuType == 0) {
size_t size = sizeof(cpuType);
int err = sysctlbyname("hw.cputype", &cpuType, &size, NULL, 0);
if (err != 0) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
"sysctlbyname(hw.cputype) failed: %d", err);
return false;
}
}
// Apple Silicon Macs have CPU_ARCH_ABI64 set, so we need to mask that off.
// For some reason, 64-bit Intel Macs don't seem to have CPU_ARCH_ABI64 set.
return (cpuType & ~CPU_ARCH_MASK) == CPU_TYPE_ARM;
}
bool VTBaseRenderer::checkDecoderCapabilities(id<MTLDevice> device, PDECODER_PARAMETERS params) {
if (params->videoFormat & VIDEO_FORMAT_MASK_H264) {
if (!VTIsHardwareDecodeSupported(kCMVideoCodecType_H264)) {

2
app/streaming/video/ffmpeg-renderers/vt_metal.mm
View File

@@ -828,7 +828,7 @@ public:
void startDisplayLink()
{
if (@available(macOS 14, *)) {
if (m_MetalDisplayLink != nullptr || !m_MetalLayer.displaySyncEnabled) {
if (m_MetalDisplayLink != nullptr || !m_MetalLayer.displaySyncEnabled || !isAppleSilicon()) {
return;
}