summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@nand.wakku.to>2016-05-30 12:30:23 +0200
committerwm4 <wm4@nowhere>2016-05-30 16:58:22 +0200
commit48015009b7f8073de1a81cf9624c104f071496bc (patch)
treee6fae680dde239f8a25fe2ec4fd3fd738e66591d
parent899d3e55b341874cce5145db3511fcaa166dc50b (diff)
downloadmpv-48015009b7f8073de1a81cf9624c104f071496bc.tar.bz2
mpv-48015009b7f8073de1a81cf9624c104f071496bc.tar.xz
vo_opengl: rename tone-mapping=simple to reinhard
This is the canonical name for the algorithm. I simply didn't know it before.
-rw-r--r--DOCS/man/vo.rst8
-rw-r--r--video/out/opengl/video.c8
-rw-r--r--video/out/opengl/video.h2
-rw-r--r--video/out/opengl/video_shaders.c2
4 files changed, 10 insertions, 10 deletions
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index e3096ab46f..1f1e40ec00 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -1071,9 +1071,9 @@ Available video output drivers are:
clip
Hard-clip any out-of-range values (default)
- simple
- Very simple continuous curve. Preserves dynamic range and peak but
- uses nonlinear contrast.
+ reinhard
+ Reinhard tone mapping algorithm. Very simple continuous curve.
+ Preserves dynamic range and peak but uses nonlinear contrast.
gamma
Fits a logarithmic transfer between the tone curves.
linear
@@ -1084,7 +1084,7 @@ Available video output drivers are:
Set tone mapping parameters. Ignored if the tone mapping algorithm is
not tunable. This affects the following tone mapping algorithms:
- simple
+ reinhard
Specifies the local contrast coefficient at the display peak.
Defaults to 0.5, which means that in-gamut values will be about
half as bright as when clipping.
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);