cocoa-cb: add support for macOS color space transformation (EDR/HDR) #14017

Akemi · 2024-04-28T18:30:01Z

up to date version of #8485, with some added new colour spaces. also only for cocoa-cb since it's not necessary for the macvk vulkan backend or rather would break it.

this will most likely be the last new feature for the cocoa-cb/libmpv/opengl backend from me. just wanted to add this already done feature that was resting for years.

it might come in handy for future backends though.

Fixes #7341

github-actions · 2024-04-28T21:17:25Z

Download the artifacts for this pull request:

Windows

macOS

Akemi · 2024-04-28T21:52:15Z

on macOS 12 + Xcode 13.1 + SDK 12. can't find 2 of the 4 colour spaces introduced in 12.0, indicating an SDK problem
❌ https://developer.apple.com/documentation/coregraphics/cgcolorspace/4010583-itur_709_hlg
❌ https://developer.apple.com/documentation/coregraphics/cgcolorspace/3892091-itur_709_pq
✅ https://developer.apple.com/documentation/coregraphics/cgcolorspace/3867016-lineardisplayp3
✅ https://developer.apple.com/documentation/coregraphics/cgcolorspace/3867017-linearitur_2020

Message: Detected macOS sdk path: /Applications/Xcode_13.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk
Message: Detected macOS SDK: 12.0

--------------------------------------------------------------------------------------

../video/out/cocoa_cb_common.swift:164:79: error: type 'CGColorSpace' has no member 'itur_709_HLG'
            case MAC_CSP_ITUR_709_HLG: return CGColorSpace(name: CGColorSpace.itur_709_HLG)
                                                                 ~~~~~~~~~~~~ ^~~~~~~~~~~~
../video/out/cocoa_cb_common.swift:165:78: error: type 'CGColorSpace' has no member 'itur_709_PQ'
            case MAC_CSP_ITUR_709_PQ: return CGColorSpace(name: CGColorSpace.itur_709_PQ)
                                                                ~~~~~~~~~~~~ ^~~~~~~~~~~

on macOS 12 + Xcode 14.2 + SDK 13.1. no building problems but following runtime error, indicating a general problem with those two new colour spaces and macOS 12 + CoreGraphic (framework version 12)

Message: Detected macOS sdk path: /Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk
Message: Detected macOS SDK: 13.1

--------------------------------------------------------------------------------------

dyld[8493]: Symbol not found: (_kCGColorSpaceITUR_709_HLG)
  Referenced from: '/Users/runner/work/mpv/mpv/build/mpv'
  Expected in: '/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics'
./ci/build-macos.sh: line 25:  8493 Abort trap: 6           ./build/mpv -v --no-config

on macOS 13 + Xcode 14.2 + SDK 13.1 (same setup as second test), there are no problems regarding those colour spaces, indicating a problem with macOS 12 as a platform.

removing the two affected colour spaces on macOS 12 + Xcode 14.2 + SDK 13.1 shields no problems.

TLDR macOS 12 has a CoreGraphics framework issue, macOS SDK 12 is broken for those two colour spaces. the latest SDK available on macOS 12 is SDK 13, that fixes the build problems but not the runtime crash. is fixed with SDK 13 and macOS 13. to fix this, we can't just guard those two colour spaces with a build time and runtime check for macOS+SDK 13, since the symbol not found crash will still occur. for now i will just remove those two (undocumented) colour spaces.

i had similar issues with colour spaces introduced in macOS 10.14.6.

build tests for reference:
https://github.com/mpv-player/mpv/actions/runs/8870240999/job/24351805621?pr=14017
https://github.com/mpv-player/mpv/actions/runs/8870240999/job/24351805695?pr=14017
https://github.com/mpv-player/mpv/actions/runs/8870555909/job/24352474494?pr=14017

DOCS/man/options.rst

KTamas · 2024-04-29T11:15:32Z

oh my god I'm so excited about this one

meson.build

osdep/mac/app_bridge.h

DOCS/man/options.rst

kasper93

Not tested, but looks ok.

KTamas · 2024-05-01T17:20:08Z

Not sure this is working? Compiled this version just now. FIle is proven to be a proper HDR video when remuxed to MP4 for QuickTime, I use it as my test file for ages, It is streamed from the internet, my config is below. Works with IINA although IINA's HDR colors are completely wrong and way too dark compared to QuickTime.

Pretty sure video doesn't activate HDR (I'd see the brightness change) on the other hand it does look way too dark the same way IINA does.

M1 Pro mac, built-in display.

macos-fs-animation-duration=0
ontop
ontop-level=window
window-scale=0.3
demuxer-max-bytes=4096MiB
demuxer-max-back-bytes=2048MiB
screenshot-format=jpg
screenshot-high-bit-depth=no
screenshot-directory=/Users/redacted/Desktop
save-position-on-quit
screenshot-tag-colorspace=yes
profile=fast

Akemi · 2024-05-01T17:40:09Z

this is for cocoa-cb/libmpv and not vo=gpu(-next). you are using the macvk backend.

also only for cocoa-cb since it's not necessary for the macvk vulkan backend or rather would break it.

[edit]
macvk already supports this automatically with --target-colorspace-hint.

KTamas · 2024-05-01T18:20:34Z

Right, my bad. Forced it to libmpv, however HDR is still not activated? Maybe I'm still doing something wrong. It's more apparent to the eyes but this is a screenshot with IINA on the left and MPV on the right, and even the screenshot shows the brightness difference.

Akemi · 2024-05-01T19:33:31Z

i am not sure how i should help you? you neither provide a log nor did you tell us what options you used for testing. if you expect HDR to work automatically, then that's now what this does. you have to manually specify the right csp like mentioned.

eko5624 · 2024-05-01T22:15:23Z

I want to test on my intel macbookpro 2017, what's the right csp? How to write mpv.conf, just like:

vo=libmpv
cocoa-cb-output-csp=?
target-trc=?
target-prim=?

Akemi · 2024-05-01T23:00:48Z

i can't really tell. it depends on your hardware and display characteristics. though that is mentioned in the documentation.

also this PR is probably the wrong place for discussing this. you should rather open a discussion.

KTamas · 2024-05-02T09:49:00Z

fwiw I managed to get some HDR working by playing around with those parameters (it looked wrong, but it was HDR), so in that sense I can confirm it working. Appreciate the help.

Akemi · 2024-05-05T16:47:53Z

i tested it some more on my TV and it also seems to work properly when setup/configured correctly.

i might write up something in the wiki how to configure everything correctly in the future. though still need to test quite a lot still.

by default utilises the color space of the screen on which the window is located. if a specific value is defined, it will instead be utilised. depending on the chosen color space the macOS EDR (HDR) support is activated and that OS's transformation (tone mapping) is used. Fixes mpv-player#7341

This was referenced Apr 28, 2024

utilise macOS HDR/EDR functionality #7341

Closed

[WIP] mac: add support to set color space for layer and macOS transformation (EDR/HDR) #8485

Closed

Akemi force-pushed the cocoa_cb_hdr branch 2 times, most recently from e2952e3 to 0f19c67 Compare April 28, 2024 19:35

Akemi force-pushed the cocoa_cb_hdr branch 2 times, most recently from 271285c to a1db286 Compare April 28, 2024 21:34

Akemi force-pushed the cocoa_cb_hdr branch from a1db286 to 155e6be Compare April 28, 2024 21:54

kasper93 reviewed Apr 28, 2024

View reviewed changes

DOCS/man/options.rst Outdated Show resolved Hide resolved

Akemi force-pushed the cocoa_cb_hdr branch from 155e6be to 5a8e329 Compare April 28, 2024 22:07

kasper93 reviewed May 1, 2024

View reviewed changes

meson.build Show resolved Hide resolved

kasper93 reviewed May 1, 2024

View reviewed changes

osdep/mac/app_bridge.h Show resolved Hide resolved

kasper93 reviewed May 1, 2024

View reviewed changes

DOCS/man/options.rst Outdated Show resolved Hide resolved

kasper93 reviewed May 1, 2024

View reviewed changes

DOCS/man/options.rst Outdated Show resolved Hide resolved

kasper93 added this to the Release v0.39.0 milestone May 1, 2024

Akemi force-pushed the cocoa_cb_hdr branch from 5a8e329 to f776be6 Compare May 1, 2024 15:52

kasper93 approved these changes May 1, 2024

View reviewed changes

Akemi force-pushed the cocoa_cb_hdr branch from f776be6 to 9530c25 Compare May 5, 2024 16:55

Akemi merged commit 8a61929 into mpv-player:master May 5, 2024
17 checks passed

Akemi deleted the cocoa_cb_hdr branch May 5, 2024 17:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cocoa-cb: add support for macOS color space transformation (EDR/HDR) #14017

cocoa-cb: add support for macOS color space transformation (EDR/HDR) #14017

Akemi commented Apr 28, 2024

github-actions bot commented Apr 28, 2024 •

edited

Akemi commented Apr 28, 2024 •

edited

KTamas commented Apr 29, 2024

kasper93 left a comment

KTamas commented May 1, 2024 •

edited

Akemi commented May 1, 2024 •

edited

KTamas commented May 1, 2024

Akemi commented May 1, 2024

eko5624 commented May 1, 2024

Akemi commented May 1, 2024 •

edited

KTamas commented May 2, 2024

Akemi commented May 5, 2024

cocoa-cb: add support for macOS color space transformation (EDR/HDR) #14017

cocoa-cb: add support for macOS color space transformation (EDR/HDR) #14017

Conversation

Akemi commented Apr 28, 2024

github-actions bot commented Apr 28, 2024 • edited

Akemi commented Apr 28, 2024 • edited

KTamas commented Apr 29, 2024

kasper93 left a comment

Choose a reason for hiding this comment

KTamas commented May 1, 2024 • edited

Akemi commented May 1, 2024 • edited

KTamas commented May 1, 2024

Akemi commented May 1, 2024

eko5624 commented May 1, 2024

Akemi commented May 1, 2024 • edited

KTamas commented May 2, 2024

Akemi commented May 5, 2024

github-actions bot commented Apr 28, 2024 •

edited

Akemi commented Apr 28, 2024 •

edited

KTamas commented May 1, 2024 •

edited

Akemi commented May 1, 2024 •

edited

Akemi commented May 1, 2024 •

edited