[prev in list] [next in list] [prev in thread] [next in thread]
List: kwin
Subject: Re: Review Request: Implement color correction (per output)
From: "Casian Andrei" <skeletk13 () gmail ! com>
Date: 2012-10-30 17:49:12
Message-ID: 20121030174912.3181.85582 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
> On Oct. 25, 2012, 5:59 p.m., Martin Gr=C3=A4=C3=9Flin wrote:
> > Today is soft feature freeze. If you want to get this into 4.10 it need=
s to end on the feature plan today.
> =
> Kai-Uwe Behrmann wrote:
> added here: http://techbase.kde.org/Schedules/KDE4/4.10_Feature_Plan
> =
> Casian Andrei wrote:
> I thought the work on this was finished since weeks ago.
> Is there something still missing?
> =
> I don't realize which of the issues are still remaining. Perhaps ther=
e are some which I didn't fix properly? Or I forgot about them? =
> =
> And I can't fix when I don't understand the issue.
> =
> I will merge the latest changes from KWin tomorrow and update the rev=
iew request again.
> =
> Martin Gr=C3=A4=C3=9Flin wrote:
> the most important question is: what's the state of the kded module?
The KDED module is working ok, since the end of the SoC project. But there =
were a couple glitches with the new version of Oyranos a couple of days ago=
and that is why I couldn't give a clear answer at that time.
The KDED module is incorporated inside Kolor-Manager. Currently it has no c=
onnections to the rest of Kolor-Manager, but that might change in the futur=
e. So, the idea is, when you install kolormanager, you also install the KDE=
D module.
Those glitches from a couple of days ago were an opportunity to test what h=
appens when errors occur and make the KDED module (kolor-server) sturdier. =
But, at this moment, it doesn't have any notifications when things go wrong=
- just nothing happens.
I should update the wiki page soon...
- Casian
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/106141/#review20905
-----------------------------------------------------------
On Oct. 27, 2012, 9:56 a.m., Casian Andrei wrote:
> =
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/106141/
> -----------------------------------------------------------
> =
> (Updated Oct. 27, 2012, 9:56 a.m.)
> =
> =
> Review request for kwin, Thomas L=C3=BCbking and Martin Gr=C3=A4=C3=9Flin.
> =
> =
> Description
> -------
> =
> These are the results of my GSoC project, for KWin.
> =
> This color correction needs KolorManager installed, master branch. That o=
ne needs Oyranos and additional color management dependencies.
> git://anongit.kde.org/kolor-manager.git http://www.oyranos.org/do=
wnloads
> =
> If it's not installed, the ColorCorrection class should fail without caus=
ing any issues to the user (that's if it's enabled from the KCM). Probably =
a notification could be appropriate in that case? "Failed to initialize CC =
because cannot contact Kolor-Server KDED..." something like that?
> =
> Change summary:
> --
> Add an option to kcmcompositing in the 'Advanced' tab, to enable or disab=
le color correction. It is specified that it's experimental and it needs Ko=
lor Manager. This implies some small changes to options.h and cpp.
> =
> Scene::finalPaintWindow code is moved into SceneOpenGL::performPaint.
> SceneOpenGL has the declarations of some methods changed to include the s=
creen number - those could be changed to pass around PaintData's probably. =
SceneOpenGL's newly implemented finalDrawWindow splits the rendering if col=
or correction is enabled and there are multiple screens. Before painting fo=
r a particular screen, ColorCorrection::setupForOutput should be called.
> =
> There was a problem with the blending function causing artifacts with col=
or correction enabled so it is set up to src_alpha, one_minus_src alpha in =
that case.
> =
> Now, inside KWinEffects:
> --
> A screen property is added for WindowPaintData.
> In kwinglutils, The fragment shaders are intercepted before being compile=
d and they get a couple of lines of code inserted in order to do the color =
stuff. This happens only when color correction is enabled, of course.
> =
> And there is the big ColorCorrection class. The public and private stuff =
are well separated.
> =
> The private stuff consists of the private data and the D-Bus interface. R=
egarding D-Bus, everything is async.
> =
> The implementation basically manages a set of color lookup tables for dif=
ferent outputs and for different window regions. These are taken via D-Bus.=
Each lookup table has around 700 KB. I hope I am not wrong in assuming it'=
s not that big of an issue time-wise, since they are transferred only once =
or twice for an entire session. I hope D-Bus doesn't do any time consuming =
business to transfer those QVector's.
> =
> In case of problems, it should not affect the rest of KWin in any way.
> =
> Next priorities:
> --
> Implement per-window-region stuff. It should be a matter of extending Kol=
orServer's capabilities and doing some small modifications in SceneOpenGL::=
Window. The ColorCorrection class from KWinEffects has everything prepared.
> =
> =
> Diffs
> -----
> =
> kwin/kcmkwin/kwincompositing/main.cpp 7a89db4 =
> kwin/kcmkwin/kwincompositing/main.ui cff0f63 =
> kwin/libkwineffects/CMakeLists.txt f95d40e =
> kwin/libkwineffects/kwineffects.h eb09d51 =
> kwin/libkwineffects/kwineffects.cpp 9cd9987 =
> kwin/libkwineffects/kwinglcolorcorrection.h PRE-CREATION =
> kwin/libkwineffects/kwinglcolorcorrection.cpp PRE-CREATION =
> kwin/libkwineffects/kwinglcolorcorrection_p.h PRE-CREATION =
> kwin/libkwineffects/kwinglplatform.h 249ecdb =
> kwin/libkwineffects/kwinglplatform.cpp 59ce7b2 =
> kwin/libkwineffects/kwinglutils.h 9b175b9 =
> kwin/libkwineffects/kwinglutils.cpp da0e7cc =
> kwin/options.h 8069d7b =
> kwin/options.cpp 50db58d =
> kwin/scene-fragment.glsl 4b5424b =
> kwin/scene.h be3acc4 =
> kwin/scene.cpp 28136b6 =
> kwin/scene_opengl.h dce2b7c =
> kwin/scene_opengl.cpp 3f130b9 =
> =
> Diff: http://git.reviewboard.kde.org/r/106141/diff/
> =
> =
> Testing
> -------
> =
> Restarted KDED making sure Kolor-Manager is installed properly - this sho=
uld make the KDED module available.
> =
> Restarted KWin, enabled color correction in KCM compositing, advanced tab.
> =
> Played a bit with commands like:
> oyranos-monitor -d 0 XYZ.icc
> oyranos-monitor -d 1 Lab.icc
> Those set up particular profiles for the monitors. However, it seems ther=
e is a problem with reverting to the normal ones. The code regarding that i=
s taken directly from CompICC, so I don't know whether it's a bug or a feat=
ure. Anyway, it's from Kolor-Server.
> =
> Apparently, everything works as planned. But I cannot distinguish visible=
differences for the profiles used for the different monitors by default.
> =
> =
> After testing with the newest Oyranos, there is an issue at login, the cu=
stom color profiles are not loaded at first because of an issue in Oyranos =
probably. It will be fixed soon.
> =
> =
> Screenshots
> -----------
> =
> Output 0 Lab.icc Output 1 XYZ.icc
> http://git.reviewboard.kde.org/r/106141/s/695/
> =
> =
> Thanks,
> =
> Casian Andrei
> =
>
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/106141/">http://git.reviewboard.kde.org/r/106141/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On October 25th, 2012, 5:59 p.m., <b>Martin \
Gräßlin</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;"> <pre style="white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Today is soft feature freeze. If you want to get this into 4.10 it needs \
to end on the feature plan today.</pre> </blockquote>
<p>On October 25th, 2012, 7:21 p.m., <b>Kai-Uwe Behrmann</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">added here: \
http://techbase.kde.org/Schedules/KDE4/4.10_Feature_Plan</pre> </blockquote>
<p>On October 26th, 2012, 6:47 p.m., <b>Casian Andrei</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I thought the work on \
this was finished since weeks ago. Is there something still missing?
I don't realize which of the issues are still remaining. Perhaps there are some \
which I didn't fix properly? Or I forgot about them?
And I can't fix when I don't understand the issue.
I will merge the latest changes from KWin tomorrow and update the review request \
again.</pre> </blockquote>
<p>On October 27th, 2012, 6:12 a.m., <b>Martin Gräßlin</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">the most important \
question is: what's the state of the kded module?</pre> </blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The KDED module is \
working ok, since the end of the SoC project. But there were a couple glitches with \
the new version of Oyranos a couple of days ago and that is why I couldn't give a \
clear answer at that time.
The KDED module is incorporated inside Kolor-Manager. Currently it has no connections \
to the rest of Kolor-Manager, but that might change in the future. So, the idea is, \
when you install kolormanager, you also install the KDED module.
Those glitches from a couple of days ago were an opportunity to test what happens \
when errors occur and make the KDED module (kolor-server) sturdier. But, at this \
moment, it doesn't have any notifications when things go wrong - just nothing \
happens.
I should update the wiki page soon...</pre>
<br />
<p>- Casian</p>
<br />
<p>On October 27th, 2012, 9:56 a.m., Casian Andrei wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for kwin, Thomas Lübking and Martin Gräßlin.</div>
<div>By Casian Andrei.</div>
<p style="color: grey;"><i>Updated Oct. 27, 2012, 9:56 a.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">These are the results of my GSoC project, for KWin.
This color correction needs KolorManager installed, master branch. That one needs \
Oyranos and additional color management dependencies. \
git://anongit.kde.org/kolor-manager.git http://www.oyranos.org/downloads
If it's not installed, the ColorCorrection class should fail without causing any \
issues to the user (that's if it's enabled from the KCM). Probably a \
notification could be appropriate in that case? "Failed to initialize CC because \
cannot contact Kolor-Server KDED..." something like that?
Change summary:
--
Add an option to kcmcompositing in the 'Advanced' tab, to enable or disable \
color correction. It is specified that it's experimental and it needs Kolor \
Manager. This implies some small changes to options.h and cpp.
Scene::finalPaintWindow code is moved into SceneOpenGL::performPaint.
SceneOpenGL has the declarations of some methods changed to include the screen number \
- those could be changed to pass around PaintData's probably. SceneOpenGL's \
newly implemented finalDrawWindow splits the rendering if color correction is enabled \
and there are multiple screens. Before painting for a particular screen, \
ColorCorrection::setupForOutput should be called.
There was a problem with the blending function causing artifacts with color \
correction enabled so it is set up to src_alpha, one_minus_src alpha in that case.
Now, inside KWinEffects:
--
A screen property is added for WindowPaintData.
In kwinglutils, The fragment shaders are intercepted before being compiled and they \
get a couple of lines of code inserted in order to do the color stuff. This happens \
only when color correction is enabled, of course.
And there is the big ColorCorrection class. The public and private stuff are well \
separated.
The private stuff consists of the private data and the D-Bus interface. Regarding \
D-Bus, everything is async.
The implementation basically manages a set of color lookup tables for different \
outputs and for different window regions. These are taken via D-Bus. Each lookup \
table has around 700 KB. I hope I am not wrong in assuming it's not that big of \
an issue time-wise, since they are transferred only once or twice for an entire \
session. I hope D-Bus doesn't do any time consuming business to transfer those \
QVector's.
In case of problems, it should not affect the rest of KWin in any way.
Next priorities:
--
Implement per-window-region stuff. It should be a matter of extending \
KolorServer's capabilities and doing some small modifications in \
SceneOpenGL::Window. The ColorCorrection class from KWinEffects has everything \
prepared. </pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Restarted KDED making sure Kolor-Manager is installed properly - this \
should make the KDED module available.
Restarted KWin, enabled color correction in KCM compositing, advanced tab.
Played a bit with commands like:
oyranos-monitor -d 0 XYZ.icc
oyranos-monitor -d 1 Lab.icc
Those set up particular profiles for the monitors. However, it seems there is a \
problem with reverting to the normal ones. The code regarding that is taken directly \
from CompICC, so I don't know whether it's a bug or a feature. Anyway, \
it's from Kolor-Server.
Apparently, everything works as planned. But I cannot distinguish visible differences \
for the profiles used for the different monitors by default.
After testing with the newest Oyranos, there is an issue at login, the custom color \
profiles are not loaded at first because of an issue in Oyranos probably. It will be \
fixed soon.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>kwin/kcmkwin/kwincompositing/main.cpp <span style="color: \
grey">(7a89db4)</span></li>
<li>kwin/kcmkwin/kwincompositing/main.ui <span style="color: \
grey">(cff0f63)</span></li>
<li>kwin/libkwineffects/CMakeLists.txt <span style="color: \
grey">(f95d40e)</span></li>
<li>kwin/libkwineffects/kwineffects.h <span style="color: \
grey">(eb09d51)</span></li>
<li>kwin/libkwineffects/kwineffects.cpp <span style="color: \
grey">(9cd9987)</span></li>
<li>kwin/libkwineffects/kwinglcolorcorrection.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>kwin/libkwineffects/kwinglcolorcorrection.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>kwin/libkwineffects/kwinglcolorcorrection_p.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>kwin/libkwineffects/kwinglplatform.h <span style="color: \
grey">(249ecdb)</span></li>
<li>kwin/libkwineffects/kwinglplatform.cpp <span style="color: \
grey">(59ce7b2)</span></li>
<li>kwin/libkwineffects/kwinglutils.h <span style="color: \
grey">(9b175b9)</span></li>
<li>kwin/libkwineffects/kwinglutils.cpp <span style="color: \
grey">(da0e7cc)</span></li>
<li>kwin/options.h <span style="color: grey">(8069d7b)</span></li>
<li>kwin/options.cpp <span style="color: grey">(50db58d)</span></li>
<li>kwin/scene-fragment.glsl <span style="color: grey">(4b5424b)</span></li>
<li>kwin/scene.h <span style="color: grey">(be3acc4)</span></li>
<li>kwin/scene.cpp <span style="color: grey">(28136b6)</span></li>
<li>kwin/scene_opengl.h <span style="color: grey">(dce2b7c)</span></li>
<li>kwin/scene_opengl.cpp <span style="color: grey">(3f130b9)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/106141/diff/" style="margin-left: \
3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Screenshots </h1>
<div>
<a href="http://git.reviewboard.kde.org/r/106141/s/695/"><img \
src="http://git.reviewboard.kde.org/media/uploaded/images/2012/08/23/cc_alter_6_400x100.png" \
style="border: 1px black solid;" alt="Output 0 Lab.icc Output 1 XYZ.icc" /></a>
</div>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
kwin mailing list
kwin@kde.org
https://mail.kde.org/mailman/listinfo/kwin
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic