summaryrefslogtreecommitdiffstats
path: root/video/out/opengl/video.c
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2017-06-13 17:09:02 +0200
committerwm4 <wm4@nowhere>2017-06-18 20:54:44 +0200
commitfe1227883a865b845c0c271bafd281f288404acb (patch)
tree8f97dfd8e677bb0535c541399e3f27b3c7015a95 /video/out/opengl/video.c
parentdeb93707791092e608b1e5f8f1d1773b0057ce59 (diff)
downloadmpv-fe1227883a865b845c0c271bafd281f288404acb.tar.bz2
mpv-fe1227883a865b845c0c271bafd281f288404acb.tar.xz
csputils: rename HDR curves
st2084 and std-b67 are really weird names for PQ and HLG, which is what everybody else (including e.g. the ITU-R) calls them. Follow their example. I decided against naming them bt2020-pq and bt2020-hlg because it's not necessary in this case. The standard name is only used for the other colorspaces etc. because those literally have no other names.
Diffstat (limited to 'video/out/opengl/video.c')
-rw-r--r--video/out/opengl/video.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index 2cf5a41c0b..cdb4383011 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -2069,12 +2069,8 @@ static void pass_colormanage(struct gl_video *p, struct mp_colorspace src, bool
// limitation reasons, so we use a gamma 2.2 input curve here instead.
// We could pick any value we want here, the difference is just coding
// efficiency.
- if (trc_orig == MP_CSP_TRC_SMPTE_ST2084 ||
- trc_orig == MP_CSP_TRC_ARIB_STD_B67 ||
- trc_orig == MP_CSP_TRC_V_LOG)
- {
+ if (mp_trc_is_hdr(trc_orig))
trc_orig = MP_CSP_TRC_GAMMA22;
- }
if (gl_video_get_lut3d(p, prim_orig, trc_orig)) {
dst.primaries = prim_orig;