diff --git a/app/streaming/video/ffmpeg-renderers/vt_avsamplelayer.mm b/app/streaming/video/ffmpeg-renderers/vt_avsamplelayer.mm index 83bf4494..24584527 100644 --- a/app/streaming/video/ffmpeg-renderers/vt_avsamplelayer.mm +++ b/app/streaming/video/ffmpeg-renderers/vt_avsamplelayer.mm @@ -303,12 +303,7 @@ public: case COLORSPACE_REC_2020: // This is necessary to ensure HDR works properly with external displays on macOS Sonoma. if (frame->color_trc == AVCOL_TRC_SMPTE2084) { - if (@available(macOS 11.0, *)) { - m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2100_PQ); - } - else { - m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020); - } + m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2100_PQ); } else { m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020); diff --git a/app/streaming/video/ffmpeg-renderers/vt_base.mm b/app/streaming/video/ffmpeg-renderers/vt_base.mm index e3b928f8..0035394b 100644 --- a/app/streaming/video/ffmpeg-renderers/vt_base.mm +++ b/app/streaming/video/ffmpeg-renderers/vt_base.mm @@ -58,7 +58,6 @@ bool VTBaseRenderer::checkDecoderCapabilities(id device, PDECODER_PAR } } else if (params->videoFormat & VIDEO_FORMAT_MASK_AV1) { - #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000 if (!VTIsHardwareDecodeSupported(kCMVideoCodecType_AV1)) { SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "No HW accelerated AV1 decode via VT"); @@ -67,11 +66,6 @@ bool VTBaseRenderer::checkDecoderCapabilities(id device, PDECODER_PAR // 10-bit is part of the Main profile for AV1, so it will always // 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; diff --git a/app/streaming/video/ffmpeg-renderers/vt_metal.mm b/app/streaming/video/ffmpeg-renderers/vt_metal.mm index b5172ba6..9933eca3 100644 --- a/app/streaming/video/ffmpeg-renderers/vt_metal.mm +++ b/app/streaming/video/ffmpeg-renderers/vt_metal.mm @@ -525,33 +525,27 @@ public: return nullptr; } - if (@available(macOS 11.0, *)) { - NSArray> *devices = [MTLCopyAllDevices() autorelease]; - if (devices.count == 0) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, - "No Metal device found!"); - return nullptr; - } + NSArray> *devices = [MTLCopyAllDevices() autorelease]; + if (devices.count == 0) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, + "No Metal device found!"); + return nullptr; + } - for (id device in devices) { - if (device.isLowPower || device.hasUnifiedMemory) { - return device; - } + for (id device in devices) { + if (device.isLowPower || device.hasUnifiedMemory) { + return device; } + } - if (qgetenv("VT_FORCE_METAL") == "1") { - SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, - "Using Metal renderer due to VT_FORCE_METAL=1 override."); - 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."); - } + if (qgetenv("VT_FORCE_METAL") == "1") { + SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, + "Using Metal renderer due to VT_FORCE_METAL=1 override."); + return [MTLCreateSystemDefaultDevice() autorelease]; } else { 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;