summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
authorNiklas Haas <git@nand.wakku.to>2015-01-21 23:08:41 +0100
committerNiklas Haas <git@nand.wakku.to>2015-01-21 23:08:41 +0100
commitedc100eee0c9b9d5c4a17bf5c05197e2143c5c81 (patch)
tree606c34217f6de3e7bc6e7c7964eaafd9ffa52da5 /video/out
parente7171892e7c0bc998f76a6701b1a38f2e4eb2adb (diff)
downloadmpv-edc100eee0c9b9d5c4a17bf5c05197e2143c5c81.tar.bz2
mpv-edc100eee0c9b9d5c4a17bf5c05197e2143c5c81.tar.xz
vo_opengl: make the default radius 3.0 and simplify scaler documentation
This also fixes the maximum range to 16.0, which was previously set to 32.0 and incorrectly documented as 8.0. 16 taps should be more than anybody will ever need, but it's the highest radius that's supported by all affected filters.
Diffstat (limited to 'video/out')
-rw-r--r--video/out/filter_kernels.c2
-rw-r--r--video/out/gl_video.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/video/out/filter_kernels.c b/video/out/filter_kernels.c
index d983e9318f..f2c97b4bde 100644
--- a/video/out/filter_kernels.c
+++ b/video/out/filter_kernels.c
@@ -57,7 +57,7 @@ bool mp_init_filter(struct filter_kernel *filter, const int *sizes,
double inv_scale)
{
if (filter->radius < 0)
- filter->radius = 2.0;
+ filter->radius = 3.0;
// polar filters can be of any radius, and nothing special is needed
if (filter->polar) {
filter->size = filter->radius;
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 9aacf57ae9..e3eb4d1abf 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -366,8 +366,8 @@ const struct m_sub_options gl_video_conf = {
OPT_FLOAT("lparam2", scaler_params[0][1], 0),
OPT_FLOAT("cparam1", scaler_params[1][0], 0),
OPT_FLOAT("cparam2", scaler_params[1][1], 0),
- OPT_FLOATRANGE("lradius", scaler_radius[0], 0, 1.0, 32.0),
- OPT_FLOATRANGE("cradius", scaler_radius[1], 0, 1.0, 32.0),
+ OPT_FLOATRANGE("lradius", scaler_radius[0], 0, 1.0, 16.0),
+ OPT_FLOATRANGE("cradius", scaler_radius[1], 0, 1.0, 16.0),
OPT_FLAG("scaler-resizes-only", scaler_resizes_only, 0),
OPT_FLAG("fancy-downscaling", fancy_downscaling, 0),
OPT_FLAG("sigmoid-upscaling", sigmoid_upscaling, 0),