diff options
| author |  Niklas Haas <git@nand.wakku.to> | 2016-05-30 12:30:23 +0200 |
|---|---|---|
| committer |  wm4 <wm4@nowhere> | 2016-05-30 16:58:22 +0200 |
| commit | 48015009b7f8073de1a81cf9624c104f071496bc (patch) | |
| tree | e6fae680dde239f8a25fe2ec4fd3fd738e66591d /video | |
| parent | 899d3e55b341874cce5145db3511fcaa166dc50b (diff) | |
vo_opengl: rename tone-mapping=simple to reinhard
This is the canonical name for the algorithm. I simply didn't know it
before.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/opengl/video.c | 8 | ||||
| -rw-r--r-- | video/out/opengl/video.h | 2 | ||||
| -rw-r--r-- | video/out/opengl/video_shaders.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index 130f569295..7bfcf17e2a 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -383,10 +383,10 @@ const struct m_sub_options gl_video_conf = { OPT_CHOICE_C("target-trc", target_trc, 0, mp_csp_trc_names), OPT_INTRANGE("target-brightness", target_brightness, 0, 1, 100000), OPT_CHOICE("hdr-tone-mapping", hdr_tone_mapping, 0, - ({"clip", TONE_MAPPING_CLIP}, - {"simple", TONE_MAPPING_SIMPLE}, - {"gamma", TONE_MAPPING_GAMMA}, - {"linear", TONE_MAPPING_LINEAR})), + ({"clip", TONE_MAPPING_CLIP}, + {"reinhard", TONE_MAPPING_REINHARD}, + {"gamma", TONE_MAPPING_GAMMA}, + {"linear", TONE_MAPPING_LINEAR})), OPT_FLOAT("tone-mapping-param", tone_mapping_param, 0), OPT_FLAG("pbo", pbo, 0), SCALER_OPTS("scale", SCALER_SCALE), diff --git a/video/out/opengl/video.h b/video/out/opengl/video.h index 01c0cca78b..5b837ca3ad 100644 --- a/video/out/opengl/video.h +++ b/video/out/opengl/video.h @@ -105,7 +105,7 @@ enum prescalers { enum tone_mapping { TONE_MAPPING_CLIP, - TONE_MAPPING_SIMPLE, + TONE_MAPPING_REINHARD, TONE_MAPPING_GAMMA, TONE_MAPPING_LINEAR, }; diff --git a/video/out/opengl/video_shaders.c b/video/out/opengl/video_shaders.c index 1999172ee7..911bf377c7 100644 --- a/video/out/opengl/video_shaders.c +++ b/video/out/opengl/video_shaders.c @@ -327,7 +327,7 @@ void pass_tone_map(struct gl_shader_cache *sc, float peak_src, float peak_dst, GLSL(color.rgb = clamp(color.rgb, 0.0, 1.0);) break; - case TONE_MAPPING_SIMPLE: { + case TONE_MAPPING_REINHARD: { float contrast = isnan(param) ? 0.5 : param, offset = (1.0 - contrast) / contrast; GLSLF("color.rgb = color.rgb / (color.rgb + vec3(%f));\n", offset); |