moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-08-16 16:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove guards for older macOS and SDK versions

Browse Source
This commit is contained in:
Cameron Gutman 2024-07-26 00:38:54 -05:00
parent e548697a36
commit eb6d16fdcf
3 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,12 +303,7 @@ public:
case COLORSPACE_REC_2020: case COLORSPACE_REC_2020:
// This is necessary to ensure HDR works properly with external displays on macOS Sonoma. // This is necessary to ensure HDR works properly with external displays on macOS Sonoma.
if (frame->color_trc == AVCOL_TRC_SMPTE2084) { if (frame->color_trc == AVCOL_TRC_SMPTE2084) {
if (@available(macOS 11.0, *)) { m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2100_PQ);
m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2100_PQ);
}
else {
m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020);
}
} }
else { else {
m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020); m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020);

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

@ -58,7 +58,6 @@ bool VTBaseRenderer::checkDecoderCapabilities(id<MTLDevice> device, PDECODER_PAR
} }
} }
else if (params->videoFormat & VIDEO_FORMAT_MASK_AV1) { else if (params->videoFormat & VIDEO_FORMAT_MASK_AV1) {
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
if (!VTIsHardwareDecodeSupported(kCMVideoCodecType_AV1)) { if (!VTIsHardwareDecodeSupported(kCMVideoCodecType_AV1)) {
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
"No HW accelerated AV1 decode via VT"); "No HW accelerated AV1 decode via VT");
@ -67,11 +66,6 @@ bool VTBaseRenderer::checkDecoderCapabilities(id<MTLDevice> device, PDECODER_PAR
// 10-bit is part of the Main profile for AV1, so it will always // 10-bit is part of the Main profile for AV1, so it will always
// be present on hardware that supports 8-bit. // be present on hardware that supports 8-bit.
#else
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
"AV1 requires building with Xcode 14 or later");
return false;
#endif
} }
return true; return true;

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

@ -525,33 +525,27 @@ public:
return nullptr; return nullptr;
} }
if (@available(macOS 11.0, *)) { NSArray<id<MTLDevice>> *devices = [MTLCopyAllDevices() autorelease];
NSArray<id<MTLDevice>> *devices = [MTLCopyAllDevices() autorelease]; if (devices.count == 0) {
if (devices.count == 0) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "No Metal device found!");
"No Metal device found!"); return nullptr;
return nullptr; }
}
for (id<MTLDevice> device in devices) { for (id<MTLDevice> device in devices) {
if (device.isLowPower || device.hasUnifiedMemory) { if (device.isLowPower || device.hasUnifiedMemory) {
return device; return device;
}
} }
}
if (qgetenv("VT_FORCE_METAL") == "1") { if (qgetenv("VT_FORCE_METAL") == "1") {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Using Metal renderer due to VT_FORCE_METAL=1 override."); "Using Metal renderer due to VT_FORCE_METAL=1 override.");
return [MTLCreateSystemDefaultDevice() autorelease]; return [MTLCreateSystemDefaultDevice() autorelease];
}
else {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Avoiding Metal renderer due to use of dGPU/eGPU. Use VT_FORCE_METAL=1 to override.");
}
} }
else { else {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Metal renderer requires macOS Big Sur or later"); "Avoiding Metal renderer due to use of dGPU/eGPU. Use VT_FORCE_METAL=1 to override.");
} }
return nullptr; return nullptr;