yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland/frog_colormanagement: improve mastering luminance handling

Browse source 
Before we only used max_cll and max_fall, but with some videos they are not provided
and only mastering display luminances are set
This commit is contained in:
Xaver Hugl 2024-08-09 16:09:10 +02:00
parent f9b88ee2f3
commit 3aba2cf3da
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/wayland/frog_colormanagement_v1.cpp
View file

@ -128,11 +128,21 @@ void FrogColorManagementSurfaceV1::frog_color_managed_surface_set_hdr_metadata(R
uint32_t max_display_mastering_luminance, uint32_t min_display_mastering_luminance,
uint32_t max_cll, uint32_t max_fall)
{
if (max_fall > 0) {
// max_display_mastering_luminance and max_cll more or less have the same meaning in practice
// it seems that max_cll, if set, is more accurate, so prefer it
if (max_cll != 0) {
m_maxPeakBrightness = max_cll;
} else if (max_display_mastering_luminance != 0) {
m_maxPeakBrightness = max_display_mastering_luminance;
}
if (max_fall != 0 && (!m_maxPeakBrightness || max_fall <= *m_maxPeakBrightness)) {
m_maxAverageLuminance = max_fall;
}
if (max_cll > 0) {
m_maxPeakBrightness = max_cll;
const double minLuminance = min_display_mastering_luminance / 10'000.0;
if ((!m_maxPeakBrightness && !m_maxAverageLuminance)
|| (m_maxPeakBrightness && minLuminance < *m_maxPeakBrightness)
|| (m_maxAverageLuminance && minLuminance < *m_maxAverageLuminance)) {
m_minMasteringLuminance = minLuminance;
}
if (mastering_display_primary_red_x > 0 && mastering_display_primary_red_y > 0 && mastering_display_primary_green_x > 0 && mastering_display_primary_green_y > 0 && mastering_display_primary_blue_x > 0 && mastering_display_primary_blue_y > 0 && mastering_white_point_x > 0 && mastering_white_point_y > 0) {
m_masteringColorimetry = Colorimetry{
@ -163,7 +173,7 @@ void FrogColorManagementSurfaceV1::updateColorDescription()
if (!m_transferFunction.isRelative()) {
referenceLuminance = priv->preferredColorDescription.value_or(ColorDescription::sRGB).referenceLuminance();
}
priv->pending->colorDescription = ColorDescription(m_containerColorimetry, m_transferFunction, referenceLuminance, 0, m_maxAverageLuminance, m_maxPeakBrightness, m_masteringColorimetry, Colorimetry::fromName(NamedColorimetry::BT709));
priv->pending->colorDescription = ColorDescription(m_containerColorimetry, m_transferFunction, referenceLuminance, m_minMasteringLuminance.value_or(m_transferFunction.minLuminance), m_maxAverageLuminance, m_maxPeakBrightness, m_masteringColorimetry, Colorimetry::fromName(NamedColorimetry::BT709));
priv->pending->colorDescriptionIsSet = true;
}
}

1
src/wayland/frog_colormanagement_v1.h
View file

@ -56,6 +56,7 @@ private:
TransferFunction m_transferFunction{TransferFunction::sRGB};
NamedColorimetry m_containerColorimetry = NamedColorimetry::BT709;
std::optional<Colorimetry> m_masteringColorimetry;
std::optional<double> m_minMasteringLuminance;
std::optional<double> m_maxAverageLuminance;
std::optional<double> m_maxPeakBrightness;
};