summaryrefslogtreecommitdiffstats
path: root/video/out/opengl/video.c
diff options
context:
space:
mode:
authorNicholas J. Kain <nicholas@kain.us>2017-03-04 20:13:18 -0500
committerRostislav Pehlivanov <atomnuker@gmail.com>2017-03-06 03:31:40 +0000
commite22604135534e90b257a7575fb500b5762fc6423 (patch)
treeb689e4a4bdbe74a7ae381fed4fff9adfe606c988 /video/out/opengl/video.c
parent69cc9f2a2c970610df0ea961998d494f69ef73c0 (diff)
downloadmpv-e22604135534e90b257a7575fb500b5762fc6423.tar.bz2
mpv-e22604135534e90b257a7575fb500b5762fc6423.tar.xz
filter_kernels: Keep f.radius in terms of dest/filter coords.
The existing code modifies f.radius so that it is in terms of the filter sample radius (in the source coordinate space) and has some small errors because of this behavior. This commit changes f.radius so that it is always in terms of the filter function radius (in the destination coordinate space). The sample radius can always be derived by multiplying f.radius by filter_scale, which is the new, more descriptive name for the previous inv_scale.
Diffstat (limited to 'video/out/opengl/video.c')
-rw-r--r--video/out/opengl/video.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index 013d27c291..3a19858953 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -3400,6 +3400,9 @@ void gl_video_configure_queue(struct gl_video *p, struct vo *vo)
const struct filter_kernel *kernel =
mp_find_filter_kernel(p->opts.scaler[SCALER_TSCALE].kernel.name);
if (kernel) {
+ // filter_scale wouldn't be correctly initialized were we to use it here.
+ // This is fine since we're always upsampling, but beware if downsampling
+ // is added!
double radius = kernel->f.radius;
radius = radius > 0 ? radius : p->opts.scaler[SCALER_TSCALE].radius;
queue_size += 1 + ceil(radius);