3dlut and simple ICC linking support for color correction #9731
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
||
| void main() | ||
| { | ||
| vec4 rgb = process(); | ||
|
|
||
| #if defined(XBMC_3DLUT) | ||
| // FIXME: can this be optimized? |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Well if it can't be done for gles with the human ressources this pr has available ( you ;) ) - then it should be as defensive as possible for gles. As of the looks it doesn't touch gles - so theoretically this should be ok. |
|
nice! |
FernetMenta
added
Type: Feature
|
I updated the code to address the feedback above, and to apply to current master. |
|
|
||
| CMS_PRIMARIES videoFlagsToPrimaries(int flags) | ||
| { | ||
| if (flags & CONF_FLAGS_COLPRI_BT709) return CMS_PRIMARIES_BT709; |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Updated to remove the singleton. @FernetMenta - would you mind giving this another look? |
|
@laurimyllari sorry, I almost missed this. I will have a look this weekend. |
| #endif // HAVE_LCMS2 | ||
|
|
||
| // current configuration: | ||
| CMS_PRIMARIES curVideoPrimaries; |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 23, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 23, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 24, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 24, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 24, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 24, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 24, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 24, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 24, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 24, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 24, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 25, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 25, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 25, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 26, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 26, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 27, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 27, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 27, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 28, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 28, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 29, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 29, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 30, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 30, 2016
Colormanager support for was added with xbmc/xbmc#9731
bkuhls
added a commit
to bkuhls/buildroot
that referenced
this pull request
Jul 30, 2016
Colormanager support for was added with xbmc/xbmc#9731
|
@bkuhls STOP linking this PR please!!! |
|
@laurimyllari could you please update the TODO strings as we are going to beta it's best that we have proper strings. |
|
@MartijnKaijser I've created pull request #10296 with updated strings. |
| { | ||
| CLog::Log(LOGDEBUG, "CMS configuration changed, reload LUT"); | ||
| if (!LoadCLUT()) | ||
| return false; |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds a ColorManager class that supports loading madVR 3DLUT files, and loading ICC display profiles, creating source profiles and linking them.
The end user can use this to correct their display response with a 3DLUT file, or emulate other displays (with whitepoint, primaries and gamma selectable at runtime) with an ICC profile of their own display.
Code changes are in two commits. The first one implements a (hopefully) platform independent ColorManager class. If lcms2 is not available, only 3DLUT file format is supported. The second commit adds the necessary bits to the Linux OpenGL renderer, building on the previously added output stage.
The ICC profile linking is still work in progress, but I included it as it is functional and shows what can be done with it. It will also be needed if/when color management is implemented for the photo viewer. The 3DLUT files provide the best accuracy (at the cost of runtime flexibility) - ArgyllCMS is very smart and the linker here is quite simple.
Slight adjustments may be needed for #9720 - I'll update if/when that is merged to master.
One significant improvement I would like help with: it would be nice to keep the 3D lookup texture around as it takes a while to upload. It is most noticeable when running many short video clips back to back. @FernetMenta, any thoughts?
I'm still pretty new to the Kodi codebase. Any feedback is welcome.
Pinging @Memphiz and @popcornmix since my previous work broke gles - would you mind checking this out? Are there any gles platforms that could be supported, or better to just disable this and make sure not to break anything?