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

wayland/xx colormanagement: send named primaries when possible

Browse source
This commit is contained in:
Xaver Hugl 2024-08-14 16:33:10 +02:00
parent f3086be998
commit 9ed492a17f
3 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/core/colorspace.cpp
View file

@ -255,6 +255,26 @@ const Colorimetry &Colorimetry::fromName(NamedColorimetry name)
Q_UNREACHABLE();
}
std::optional<NamedColorimetry> Colorimetry::name() const
{
constexpr std::array names = {
NamedColorimetry::BT709,
NamedColorimetry::PAL_M,
NamedColorimetry::PAL,
NamedColorimetry::NTSC,
NamedColorimetry::GenericFilm,
NamedColorimetry::BT2020,
NamedColorimetry::CIEXYZ,
NamedColorimetry::DCIP3,
NamedColorimetry::DisplayP3,
NamedColorimetry::AdobeRGB,
};
const auto it = std::ranges::find_if(names, [this](NamedColorimetry name) {
return *this == name;
});
return it != names.end() ? std::optional(*it) : std::nullopt;
}
const ColorDescription ColorDescription::sRGB = ColorDescription(NamedColorimetry::BT709, TransferFunction(TransferFunction::gamma22), TransferFunction::defaultReferenceLuminanceFor(TransferFunction::gamma22), TransferFunction::defaultMinLuminanceFor(TransferFunction::gamma22), TransferFunction::defaultMaxLuminanceFor(TransferFunction::gamma22), TransferFunction::defaultMaxLuminanceFor(TransferFunction::gamma22));
ColorDescription::ColorDescription(const Colorimetry &containerColorimetry, TransferFunction tf, double referenceLuminance, double minLuminance, std::optional<double> maxAverageLuminance, std::optional<double> maxHdrLuminance)

2
src/core/colorspace.h
View file

@ -94,6 +94,8 @@ public:
const QVector2D &blue() const;
const QVector2D &white() const;
std::optional<NamedColorimetry> name() const;
private:
QVector2D m_red;
QVector2D m_green;

30
src/wayland/xx_colormanagement_v4.cpp
View file

@ -405,6 +405,33 @@ static uint32_t kwinTFtoProtoTF(TransferFunction tf)
Q_UNREACHABLE();
}
static uint32_t kwinPrimariesToProtoPrimaires(NamedColorimetry primaries)
{
switch (primaries) {
case NamedColorimetry::BT709:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_srgb;
case NamedColorimetry::PAL_M:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_pal_m;
case NamedColorimetry::PAL:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_pal;
case NamedColorimetry::NTSC:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_ntsc;
case NamedColorimetry::GenericFilm:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_generic_film;
case NamedColorimetry::BT2020:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_bt2020;
case NamedColorimetry::CIEXYZ:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_cie1931_xyz;
case NamedColorimetry::DCIP3:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_dci_p3;
case NamedColorimetry::DisplayP3:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_display_p3;
case NamedColorimetry::AdobeRGB:
return QtWaylandServer::xx_color_manager_v4::primaries::primaries_adobe_rgb;
}
Q_UNREACHABLE();
}
void XXImageDescriptionV4::xx_image_description_v4_get_information(Resource *qtResource, uint32_t information)
{
auto resource = wl_resource_create(qtResource->client(), &xx_image_description_info_v4_interface, qtResource->version(), information);
@ -417,6 +444,9 @@ void XXImageDescriptionV4::xx_image_description_v4_get_information(Resource *qtR
round(c.green().x()), round(c.green().y()),
round(c.blue().x()), round(c.blue().y()),
round(c.white().x()), round(c.white().y()));
if (auto name = m_description.containerColorimetry().name()) {
xx_image_description_info_v4_send_primaries_named(resource, kwinPrimariesToProtoPrimaires(*name));
}
xx_image_description_info_v4_send_luminances(resource, std::round(m_description.transferFunction().minLuminance * 10'000), std::round(m_description.transferFunction().maxLuminance), std::round(m_description.referenceLuminance()));
xx_image_description_info_v4_send_target_luminance(resource, m_description.minLuminance(), m_description.maxHdrLuminance().value_or(800));
xx_image_description_info_v4_send_tf_named(resource, kwinTFtoProtoTF(m_description.transferFunction()));