summaryrefslogtreecommitdiffstats
path: root/video/out/gpu/video.h
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2018-10-17 11:23:16 +0200
committersfan5 <sfan5@live.de>2018-10-19 22:58:01 +0200
commit7ad60a7c5e8dd05e6097fd24e43d0f3458201eeb (patch)
tree7280f18b1a748b81354357465676edc8c0a84179 /video/out/gpu/video.h
parent448cbd472ef8154704e6ae2c0b88464b2bba54f4 (diff)
downloadmpv-7ad60a7c5e8dd05e6097fd24e43d0f3458201eeb.tar.bz2
mpv-7ad60a7c5e8dd05e6097fd24e43d0f3458201eeb.tar.xz
vo_gpu: split --linear-scaling into two separate options
Since linear downscaling makes sense to handle independently from linear/sigmoid upscaling, we split this option up. Now, linear-downscaling is its own option that only controls linearization when downscaling and nothing more. Likewise, linear-upscaling / sigmoid-upscaling are two mutually exclusive options (the latter overriding the former) that apply only to upscaling and no longer implicitly enable linear light downscaling as well. The old behavior was very confusing, as evidenced by issues such as #6213. The current behavior should make much more sense, and only minimally breaks backwards compatibility (since using linear-scaling directly was very uncommon - most users got this for free as part of gpu-hq and relied only on that). Closes #6213.
Diffstat (limited to 'video/out/gpu/video.h')
-rw-r--r--video/out/gpu/video.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/gpu/video.h b/video/out/gpu/video.h
index 2184599582..ca8b6f65d4 100644
--- a/video/out/gpu/video.h
+++ b/video/out/gpu/video.h
@@ -112,8 +112,9 @@ struct gl_video_opts {
float tone_mapping_param;
float tone_mapping_desat;
int gamut_warning;
- int linear_scaling;
int correct_downscaling;
+ int linear_downscaling;
+ int linear_upscaling;
int sigmoid_upscaling;
float sigmoid_center;
float sigmoid_slope;