From edc100eee0c9b9d5c4a17bf5c05197e2143c5c81 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Wed, 21 Jan 2015 23:08:41 +0100 Subject: 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. --- video/out/filter_kernels.c | 2 +- video/out/gl_video.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'video') 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), -- cgit v1.2.3