Skip to content

vo_gpu_next: when tone-mapping, set better maxCLL value #16558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 9, 2025
Merged

vo_gpu_next: when tone-mapping, set better maxCLL value #16558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04e3ab1
vo_gpu_next: when tone-mapping, set better maxCLL value
kasper93 Jul 17, 2025
ef93b86
stats.lua: round max-cll to integer
kasper93 Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions player/lua/stats.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,8 +829,8 @@ local function append_hdr(s, hdr, video_out)
indent = o.prefix_sep .. o.prefix_sep
end
if should_show(hdr["max-cll"]) then
append(s, hdr["max-cll"], {prefix="MaxCLL:", suffix=" cd/m²", nl="",
indent=indent})
append(s, string.format("%.0f", hdr["max-cll"]), {prefix="MaxCLL:",
suffix=" cd/m²", nl="", indent=indent})
indent = o.prefix_sep .. o.prefix_sep
end
if hdr["max-fall"] and hdr["max-fall"] > 0 then
Expand Down
24 changes: 24 additions & 0 deletions video/out/vo_gpu_next.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,9 @@ static bool draw_frame(struct vo *vo, struct vo_frame *frame)
target_csp.hdr.max_cll = 0;
target_csp.hdr.max_fall = 0;
}
// maxFALL in display metadata is in fact MaxFullFrameLuminance. Wayland
// reports it as maxFALL directly, but this doesn't mean the same thing.
target_csp.hdr.max_fall = 0;

struct pl_color_space hint;
bool target_hint = p->next_opts->target_hint == 1 ||
Expand Down Expand Up @@ -1112,6 +1115,13 @@ static bool draw_frame(struct vo *vo, struct vo_frame *frame)
.out_min = &hint.hdr.min_luma,
.out_max = &hint.hdr.max_luma,
));
// Set maxCLL to dynamic max luminance. Note that libplacebo uses
// max luminace as maxCLL in practice.
hint.hdr.max_cll = hint.hdr.max_luma;
// Keep maxFALL from static metadata, unless its value is too high.
// Could be set to 0, but let's keep it for now.
if (hint.hdr.max_fall > hint.hdr.max_cll)
hint.hdr.max_fall = 0;
}
// Infer missing bits now. This is important so that we don't lose
// information after user option overrides. For example, if the user
Expand All @@ -1135,6 +1145,20 @@ static bool draw_frame(struct vo *vo, struct vo_frame *frame)
hint.transfer = opts->target_trc;
if (opts->target_peak)
hint.hdr.max_luma = opts->target_peak;
// Always set maxCLL, display uses this metadata and we shouldn't let it
// fallback to default value.
if (!hint.hdr.max_cll)
hint.hdr.max_cll = hint.hdr.max_luma;
// If tone mapping is required, adjust maxCLL and maxFALL
if (source->hdr.max_luma > hint.hdr.max_luma || opts->tone_map.inverse) {
// Set maxCLL to the target luminance if it's not already lower
if (!hint.hdr.max_cll || hint.hdr.max_luma < hint.hdr.max_cll || opts->tone_map.inverse)
hint.hdr.max_cll = hint.hdr.max_luma;
// There's no reliable way to estimate maxFALL here
hint.hdr.max_fall = 0;
}
if (hint.hdr.max_cll && hint.hdr.max_fall > hint.hdr.max_cll)
hint.hdr.max_fall = 0;
apply_target_contrast(p, &hint, hint.hdr.min_luma);
if (!pass_colorspace)
pl_swapchain_colorspace_hint(p->sw, &hint);
Expand Down
Loading