1 files changed, 57 insertions, 12 deletions

diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift
index 9f32ed651f..b2910dba85 100644
--- a/video/out/cocoa_cb_common.swift
+++ b/video/out/cocoa_cb_common.swift
@@ -87,8 +87,7 @@ class CocoaCB: Common, EventSubscriber {
     }
 
     func updateWindowSize(_ vo: UnsafeMutablePointer<vo>) {
-        guard let targetScreen = getTargetScreen(forFullscreen: false) ?? NSScreen.main else
-        {
+        guard let targetScreen = getTargetScreen(forFullscreen: false) ?? NSScreen.main else {
             log.warning("Couldn't update Window size, no Screen available")
             return
         }
@@ -102,11 +101,10 @@ class CocoaCB: Common, EventSubscriber {
     }
 
     override func displayLinkCallback(_ displayLink: CVDisplayLink,
-                                            _ inNow: UnsafePointer<CVTimeStamp>,
-                                     _ inOutputTime: UnsafePointer<CVTimeStamp>,
-                                          _ flagsIn: CVOptionFlags,
-                                         _ flagsOut: UnsafeMutablePointer<CVOptionFlags>) -> CVReturn
-    {
+                                      _ inNow: UnsafePointer<CVTimeStamp>,
+                                      _ inOutputTime: UnsafePointer<CVTimeStamp>,
+                                      _ flagsIn: CVOptionFlags,
+                                      _ flagsOut: UnsafeMutablePointer<CVOptionFlags>) -> CVReturn {
         libmpv.reportRenderFlip()
         return kCVReturnSuccess
     }
@@ -122,7 +120,55 @@ class CocoaCB: Common, EventSubscriber {
         }
 
         libmpv.setRenderICCProfile(colorSpace)
-        layer?.colorspace = colorSpace.cgColorSpace
+        layer?.colorspace = getColorSpace()
+    }
+
+    func getColorSpace() -> CGColorSpace? {
+        guard let colorSpace = window?.screen?.colorSpace?.cgColorSpace else {
+            log.warning("Couldn't retrieve ICC Profile, no color space available")
+            return nil
+        }
+
+        let outputCsp = Int(option.mac.cocoa_cb_output_csp)
+
+        switch outputCsp {
+        case MAC_CSP_AUTO: return colorSpace
+        case MAC_CSP_DISPLAY_P3: return CGColorSpace(name: CGColorSpace.displayP3)
+        case MAC_CSP_DISPLAY_P3_HLG: return CGColorSpace(name: CGColorSpace.displayP3_HLG)
+        case MAC_CSP_DISPLAY_P3_PQ: return CGColorSpace(name: CGColorSpace.displayP3_PQ)
+        case MAC_CSP_DCI_P3: return CGColorSpace(name: CGColorSpace.dcip3)
+        case MAC_CSP_BT_2020: return CGColorSpace(name: CGColorSpace.itur_2020)
+        case MAC_CSP_BT_709: return CGColorSpace(name: CGColorSpace.itur_709)
+        case MAC_CSP_SRGB: return CGColorSpace(name: CGColorSpace.sRGB)
+        case MAC_CSP_SRGB_LINEAR: return CGColorSpace(name: CGColorSpace.linearSRGB)
+        case MAC_CSP_RGB_LINEAR: return CGColorSpace(name: CGColorSpace.genericRGBLinear)
+        case MAC_CSP_ADOBE: return CGColorSpace(name: CGColorSpace.adobeRGB1998)
+        default: break
+        }
+
+#if HAVE_MACOS_11_FEATURES
+        if #available(macOS 11.0, *) {
+            switch outputCsp {
+            case MAC_CSP_BT_2100_HLG: return CGColorSpace(name: CGColorSpace.itur_2100_HLG)
+            case MAC_CSP_BT_2100_PQ: return CGColorSpace(name: CGColorSpace.itur_2100_PQ)
+            default: break
+            }
+        }
+#endif
+
+#if HAVE_MACOS_12_FEATURES
+        if #available(macOS 12.0, *) {
+            switch outputCsp {
+            case MAC_CSP_DISPLAY_P3_LINEAR: return CGColorSpace(name: CGColorSpace.linearDisplayP3)
+            case MAC_CSP_BT_2020_LINEAR: return CGColorSpace(name: CGColorSpace.linearITUR_2020)
+            default: break
+            }
+        }
+#endif
+
+        log.warning("Couldn't retrieve configured color space, falling back to auto")
+
+        return colorSpace
     }
 
     override func windowDidEndAnimation() {
@@ -178,10 +224,9 @@ class CocoaCB: Common, EventSubscriber {
     }
 
     override func control(_ vo: UnsafeMutablePointer<vo>,
-                    events: UnsafeMutablePointer<Int32>,
-                    request: UInt32,
-                    data: UnsafeMutableRawPointer?) -> Int32
-    {
+                          events: UnsafeMutablePointer<Int32>,
+                          request: UInt32,
+                          data: UnsafeMutableRawPointer?) -> Int32 {
         switch mp_voctrl(request) {
         case VOCTRL_PREINIT:
             DispatchQueue.main.sync { self.preinit(vo) }