diff options
| author | Niklas Haas <git@nand.wakku.to> | 2016-05-30 19:56:58 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-05-30 20:17:33 +0200 |
| commit | 45c3e0f0d0c836158ab38db53156bb6461ad7437 (patch) | |
| tree | fa74784173edcbc2771b045947e0d64ed1b44bd9 /video/out/opengl/video_shaders.h | |
| parent | 098ff4174c6c9cc59e65c6f09b23b3adaee03983 (diff) | |
| download | mpv-45c3e0f0d0c836158ab38db53156bb6461ad7437.tar.bz2 mpv-45c3e0f0d0c836158ab38db53156bb6461ad7437.tar.xz | |
vo_opengl: refactor HDR mechanism
Instead of doing HDR tone mapping on an ad-hoc basis inside
pass_colormanage, the reference peak of an image is now part of the
image params (alongside colorspace, gamma, etc.) and tone mapping is
done whenever peak_src != peak_dst.
To get sensible behavior when mixing HDR and SDR content and displays,
target-brightness is a generic filler for "the assumed brightness of SDR
content".
This gets rid of the weird display_scaled hack, sets the framework
for multiple HDR functions with difference reference peaks, and allows
us to (in a future commit) autodetect the right source peak from
the HDR metadata.
(Apart from metadata, the source peak can also be controlled via
vf_format. For HDR content this adjusts the overall image brightness,
for SDR content it's like simulating a different exposure)
Diffstat (limited to 'video/out/opengl/video_shaders.h')
| -rw-r--r-- | video/out/opengl/video_shaders.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/opengl/video_shaders.h b/video/out/opengl/video_shaders.h index e43efadeb4..0ee3d81fb5 100644 --- a/video/out/opengl/video_shaders.h +++ b/video/out/opengl/video_shaders.h @@ -38,7 +38,7 @@ void pass_sample_oversample(struct gl_shader_cache *sc, struct scaler *scaler, void pass_linearize(struct gl_shader_cache *sc, enum mp_csp_trc trc); void pass_delinearize(struct gl_shader_cache *sc, enum mp_csp_trc trc); -void pass_tone_map(struct gl_shader_cache *sc, float peak_src, float peak_dst, +void pass_tone_map(struct gl_shader_cache *sc, float peak, enum tone_mapping algo, float param); void pass_sample_deband(struct gl_shader_cache *sc, struct deband_opts *opts, |