From f8aafb7ce45715d27d764719633282776108b9bc Mon Sep 17 00:00:00 2001 From: Carter Li Date: Wed, 4 Oct 2023 00:28:49 +0800 Subject: [PATCH] Monitor (macOS): better intel platform support --- src/detection/monitor/monitor_apple.m | 166 +++++++++----------------- 1 file changed, 54 insertions(+), 112 deletions(-) diff --git a/src/detection/monitor/monitor_apple.m b/src/detection/monitor/monitor_apple.m index 8f931a98d..9d9ceb4bc 100644 --- a/src/detection/monitor/monitor_apple.m +++ b/src/detection/monitor/monitor_apple.m @@ -9,131 +9,73 @@ extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID display) __attribute__((weak_import)); -static const char* detectWithDisplayServices(const FFDisplayServerResult* displayServer, FFlist* results) +static bool detectHdrSupportWithNSScreen(FFDisplayResult* display) { - if(!CoreDisplay_DisplayCreateInfoDictionary) return "CoreDisplay_DisplayCreateInfoDictionary is not available"; - - FF_LIST_FOR_EACH(FFDisplayResult, display, displayServer->displays) + NSScreen* mainScreen = NSScreen.mainScreen; + if (display->primary) + return mainScreen.maximumPotentialExtendedDynamicRangeColorComponentValue > 1; + else { - if (display->type == FF_DISPLAY_TYPE_BUILTIN) + for (NSScreen* screen in NSScreen.screens) { - CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_DisplayCreateInfoDictionary((CGDirectDisplayID) display->id); - if(displayInfo) + if (screen == mainScreen) continue; + NSNumber* screenNumber = [screen.deviceDescription valueForKey:@"NSScreenNumber"]; + if (screenNumber && screenNumber.longValue == (long) display->id) { - int width, height; - if (ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelWidth"), &width) || // Default resolution (limited by connectors, GPUs, etc.) - ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelHeight"), &height) || - width <= 0 || height <= 0) - continue; - - FFMonitorResult* monitor = (FFMonitorResult*) ffListAdd(results); - monitor->width = (uint32_t) width; - monitor->height = (uint32_t) height; - ffStrbufInitCopy(&monitor->name, &display->name); - - CGSize size = CGDisplayScreenSize((CGDirectDisplayID) display->id); - monitor->physicalWidth = (uint32_t) (size.width + 0.5); - monitor->physicalHeight = (uint32_t) (size.height + 0.5); - monitor->hdrCompatible = false; - - if (CFDictionaryContainsKey(displayInfo, CFSTR("ReferencePeakHDRLuminance"))) - monitor->hdrCompatible = true; - else - { - NSScreen* mainScreen = NSScreen.mainScreen; - if (display->primary) - monitor->hdrCompatible = mainScreen.maximumPotentialExtendedDynamicRangeColorComponentValue > 1; - else - { - for (NSScreen* screen in NSScreen.screens) - { - if (screen == mainScreen) continue; - NSNumber* screenNumber = [screen.deviceDescription valueForKey:@"NSScreenNumber"]; - if (screenNumber && screenNumber.longValue == (long) display->id) - { - monitor->hdrCompatible = screen.maximumPotentialExtendedDynamicRangeColorComponentValue > 1; - break; - } - } - continue; - } - } + return screen.maximumPotentialExtendedDynamicRangeColorComponentValue > 1; } } } - return NULL; -} - -static const char* detectWithDdcci(FFlist* results) -{ - if (!IOAVServiceCreate || !IOAVServiceReadI2C) - return "IOAVService is not available"; - - CFMutableDictionaryRef matchDict = IOServiceMatching("DCPAVServiceProxy"); - if (matchDict == NULL) - return "IOServiceMatching(\"DCPAVServiceProxy\") failed"; - - io_iterator_t iterator; - if(IOServiceGetMatchingServices(MACH_PORT_NULL, matchDict, &iterator) != kIOReturnSuccess) - return "IOServiceGetMatchingServices() failed"; - - FF_STRBUF_AUTO_DESTROY location = ffStrbufCreate(); - - io_registry_entry_t registryEntry; - while((registryEntry = IOIteratorNext(iterator)) != 0) - { - CFMutableDictionaryRef properties; - if(IORegistryEntryCreateCFProperties(registryEntry, &properties, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess) - { - IOObjectRelease(registryEntry); - continue; - } - - ffStrbufClear(&location); - if(ffCfDictGetString(properties, CFSTR("Location"), &location) || ffStrbufEqualS(&location, "Embedded")) - { - // Builtin display should be handled by DisplayServices - IOObjectRelease(registryEntry); - continue; - } - - FF_CFTYPE_AUTO_RELEASE IOAVServiceRef service = IOAVServiceCreateWithService(kCFAllocatorDefault, (io_service_t) registryEntry); - IOObjectRelease(registryEntry); - - if (!service) continue; - - FF_CFTYPE_AUTO_RELEASE CFDataRef edid = NULL; - if (IOAVServiceCopyEDID(service, &edid) != KERN_SUCCESS) - continue; - - uint32_t edidLength = (uint32_t) CFDataGetLength(edid); - if (edidLength == 0 || edidLength % 128 != 0) - continue; - - uint32_t width, height; - const uint8_t* edidData = CFDataGetBytePtr(edid); - - ffEdidGetPhysicalResolution(edidData, &width, &height); - if (width == 0 || height == 0) continue; - - FFMonitorResult* display = (FFMonitorResult*) ffListAdd(results); - display->width = width; - display->height = height; - ffStrbufInit(&display->name); - ffEdidGetName(edidData, &display->name); - ffEdidGetPhysicalSize(edidData, &display->physicalWidth, &display->physicalHeight); - display->hdrCompatible = ffEdidGetHdrCompatible(edidData, edidLength); - } - return NULL; + return false; } const char* ffDetectMonitor(FFlist* results) { + if(!CoreDisplay_DisplayCreateInfoDictionary) return "CoreDisplay_DisplayCreateInfoDictionary is not available"; + const FFDisplayServerResult* displayServer = ffConnectDisplayServer(); - detectWithDisplayServices(displayServer, results); + FF_LIST_FOR_EACH(FFDisplayResult, display, displayServer->displays) + { + CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_DisplayCreateInfoDictionary((CGDirectDisplayID) display->id); + if(!displayInfo) continue; + + uint8_t edidData[128] = {}; + uint32_t edidLength = 0; + if (false || !ffCfDictGetData(displayInfo, CFSTR("IODisplayEDID"), 0, sizeof(edidData), edidData, &edidLength)) + { + uint32_t width, height; + ffEdidGetPhysicalResolution(edidData, &width, &height); + if (width > 0 && height > 0) + { + FFMonitorResult* monitor = (FFMonitorResult*) ffListAdd(results); + ffStrbufInitCopy(&monitor->name, &display->name); + monitor->width = width; + monitor->height = height; + ffEdidGetPhysicalSize(edidData, &monitor->physicalWidth, &monitor->physicalHeight); + monitor->hdrCompatible = CFDictionaryContainsKey(displayInfo, CFSTR("ReferencePeakHDRLuminance")) || + detectHdrSupportWithNSScreen(display); + continue; + } + } + + int width, height; + if (ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelWidth"), &width) || // Default resolution (limited by connectors, GPUs, etc.) + ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelHeight"), &height) || + width <= 0 || height <= 0) + continue; + + FFMonitorResult* monitor = (FFMonitorResult*) ffListAdd(results); + monitor->width = (uint32_t) width; + monitor->height = (uint32_t) height; + ffStrbufInitCopy(&monitor->name, &display->name); + + CGSize size = CGDisplayScreenSize((CGDirectDisplayID) display->id); + monitor->physicalWidth = (uint32_t) (size.width + 0.5); + monitor->physicalHeight = (uint32_t) (size.height + 0.5); + monitor->hdrCompatible = CFDictionaryContainsKey(displayInfo, CFSTR("ReferencePeakHDRLuminance")) || + detectHdrSupportWithNSScreen(display); + } - if (displayServer->displays.length > results->length) - detectWithDdcci(results); return NULL; }