path: root/video/csputils.h
diff options
authorNiklas Haas <>2017-06-17 01:55:08 +0200
committerwm4 <wm4@nowhere>2017-06-18 20:54:44 +0200
commitc3f32f3a6e3486093eb17518146a6459a34c0c41 (patch)
treec6fbc9ea3695a5aef4a53151041fe2dbaae2bfd8 /video/csputils.h
parent6a4ce39648a7d93d9f06ec4f39254bd54ef7d408 (diff)
vo_opengl: tone map in linear XYZ instead of RGB
This preserves channel balance better and helps reduce discoloration due to nonlinear tone mapping. I wasn't sure whether to stuff this inside pass_color_manage or pass_tone_map but decided for the former because adding the extra mp_csp_prim would have made the signature of the latter longer than 80col, and also because the `mp_get_cms_matrix` below it basically does the same thing anyway, so it doesn't look that out of place. Also why is this justification longer than the actual description of the algorithm and what it's good for?
Diffstat (limited to 'video/csputils.h')
1 files changed, 9 insertions, 0 deletions
diff --git a/video/csputils.h b/video/csputils.h
index 9e81c90ebf..8b63ac3905 100644
--- a/video/csputils.h
+++ b/video/csputils.h
@@ -218,6 +218,14 @@ struct mp_csp_col_xy {
float x, y;
+static inline float mp_xy_X(struct mp_csp_col_xy xy) {
+ return xy.x / xy.y;
+static inline float mp_xy_Z(struct mp_csp_col_xy xy) {
+ return (1 - xy.x - xy.y) / xy.y;
struct mp_csp_primaries {
struct mp_csp_col_xy red, green, blue, white;
@@ -268,6 +276,7 @@ struct mp_cmat {
float c[3];
+void mp_get_rgb2xyz_matrix(struct mp_csp_primaries space, float m[3][3]);
void mp_get_cms_matrix(struct mp_csp_primaries src, struct mp_csp_primaries dest,
enum mp_render_intent intent, float cms_matrix[3][3]);