mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-10-14 23:34:01 -04:00
* feat(display): per-output ICC color profiles and color temperature Rebuild of #3388 on current master: the previous branch was cut from an older base and reverted unrelated fixes in the gamma stack and the display settings UI. ICC profiles: - core/internal/icc: ICC v2/v4 parser (TRC, LUT8/16 and parametric curves, vcgt, description/version/color space) plus gamma ramp generation, with synthetic coverage and optional vendor-profile tests (ICC_TEST_DIR). - wayland manager: load iccProfiles from the compositor's DMS config dir, build the ramp from the profile when one is set (falling back to the temperature ramp when it is missing or unparsable), and re-apply on output hotplug and after resume. - ICC ramps apply while the night light schedule is disabled; outputs without a profile keep an identity ramp. - desc/mluc offsets are validated before slicing, so a malformed profile returns an error instead of panicking the daemon. Per-output temperature: - outputTemps in the same config; SetOutputTemp accepts 1000-10000K and the Display Config slider exposes 3000-10000K, which matters for displays calibrated at a higher white point (e.g. a 7000K profile). Gamma control lifecycle: - needsControls() now keeps the controls alive for configured ICC profiles and per-output temperatures, so toggling the night light off no longer destroys the controls and drops the ramps. - Re-apply paths clear the per-output dedup state instead of adding a manager-level guard, which would have suppressed contrast-only writes and the post-resume forced resend (#1235), and left a recreated control without a ramp. - Monitor sleep/disconnect still re-establishes controls when an output comes back. IPC / CLI / UI: - wayland.icc.{getStatus,apply,remove,listOutputs,setTemp,getTemps} - dms icc list | info <file> | apply <output> <file> | remove <output> | status - Display Config output card gains a Color Profile row (browse/apply/remove with description, version, color space and active state) and a per-output color temperature slider, backed by Services/ICCService.qml. Config path: - DMSConfigDir() follows the compositor layout (niri/dms, hypr/dms, mango/dms) via the shared compositor detection and utils.XDGConfigHome(), replacing the hardcoded niri path in both the manager and `dms icc`. Tests: TZ=UTC go test ./... (60 packages ok), including red/green coverage for the icc parser bounds checks and needsControls(). * feat(icc): add `dms icc set-temp` and show per-output temps in `status` The per-output temperature override was reachable from the Display Config slider and from `wayland.icc.setTemp` over IPC, but not from the CLI. - `dms icc set-temp <output> <kelvin>` (alias `setTemp`) sets a per-output override, 1000-10000K, and 0 clears it so the output follows the night light schedule again. Range checking matches the daemon so an invalid value fails in the CLI instead of over IPC. - `dms icc status` gains a Temp column (the override in K, or `schedule`), so an override can be verified without opening the settings UI. Verified against a running daemon: `dms icc status` reports 7000K for the three overridden outputs and `schedule` for the remaining one. * feat(icc): treat the per-output temperature as the profile's reference white point The per-output temperature was documented as the white point a profile was produced at, but an output with a profile ignored it entirely: the ramp was generated from the profile and the temperature only applied to outputs without one (or as the fallback when a profile failed to parse). A display calibrated at 7000K therefore got the profile ramp, and enabling the night light had no effect on it at all. - `ProfileRampWithTemp` composes the profile ramp with the ratio between the target temperature ramp and the reference ramp, so the temperature is the white point the profile describes and the night light shifts relative to it. - `applyGamma` passes the night light temperature as the target, and `noTempTarget` when the schedule is disabled, which leaves profiled outputs at their reference white point and drives plain outputs with the neutral ramp. - The re-apply sentinel stays 0, so it cannot collide with an applied temperature. Covered by TestProfileRampWithTemp (reference == target is a no-op, warmer and cooler targets move the expected channels). Also: `dms icc set-temp` help text describes the reference-white-point semantics. * fix(icc): load the configured profiles even when controls already exist Restoring the upstream "output returned, re-establishing controls" branch made the registry handler establish the gamma controls before the startup post runs, and that post returned early on `m.controlsInitialized`, so the configured ICC profiles and per-output temperatures were never attached: every output reported "(none)" and the night light ran with defaults until the user re-applied a profile by hand. - `initializeControlsAndICC` (the startup post) loads the configuration first and only creates the controls when they are missing. - The loading is split into `loadConfiguredICC` / `applyConfiguredICCForOutput` so it can also run per output. - A hotplugged output now gets its configured profile and temperature as soon as its name is known (name handler) or when its control is created, which also makes the "re-applies on hotplug" claim in the description true. - After attaching, the output's dedup state is cleared so the ramp is written. Covered by TestManager_LoadConfiguredICCWhenControlsAlreadyExist and TestManager_AttachConfiguredICCForNamedOutput. * fix(icc): make the per-output temperature an actual target The per-output value was treated as the white point a profile was produced at, which meant a display with a profile never changed when the user set a temperature: the profile ramp was applied as measured and the value only mattered when a night light target existed. Per-display temperatures were therefore unusable on profiled outputs while the night light was disabled, which is the normal state for users who want each monitor at its own value. - `effectiveTempTarget` decides per output: a per-output override wins over the night light schedule, the schedule applies when there is no override, and `noTempTarget` means neither. `0` is "no override", not 0K. - `applyGamma` composes the override on top of the profile ramp, treating the profile as measured at 6500K (D65), and drives outputs without a profile with the same target so both paths agree. - `dms icc set-temp` help text and the Display Config slider description go back to describing an independent per-output temperature. Covered by TestEffectiveTempTarget (override wins, schedule fallback, none) and the updated TestProfileRampWithTemp (7000K cools, 5000K warms relative to the 6500K reference). * feat(icc): show the profile details in Display Config The profile row only showed the description, so there was no way to tell which profile a display actually has applied (whitepoint, curve type, file provenance) without leaving the settings page. - `ICCStatus` carries the descriptive metadata: class, tone-curve kind (plus gamma or table size), vcgt channels/entries, white point chromaticity with a derived CCT and standard illuminant name, file size and mtime. - `internal/icc` gains `WhitePointXY`, `WhitePointCCT` (McCamy), `WhitePointName` (D50/D65) and `TRCKind`, all covered by tests. - Display Config's Color Profile row gets an info button that opens `ICCProfileInfoModal` with those fields and the profile path, alongside the existing browse/remove actions. - `dms icc info` reports the white point as name/xy/CCT instead of raw XYZ. * fix(icc): keep the daemon, the state snapshot and the temp slider honest A malformed profile could still take the daemon down, the ICC getters ran off the wayland actor goroutine, the pushed state hid a removal, and the per-output temperature slider dropped wheel changes. - `internal/icc`: the tag table was sized with `uint32` arithmetic, so `tagCount*12` wrapped (`0x15555556*12 == 8`) and a 140-byte profile passed the bounds check, allocated ~4.3 GB and then panicked. `ParseFile` runs on the wayland actor goroutine, which has no `recover()`, so a bad profile persisted in `wayland.json` took the daemon down at startup. The count is now compared against the bytes that are actually left before anything is sized with it. - The manager publishes an ICC snapshot (`iccStatus`/`iccTemps`) whenever the actor changes an output's profile or temperature, and `GetICCStatus`/ `GetOutputTemps` serve that snapshot instead of ranging `m.outputs` and reading fields the actor owns. That removes the data race reported by `go test -race` for `dms icc status` running against a hotplug, and keeps the per-profile `os.Stat` off the night light animation path, where it ran on every `updateStateFromSchedule` (including each 25 K step). - `State.ICCProfiles`/`OutputTemps` drop `omitempty`, so removing the last profile pushes `{}` instead of omitting the key: the QML truthiness guard then clears `ICCService.status` instead of leaving the removed profile on screen with a green "active" dot. - `removeOutputByRegistryName` (extracted from the registry remove handler) deletes the `outputNames`/`outputRegNames` entries along with the output, so a disconnected monitor stops being listed by `dms icc status`/`listOutputs`, and a rebound `wl_output` reusing the released object ID cannot attach the previous monitor's profile from the stale name. - The per-output temperature slider sets `wheelEnabled: false` like the other drag-finished sliders: `DankSlider`'s wheel handler assigns `value` and emits `sliderValueChanged` without `sliderDragFinished`, so scrolling dropped the change, froze the label on the scrolled value and destroyed the value binding. Covered by TestParseBytesTagTableBounds (allocates 4,299,161,600 bytes at parser.go:138 and dies with an unrecovered fatal error on the previous commit), TestManager_ICCStatusServesPublishedSnapshot, TestManager_RemoveOutputByRegistryNamePrunesNames and TestManager_ICCStatusConcurrentPublishAndRead; a temporary copy of the getter test against the previous commit reports DATA RACE and passes here. * fix(icc): keep the attached profile when a gamma control is re-created `setupOutputControls` stored a fresh `outputState` for every output it touched, and `createControls` calls it whenever the controls are rebuilt, so recreating a control dropped the output's `iccPath`/`iccProfile`/`outputTemp` — configured state that does not belong to the control. The path is dormant today because `destroyControls` only runs when nothing is configured (`needsControls()` covers `ICCProfiles`/`OutputTemps`), but the snapshot published after `createControls` would then report whatever the rebuilt state holds instead of the profile the display is configured with. `controlStateFor` reuses the state of a known output and resets only what belongs to the new control: the ramp bookkeeping and the failure budget (rampSize, failed, retryCount, lastFailTime, lastTemp, lastGamma, lastContrast). A control that has not reported gamma_size yet has to receive its ramp again, while the profile and the per-output temperature survive. An output seen for the first time still starts from a clean state. Covered by TestManager_ControlStateReuseKeepsAttachedICC. * fix(icc): keep the config a real snapshot and make the per-output temperature apply Third review round. - `Config` is copied by value all over the manager, but `ICCProfiles` and `OutputTemps` are maps, so every copy aliased the ones the manager writes under `configMutex`. `updateStateFromSchedule` stored such a copy in `m.state` and it was marshalled on the connection writer goroutine while `ApplyICC` stored a profile from the IPC goroutine (`fatal error: concurrent map iteration and map write`, which no `recover()` catches); `SaveConfig` marshalled its copy after the unlock, and `loadConfiguredICC`/`attachConfiguredICC` indexed the maps after releasing the lock. Every copy that outlives the lock is cloned now (`cloneConfig`/`configSnapshot`), so a value copy is a snapshot again. - `SetOutputTemp` never created the gamma controls. On a default install (night light off, gamma 1.0, contrast 1.0, no profile, no override) they do not exist, so the `Range` over `m.outputs` matched nothing: the value was written to `wayland.json`, no ramp was applied, and the settings slider snapped back to "Default" until a daemon restart. It now persists first, creates the controls through `ensureOutputControls` (shared with `ApplyICC`), and pushes the state from the actor, and the published temperatures report the configured value even before an output is known. - A TRC is not a video card gamma ramp: `rTRC`/`gTRC`/`bTRC` describe the display's own transfer function, so a gamma-2.2 profile was written as `t^(1/2.2)` — mid gray 0.5 became 47909/65535 — washing the display out instead of correcting it. `ApplyICC` refuses a profile without `vcgt`, the attach path skips one with a warning, and `GenerateGammaRamp` returns an error instead of falling back to the TRC or to an identity ramp. TRC stays profile metadata (`dms icc info`, the settings dialog). - `icc: applied ICC ramp` was logged at Info on every 25 K animation step; it is Debug now, which is where a per-step message belongs. - `I18n.tr("No information available")` in the profile info modal passes its translator context, like every other string this PR adds. Covered by TestManager_ConfigSnapshotOwnsItsMaps, TestManager_ConfigSnapshotConcurrentMarshal (the previous commit dies with `fatal error: concurrent map iteration and map write`), TestManager_SetOutputTempWithoutControlsPublishesValue (the previous commit reports 0 for the value it just stored), TestGenerateGammaRampRequiresVCGT, and the updated TestProfileRampWithTemp, whose fixture now carries an identity vcgt table instead of relying on an empty profile. * fix(icc): push the state when only the ICC part changed Found while sweeping the same class of problem: `stateChanged` compared only the schedule fields, so a change that touches nothing else — applying or removing a profile, `dms icc set-temp` — was treated as "no change" and the notifier never pushed it. The settings page then only caught up because the UI path calls `requestStatus()` afterwards, and the CLI path did not catch up at all, which is the symptom the omitempty fix was meant to remove. `iccStateChanged` compares the ICC profile status and the per-output temperatures, so those changes reach the subscribers on their own. Covered by the new TestStateChanged cases (profile applied, profile removed, profile description changed, output temp changed, unchanged ICC state); the four change cases report `stateChanged() = false` on the previous commit. * fix(icc): keep the night light state, prune names without a control, use a 0 sentinel Fifth review round. - `SaveICCConfig` replaces `SaveConfig` on the three ICC paths (apply, remove, set-temp). Writing the daemon's whole config persisted the night light fields it happens to hold in memory: with the night light on, applying a profile stored `"Enabled": true`, and since the shell only ever sends `wayland.gamma.setEnabled` when the mode is on, turning it off afterwards (an in-memory change on the daemon side, no write) left that `true` on disk — after log out/in the daemon came up driving the schedule while the UI showed night mode off, with no way to resync short of a toggle. The ICC save now reads the file and rewrites only `iccProfiles`/`outputTemps`, so the fields the shell owns stay as they are. - `removeOutputByRegistryName` resolved the output from `m.outputs`, which only has entries once the gamma controls exist. On a default install (night light off, no profile, no override) no control is ever created, so a disconnected monitor kept its `outputNames`/`outputRegNames` entries for the life of the daemon: `dms icc status`/`listOutputs` listed monitors that were gone, and both maps grew with every dock/undock cycle. The object ID is resolved from `m.outputRegNames` (populated for every `wl_output`), the name entries are dropped before the output state is looked up, and a state that is known without a registry name still falls back to matching its own. - The Display Config temperature row used `7000` as its fallback for an output with no override. `publishICCState` only copies entries with `temp != 0`, so the value is absent rather than `0` for an unconfigured output: the card claimed "7000K" while the daemon drove the night light or neutral, and a user who deliberately set 7000K got the "no override" colouring because the highlight tested `!== 7000`. The sentinel is `0` now, which is what the `Default` label branches and the "is overridden" tests were written against. Covered by TestSaveICCConfigKeepsNightLightFields (the previous commit brings the night light back on after a restart), TestManager_RemoveOutputByRegistryNameWithoutControl (the previous commit keeps an unplugged monitor listed) and the existing TestManager_RemoveOutputByRegistryNamePrunesNames. * fix(icc): validate the CLI arguments and the IPC parameters of the ICC commands Sweep of the two surfaces the review has not looked at yet, so the failures are found here instead of in the next round. - `dms icc apply` copied the profile into the config directory before asking the daemon, and only the *parse* was checked locally. A profile the daemon refuses (no `vcgt` table, non-RGB color space) was therefore left in the profile directory for `dms icc list` to keep offering, and an IPC failure left the copy behind as well. The command now checks the same rules the daemon enforces before copying anything, and removes the copy it just made when the request fails (a file that was already there is left alone). - `dms icc list` marks a profile without a `vcgt` table, so the rule that makes `apply` refuse it is visible where the profiles are listed. - `ApplyICC`/`RemoveICC`/`SetOutputTemp` reach the manager over IPC with whatever the caller sent: an empty (or whitespace-padded) output name used to be persisted as an entry in `wayland.json` that no `wl_output` can ever match, and a relative profile path was stored to be resolved again on the next start, from a different working directory. Both are rejected now, before anything is written. Verified with the built CLI against the previous binary: with a profile that has no vcgt table, `dms icc apply` now exits before touching the config directory (`residual=[]`) where the previous one copied the file and went on to the IPC (`residual=[nogamma.icc]`); with a valid profile and no daemon reachable, the previous one leaves `vcgt.icc` behind and this one does not. Covered by TestManager_RejectsInvalidICCArguments. * fix(icc): apply the user gamma and contrast on profiled outputs * fix(icc): recreate failed controls without the night light and allow clearing a per-output temp * test(icc): cover the recreated control and the cleared temperature override Follow-up ond55d3d1f, which fixed both points without tests: - TestManager_RecreateOutputControlFollowsNeedsControls pins the predicate: with the night light off and nothing configured there is nothing to recreate, and with a configured profile or a per-output temperature the control has to be recreated. Both configured cases return nil on9226251c. - TestManager_SetOutputTempZeroClearsTheOverride pins what the reset button in Display Config does end to end: the stored value and the published entry both disappear, so the row reads "Default" and the output follows the schedule. Also keeps the reset button's slot instead of revealing it on demand. The temperature row shares its column with the slider below it, so the height change between "Default" (no button) and an override moved the slider 14 px under the pointer while it was being dragged; the button is now always laid out and only its opacity and enabled state follow the override, which also lets the label width drop the conditional. * fix(icc): replicate a one-channel vcgt and keep the temp slider in sync * fix(icc): release idle gamma controls and push the output list * fix(icc): dedupe ramps on the effective target * fix(icc): never overwrite a same-named profile in the config dir --------- Co-authored-by: bbedward <[email protected]>
706 lines
19 KiB
Go
706 lines
19 KiB
Go
// Package icc provides a pure-Go ICC color profile parser and gamma ramp generator.
|
||
// It supports ICC v2/v4 profile binary format and generates wlr-gamma-control
|
||
// compatible gamma ramps for display calibration.
|
||
package icc
|
||
|
||
import (
|
||
"encoding/binary"
|
||
"errors"
|
||
"fmt"
|
||
"math"
|
||
"os"
|
||
"unicode/utf16"
|
||
)
|
||
|
||
// CurveType represents the type of a tone reproduction curve.
|
||
type CurveType int
|
||
|
||
const (
|
||
// CurveIdentity represents an identity curve (count=0, output equals input).
|
||
CurveIdentity CurveType = iota
|
||
// CurveParametric represents a single gamma value (count=1).
|
||
CurveParametric
|
||
// CurveTable represents a lookup table (count>1).
|
||
CurveTable
|
||
)
|
||
|
||
// Profile represents a parsed ICC color profile.
|
||
type Profile struct {
|
||
Size uint32
|
||
Version string // "2.1.0", "4.3.0"
|
||
Class string // "mntr", "scnr", "prtr"
|
||
ColorSpace string // "RGB", "CMYK"
|
||
Description string // from desc tag
|
||
Matrix [3][3]float64 // rXYZ, gXYZ, bXYZ columns
|
||
HasMatrix bool
|
||
TRC [3]Curve // rTRC, gTRC, bTRC
|
||
HasTRC bool
|
||
VCGT *VCGT // video card gamma table
|
||
HasVCGT bool
|
||
WhitePoint [3]float64 // XYZ of white point
|
||
}
|
||
|
||
// Curve represents a tone reproduction curve.
|
||
type Curve struct {
|
||
Type CurveType // Parametric or Table
|
||
Gamma float64 // if Parametric (count=1)
|
||
Entries []uint16 // if Table (0-65535), evenly spaced 0.0 to 1.0
|
||
}
|
||
|
||
// VCGT represents a video card gamma table.
|
||
type VCGT struct {
|
||
Channels int // 3 for RGB
|
||
Entries int // number of entries per channel
|
||
Red []uint16 // 0-65535
|
||
Green []uint16
|
||
Blue []uint16
|
||
}
|
||
|
||
// GammaRamp is the output format for wlr-gamma-control.
|
||
type GammaRamp struct {
|
||
Red []uint16
|
||
Green []uint16
|
||
Blue []uint16
|
||
}
|
||
|
||
// tagEntry represents a single entry in the ICC tag table.
|
||
type tagEntry struct {
|
||
sig [4]byte
|
||
offset uint32
|
||
size uint32
|
||
}
|
||
|
||
// tag signatures
|
||
var (
|
||
sigDesc = [4]byte{'d', 'e', 's', 'c'}
|
||
sigRXYZ = [4]byte{'r', 'X', 'Y', 'Z'}
|
||
sigGXYZ = [4]byte{'g', 'X', 'Y', 'Z'}
|
||
sigBXYZ = [4]byte{'b', 'X', 'Y', 'Z'}
|
||
sigRTRC = [4]byte{'r', 'T', 'R', 'C'}
|
||
sigGTRC = [4]byte{'g', 'T', 'R', 'C'}
|
||
sigBTRC = [4]byte{'b', 'T', 'R', 'C'}
|
||
sigVCGT = [4]byte{'v', 'c', 'g', 't'}
|
||
sigWtpt = [4]byte{'w', 't', 'p', 't'}
|
||
)
|
||
|
||
// ParseFile reads and parses an ICC profile from a file path.
|
||
func ParseFile(path string) (*Profile, error) {
|
||
data, err := os.ReadFile(path)
|
||
if err != nil {
|
||
return nil, fmt.Errorf("icc: failed to read file: %w", err)
|
||
}
|
||
return ParseBytes(data)
|
||
}
|
||
|
||
// ParseBytes parses an ICC profile from raw bytes.
|
||
func ParseBytes(data []byte) (*Profile, error) {
|
||
if len(data) < 128 {
|
||
return nil, errors.New("icc: profile data too short for header (< 128 bytes)")
|
||
}
|
||
|
||
p := &Profile{}
|
||
|
||
// Parse header
|
||
p.Size = binary.BigEndian.Uint32(data[0:4])
|
||
|
||
// Verify we have enough data
|
||
if uint32(len(data)) < p.Size {
|
||
return nil, fmt.Errorf("icc: profile data shorter than declared size: got %d, declared %d", len(data), p.Size)
|
||
}
|
||
|
||
// Parse version (bytes 8-11)
|
||
versionRaw := binary.BigEndian.Uint32(data[8:12])
|
||
major := (versionRaw >> 24) & 0xFF
|
||
minor := (versionRaw >> 20) & 0x0F
|
||
bugfix := (versionRaw >> 16) & 0x0F
|
||
p.Version = fmt.Sprintf("%d.%d.%d", major, minor, bugfix)
|
||
|
||
// Parse device class (bytes 12-15)
|
||
p.Class = string(data[12:16])
|
||
|
||
// Parse color space (bytes 16-19)
|
||
p.ColorSpace = string(data[16:20])
|
||
// Trim whitespace from color space
|
||
p.ColorSpace = trimASCII(p.ColorSpace)
|
||
|
||
// Parse tag table
|
||
if len(data) < 132 {
|
||
return nil, errors.New("icc: profile data too short for tag table")
|
||
}
|
||
|
||
tagCount := binary.BigEndian.Uint32(data[128:132])
|
||
// tagCount comes straight from the file, so compare it against the space
|
||
// that is actually left before sizing anything with it: tagCount*12 wraps
|
||
// in uint32 (0x15555556*12 == 8) and would otherwise let a 140-byte profile
|
||
// through the bounds check and request a ~4 GB tag table.
|
||
if uint64(tagCount) > uint64((len(data)-132)/12) {
|
||
return nil, fmt.Errorf("icc: profile data too short for %d tag entries", tagCount)
|
||
}
|
||
|
||
// Read tag entries
|
||
tags := make([]tagEntry, tagCount)
|
||
for i := uint32(0); i < tagCount; i++ {
|
||
off := uint32(132) + i*12
|
||
copy(tags[i].sig[:], data[off:off+4])
|
||
tags[i].offset = binary.BigEndian.Uint32(data[off+4 : off+8])
|
||
tags[i].size = binary.BigEndian.Uint32(data[off+8 : off+12])
|
||
}
|
||
|
||
// Build a map of tag signatures to entries
|
||
tagMap := make(map[[4]byte]tagEntry)
|
||
for _, t := range tags {
|
||
tagMap[t.sig] = t
|
||
}
|
||
|
||
// Parse description
|
||
if entry, ok := tagMap[sigDesc]; ok {
|
||
desc, err := parseDescription(data, entry)
|
||
if err == nil {
|
||
p.Description = desc
|
||
}
|
||
}
|
||
|
||
// Parse matrix columns (rXYZ, gXYZ, bXYZ)
|
||
rXYZ, hasR := tagMap[sigRXYZ]
|
||
gXYZ, hasG := tagMap[sigGXYZ]
|
||
bXYZ, hasB := tagMap[sigBXYZ]
|
||
if hasR && hasG && hasB {
|
||
rx, ry, rz, err := parseXYZType(data, rXYZ)
|
||
if err == nil {
|
||
gx, gy, gz, err := parseXYZType(data, gXYZ)
|
||
if err == nil {
|
||
bx, by, bz, err := parseXYZType(data, bXYZ)
|
||
if err == nil {
|
||
p.Matrix[0] = [3]float64{rx, ry, rz}
|
||
p.Matrix[1] = [3]float64{gx, gy, gz}
|
||
p.Matrix[2] = [3]float64{bx, by, bz}
|
||
p.HasMatrix = true
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
// Parse TRC curves (rTRC, gTRC, bTRC)
|
||
rTRC, hasRTRC := tagMap[sigRTRC]
|
||
gTRC, hasGTRC := tagMap[sigGTRC]
|
||
bTRC, hasBTRC := tagMap[sigBTRC]
|
||
if hasRTRC && hasGTRC && hasBTRC {
|
||
rc, err := parseCurveType(data, rTRC)
|
||
if err == nil {
|
||
gc, err := parseCurveType(data, gTRC)
|
||
if err == nil {
|
||
bc, err := parseCurveType(data, bTRC)
|
||
if err == nil {
|
||
p.TRC[0] = rc
|
||
p.TRC[1] = gc
|
||
p.TRC[2] = bc
|
||
p.HasTRC = true
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
// Parse vcgt
|
||
if entry, ok := tagMap[sigVCGT]; ok {
|
||
vcgt, err := parseVCGT(data, entry)
|
||
if err == nil {
|
||
p.VCGT = vcgt
|
||
p.HasVCGT = true
|
||
}
|
||
}
|
||
|
||
// Parse white point
|
||
if entry, ok := tagMap[sigWtpt]; ok {
|
||
x, y, z, err := parseXYZType(data, entry)
|
||
if err == nil {
|
||
p.WhitePoint = [3]float64{x, y, z}
|
||
}
|
||
}
|
||
|
||
return p, nil
|
||
}
|
||
|
||
// trimASCII trims spaces from a 4-byte ASCII field.
|
||
func trimASCII(s string) string {
|
||
i := 0
|
||
for i < len(s) && s[i] == ' ' {
|
||
i++
|
||
}
|
||
j := len(s)
|
||
for j > i && s[j-1] == ' ' {
|
||
j--
|
||
}
|
||
return s[i:j]
|
||
}
|
||
|
||
// readS15Fixed16 reads a signed 15.16 fixed-point number from big-endian bytes.
|
||
// Go's int32 cast handles two's complement correctly for negative values.
|
||
func readS15Fixed16(data []byte, offset int) float64 {
|
||
if offset+4 > len(data) {
|
||
return 0
|
||
}
|
||
raw := binary.BigEndian.Uint32(data[offset : offset+4])
|
||
signed := int32(raw)
|
||
return float64(signed) / 65536.0
|
||
}
|
||
|
||
// parseDescription parses the desc tag (textDescriptionType or mluc).
|
||
func parseDescription(data []byte, entry tagEntry) (string, error) {
|
||
if int(entry.offset)+int(entry.size) > len(data) {
|
||
return "", errors.New("icc: desc tag out of bounds")
|
||
}
|
||
|
||
if entry.size < 4 {
|
||
return "", errors.New("icc: desc tag too short")
|
||
}
|
||
|
||
sig := string(data[entry.offset : entry.offset+4])
|
||
|
||
switch sig {
|
||
case "desc":
|
||
// textDescriptionType: 'desc' + reserved(4) + stringLength(4) + ascii string
|
||
if entry.size < 12 {
|
||
return "", errors.New("icc: textDescriptionType too short")
|
||
}
|
||
strLen := binary.BigEndian.Uint32(data[entry.offset+8 : entry.offset+12])
|
||
if strLen == 0 {
|
||
return "", nil
|
||
}
|
||
// Compute in int so a large length cannot wrap past the buffer end.
|
||
strStart := int(entry.offset) + 12
|
||
strEnd := strStart + int(strLen)
|
||
if strEnd > len(data) {
|
||
strEnd = len(data)
|
||
}
|
||
if strStart < 0 || strStart > strEnd {
|
||
return "", errors.New("icc: textDescriptionType string out of bounds")
|
||
}
|
||
// strLen includes null terminator
|
||
s := data[strStart:strEnd]
|
||
// Trim null terminator
|
||
for i, b := range s {
|
||
if b == 0 {
|
||
s = s[:i]
|
||
break
|
||
}
|
||
}
|
||
return string(s), nil
|
||
|
||
case "mluc":
|
||
// mluc: 'mluc' + reserved(4) + numRecords(4) + recordSize(4) + records
|
||
if entry.size < 16 {
|
||
return "", errors.New("icc: mluc type too short")
|
||
}
|
||
numRecords := binary.BigEndian.Uint32(data[entry.offset+8 : entry.offset+12])
|
||
recordSize := binary.BigEndian.Uint32(data[entry.offset+12 : entry.offset+16])
|
||
if numRecords == 0 {
|
||
return "", nil
|
||
}
|
||
// Read first record
|
||
if recordSize < 12 {
|
||
return "", errors.New("icc: mluc record size too small")
|
||
}
|
||
recordStart := entry.offset + 16
|
||
if int(recordStart)+12 > len(data) {
|
||
return "", errors.New("icc: mluc record out of bounds")
|
||
}
|
||
strLen := binary.BigEndian.Uint32(data[recordStart+4 : recordStart+8])
|
||
strOff := binary.BigEndian.Uint32(data[recordStart+8 : recordStart+12])
|
||
// Decode UTF-16BE
|
||
if strLen < 2 {
|
||
return "", nil
|
||
}
|
||
// String offset is absolute from profile start. Compute in int so a
|
||
// large offset/length cannot wrap past the buffer end.
|
||
strStart := int(entry.offset) + int(strOff)
|
||
strEnd := strStart + int(strLen)
|
||
if strEnd > len(data) {
|
||
strEnd = len(data)
|
||
}
|
||
if strStart < 0 || strStart > strEnd {
|
||
return "", errors.New("icc: mluc string out of bounds")
|
||
}
|
||
return decodeUTF16BE(data[strStart:strEnd]), nil
|
||
|
||
default:
|
||
return "", fmt.Errorf("icc: unknown desc type signature: %q", sig)
|
||
}
|
||
}
|
||
|
||
// decodeUTF16BE decodes a big-endian UTF-16 byte slice to a Go string.
|
||
func decodeUTF16BE(data []byte) string {
|
||
if len(data) < 2 {
|
||
return ""
|
||
}
|
||
u16s := make([]uint16, 0, len(data)/2)
|
||
for i := 0; i+1 < len(data); i += 2 {
|
||
code := uint16(data[i])<<8 | uint16(data[i+1])
|
||
if code == 0 {
|
||
break
|
||
}
|
||
u16s = append(u16s, code)
|
||
}
|
||
return string(utf16.Decode(u16s))
|
||
}
|
||
|
||
// parseXYZType parses an XYZType tag (20 bytes: 'XYZ ' + reserved(4) + 3 × s15Fixed16).
|
||
func parseXYZType(data []byte, entry tagEntry) (float64, float64, float64, error) {
|
||
if int(entry.offset)+20 > len(data) {
|
||
return 0, 0, 0, errors.New("icc: XYZType tag out of bounds")
|
||
}
|
||
sig := string(data[entry.offset : entry.offset+4])
|
||
if sig != "XYZ " {
|
||
return 0, 0, 0, fmt.Errorf("icc: expected XYZ type signature, got %q", sig)
|
||
}
|
||
x := readS15Fixed16(data, int(entry.offset)+8)
|
||
y := readS15Fixed16(data, int(entry.offset)+12)
|
||
z := readS15Fixed16(data, int(entry.offset)+16)
|
||
return x, y, z, nil
|
||
}
|
||
|
||
// parseCurveType parses a curveType tag.
|
||
func parseCurveType(data []byte, entry tagEntry) (Curve, error) {
|
||
if int(entry.offset)+4 > len(data) {
|
||
return Curve{}, errors.New("icc: curveType tag out of bounds")
|
||
}
|
||
sig := string(data[entry.offset : entry.offset+4])
|
||
if sig != "curv" {
|
||
return Curve{}, fmt.Errorf("icc: expected curv type signature, got %q", sig)
|
||
}
|
||
if int(entry.offset)+12 > len(data) {
|
||
return Curve{}, errors.New("icc: curveType tag too short")
|
||
}
|
||
|
||
count := binary.BigEndian.Uint32(data[entry.offset+8 : entry.offset+12])
|
||
|
||
c := Curve{}
|
||
|
||
switch count {
|
||
case 0:
|
||
// Identity curve
|
||
c.Type = CurveIdentity
|
||
c.Gamma = 1.0
|
||
|
||
case 1:
|
||
// Single gamma value (u16Fixed16Number)
|
||
c.Type = CurveParametric
|
||
if int(entry.offset)+14 > len(data) {
|
||
return Curve{}, errors.New("icc: curveType too short for gamma value")
|
||
}
|
||
// Read 2 bytes as uint16, divide by 256.0
|
||
gammaRaw := binary.BigEndian.Uint16(data[entry.offset+12 : entry.offset+14])
|
||
c.Gamma = float64(gammaRaw) / 256.0
|
||
|
||
default:
|
||
// Table of uint16 entries
|
||
c.Type = CurveTable
|
||
needed := int(entry.offset) + 12 + int(count)*2
|
||
if needed > len(data) {
|
||
return Curve{}, fmt.Errorf("icc: curveType table out of bounds: need %d, have %d", needed, len(data))
|
||
}
|
||
c.Entries = make([]uint16, count)
|
||
for i := uint32(0); i < count; i++ {
|
||
off := int(entry.offset) + 12 + int(i)*2
|
||
c.Entries[i] = binary.BigEndian.Uint16(data[off : off+2])
|
||
}
|
||
}
|
||
|
||
return c, nil
|
||
}
|
||
|
||
// parseVCGT parses a videoCardGammaType tag.
|
||
func parseVCGT(data []byte, entry tagEntry) (*VCGT, error) {
|
||
if int(entry.offset)+int(entry.size) > len(data) {
|
||
return nil, errors.New("icc: vcgt tag out of bounds")
|
||
}
|
||
|
||
// Minimum header: 'vcgt'(4) + reserved(4) + tagType(4) + channels(2) + count(2) + entrySize(2) = 18
|
||
if entry.size < 18 {
|
||
return nil, errors.New("icc: vcgt tag too short")
|
||
}
|
||
|
||
sig := string(data[entry.offset : entry.offset+4])
|
||
if sig != "vcgt" {
|
||
return nil, fmt.Errorf("icc: expected vcgt signature, got %q", sig)
|
||
}
|
||
|
||
tagType := binary.BigEndian.Uint32(data[entry.offset+8 : entry.offset+12])
|
||
|
||
switch tagType {
|
||
case 0:
|
||
// Table type
|
||
channels := int(binary.BigEndian.Uint16(data[entry.offset+12 : entry.offset+14]))
|
||
count := int(binary.BigEndian.Uint16(data[entry.offset+14 : entry.offset+16]))
|
||
entrySize := int(binary.BigEndian.Uint16(data[entry.offset+16 : entry.offset+18]))
|
||
|
||
if count < 1 || entrySize < 1 {
|
||
return nil, fmt.Errorf("icc: vcgt invalid dimensions: channels=%d, count=%d, entrySize=%d", channels, count, entrySize)
|
||
}
|
||
if channels != 1 && channels != 3 {
|
||
return nil, fmt.Errorf("icc: vcgt has %d channels, want 1 or 3", channels)
|
||
}
|
||
|
||
dataStart := int(entry.offset) + 18
|
||
totalBytes := channels * count * entrySize
|
||
if dataStart+totalBytes > len(data) {
|
||
return nil, fmt.Errorf("icc: vcgt data out of bounds: need %d bytes, have %d", totalBytes, len(data)-dataStart)
|
||
}
|
||
|
||
vcgt := &VCGT{
|
||
Channels: channels,
|
||
Entries: count,
|
||
Red: make([]uint16, count),
|
||
Green: make([]uint16, count),
|
||
Blue: make([]uint16, count),
|
||
}
|
||
|
||
channels_arr := [3][]uint16{vcgt.Red, vcgt.Green, vcgt.Blue}
|
||
|
||
for ch := 0; ch < channels; ch++ {
|
||
for i := 0; i < count; i++ {
|
||
byteOff := dataStart + (ch*count+i)*entrySize
|
||
var val uint16
|
||
switch entrySize {
|
||
case 2:
|
||
val = binary.BigEndian.Uint16(data[byteOff : byteOff+2])
|
||
case 1:
|
||
// u8 entry: scale to u16
|
||
val = uint16(data[byteOff]) * 257 // 257 = 65535/255
|
||
default:
|
||
val = binary.BigEndian.Uint16(data[byteOff : byteOff+2])
|
||
}
|
||
channels_arr[ch][i] = val
|
||
}
|
||
}
|
||
if channels == 1 {
|
||
copy(vcgt.Green, vcgt.Red)
|
||
copy(vcgt.Blue, vcgt.Red)
|
||
}
|
||
|
||
return vcgt, nil
|
||
|
||
case 1:
|
||
// Formula type (rarely used, but parse it)
|
||
// 3 channels × (gamma u16Fixed16 + min s15Fixed16 + max s15Fixed16)
|
||
return nil, errors.New("icc: vcgt formula type not supported")
|
||
|
||
default:
|
||
return nil, fmt.Errorf("icc: vcgt unknown tag type: %d", tagType)
|
||
}
|
||
}
|
||
|
||
// SampleCurve evaluates a Curve at position t (0.0 to 1.0), returns 0.0 to 1.0.
|
||
func SampleCurve(curve Curve, t float64) float64 {
|
||
// Clamp t to [0, 1]
|
||
if t < 0 {
|
||
t = 0
|
||
}
|
||
if t > 1 {
|
||
t = 1
|
||
}
|
||
|
||
switch curve.Type {
|
||
case CurveIdentity:
|
||
return t
|
||
|
||
case CurveParametric:
|
||
if curve.Gamma == 0 {
|
||
return 0
|
||
}
|
||
return math.Pow(t, 1.0/curve.Gamma)
|
||
|
||
case CurveTable:
|
||
if len(curve.Entries) == 0 {
|
||
return t
|
||
}
|
||
if len(curve.Entries) == 1 {
|
||
return float64(curve.Entries[0]) / 65535.0
|
||
}
|
||
// t maps to index in [0, len-1]
|
||
idx := t * float64(len(curve.Entries)-1)
|
||
low := int(idx)
|
||
if low >= len(curve.Entries)-1 {
|
||
low = len(curve.Entries) - 2
|
||
}
|
||
if low < 0 {
|
||
low = 0
|
||
}
|
||
frac := idx - float64(low)
|
||
v0 := float64(curve.Entries[low])
|
||
v1 := float64(curve.Entries[low+1])
|
||
result := (v0 + frac*(v1-v0)) / 65535.0
|
||
if result < 0 {
|
||
result = 0
|
||
}
|
||
if result > 1 {
|
||
result = 1
|
||
}
|
||
return result
|
||
|
||
default:
|
||
return t
|
||
}
|
||
}
|
||
|
||
// GenerateGammaRamp creates a wlr-gamma-control compatible ramp from an ICC
|
||
// profile.
|
||
//
|
||
// Only vcgt carries a video card gamma table, which is what the GPU LUT takes.
|
||
// rTRC/gTRC/bTRC describe the device-to-PCS transfer function of the display
|
||
// itself (roughly t^2.2 for a normal monitor), not a correction to write into
|
||
// the ramp, so treating them as one would wash the display out instead of
|
||
// calibrating it. A profile without a vcgt table therefore has no ramp.
|
||
func GenerateGammaRamp(size uint32, profile *Profile) (GammaRamp, error) {
|
||
return GenerateGammaRampAt(size, profile, func(t float64) float64 { return t })
|
||
}
|
||
|
||
// GenerateGammaRampAt samples the vcgt table at input(t) for each ramp
|
||
// position t in [0, 1], so a caller can reshape the ramp input (contrast)
|
||
// before the table is applied.
|
||
func GenerateGammaRampAt(size uint32, profile *Profile, input func(float64) float64) (GammaRamp, error) {
|
||
if size < 2 {
|
||
return GammaRamp{}, errors.New("icc: ramp size must be at least 2")
|
||
}
|
||
if !profile.HasVCGT || profile.VCGT == nil {
|
||
return GammaRamp{}, errors.New("icc: profile has no vcgt table, so it has no video card gamma ramp")
|
||
}
|
||
|
||
ramp := GammaRamp{
|
||
Red: make([]uint16, size),
|
||
Green: make([]uint16, size),
|
||
Blue: make([]uint16, size),
|
||
}
|
||
|
||
vcgt := profile.VCGT
|
||
for i := uint32(0); i < size; i++ {
|
||
t := input(float64(i) / float64(size-1))
|
||
ramp.Red[i] = resampleVCGT(vcgt.Red, t)
|
||
ramp.Green[i] = resampleVCGT(vcgt.Green, t)
|
||
ramp.Blue[i] = resampleVCGT(vcgt.Blue, t)
|
||
}
|
||
return ramp, nil
|
||
}
|
||
|
||
// resampleVCGT resamples a vcgt channel at position t (0.0 to 1.0) using linear interpolation.
|
||
func resampleVCGT(entries []uint16, t float64) uint16 {
|
||
if len(entries) == 0 {
|
||
return uint16Clamp(t * 65535.0)
|
||
}
|
||
if len(entries) == 1 {
|
||
return entries[0]
|
||
}
|
||
|
||
idx := t * float64(len(entries)-1)
|
||
low := int(idx)
|
||
if low >= len(entries)-1 {
|
||
low = len(entries) - 2
|
||
}
|
||
if low < 0 {
|
||
low = 0
|
||
}
|
||
frac := idx - float64(low)
|
||
v := float64(entries[low]) + frac*(float64(entries[low+1])-float64(entries[low]))
|
||
return uint16Clamp(v)
|
||
}
|
||
|
||
// uint16Clamp clamps a float64 to [0, 65535] and converts to uint16.
|
||
func uint16Clamp(v float64) uint16 {
|
||
if v < 0 {
|
||
return 0
|
||
}
|
||
if v > 65535 {
|
||
return 65535
|
||
}
|
||
return uint16(v + 0.5) // round to nearest
|
||
}
|
||
|
||
// WhitePointXY returns the chromaticity coordinates of the profile white point.
|
||
func (p *Profile) WhitePointXY() (float64, float64, bool) {
|
||
sum := p.WhitePoint[0] + p.WhitePoint[1] + p.WhitePoint[2]
|
||
if sum <= 0 {
|
||
return 0, 0, false
|
||
}
|
||
return p.WhitePoint[0] / sum, p.WhitePoint[1] / sum, true
|
||
}
|
||
|
||
// WhitePointCCT estimates the correlated color temperature of the profile white
|
||
// point in kelvin using McCamy's approximation. It returns 0 when the white
|
||
// point is missing or the estimate is out of range.
|
||
func (p *Profile) WhitePointCCT() int {
|
||
x, y, ok := p.WhitePointXY()
|
||
if !ok {
|
||
return 0
|
||
}
|
||
denominator := 0.1858 - y
|
||
if math.Abs(denominator) < 1e-9 {
|
||
return 0
|
||
}
|
||
n := (x - 0.3320) / denominator
|
||
cct := 449.0*n*n*n + 3525.0*n*n + 6823.3*n + 5520.33
|
||
if cct < 1000 || cct > 40000 {
|
||
return 0
|
||
}
|
||
return int(math.Round(cct))
|
||
}
|
||
|
||
// WhitePointName names the white point when it is close to a standard
|
||
// illuminant ("D50", "D65"), or returns an empty string.
|
||
func (p *Profile) WhitePointName() string {
|
||
cct := p.WhitePointCCT()
|
||
switch {
|
||
case cct == 0:
|
||
return ""
|
||
case math.Abs(float64(cct)-6504) <= 150:
|
||
return "D65"
|
||
case math.Abs(float64(cct)-5003) <= 150:
|
||
return "D50"
|
||
default:
|
||
return ""
|
||
}
|
||
}
|
||
|
||
// TRCKind describes how the tone reproduction curves are stored: "identity",
|
||
// "gamma", "table" or "mixed". gamma and entries are only set when all three
|
||
// channels agree.
|
||
func (p *Profile) TRCKind() (kind string, gamma float64, entries int) {
|
||
if !p.HasTRC {
|
||
return "", 0, 0
|
||
}
|
||
|
||
identity, parametric, tables := 0, 0, 0
|
||
sameGamma := true
|
||
sameEntries := true
|
||
for i, curve := range p.TRC {
|
||
switch curve.Type {
|
||
case CurveIdentity:
|
||
identity++
|
||
case CurveParametric:
|
||
parametric++
|
||
case CurveTable:
|
||
tables++
|
||
}
|
||
if i == 0 {
|
||
gamma = curve.Gamma
|
||
entries = len(curve.Entries)
|
||
continue
|
||
}
|
||
if curve.Gamma != gamma {
|
||
sameGamma = false
|
||
}
|
||
if len(curve.Entries) != entries {
|
||
sameEntries = false
|
||
}
|
||
}
|
||
|
||
switch {
|
||
case identity == len(p.TRC):
|
||
return "identity", 0, 0
|
||
case parametric == len(p.TRC) && sameGamma:
|
||
return "gamma", gamma, 0
|
||
case tables == len(p.TRC) && sameEntries:
|
||
return "table", 0, entries
|
||
default:
|
||
return "mixed", 0, 0
|
||
}
|
||
}
|