From 2ec79f8bb71b013af795a85f018417fbd28e8763 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Sat, 16 Sep 2023 13:12:38 +0200 Subject: [PATCH] filter_kernels: use true jinc radius For all filters. For consistency between vo_gpu and vo_gpu_next. Also makes ewa_lanczossharp less special. --- DOCS/man/options.rst | 5 ++--- video/out/filter_kernels.c | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 1203133554..f18941e78c 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -5275,9 +5275,8 @@ them. (This filter is an alias for ``jinc``-windowed ``jinc``) ``ewa_lanczossharp`` - A slightly sharpened version of ewa_lanczos, preconfigured to use an - ideal radius and parameter. If your hardware can run it, this is - probably what you should use by default. + A slightly sharpened version of ewa_lanczos. If your hardware can run + it, this is probably what you should use by default. ``mitchell`` Mitchell-Netravali. The ``B`` and ``C`` parameters can be set with diff --git a/video/out/filter_kernels.c b/video/out/filter_kernels.c index 8929b6246e..9a9d7ae46c 100644 --- a/video/out/filter_kernels.c +++ b/video/out/filter_kernels.c @@ -374,10 +374,10 @@ const struct filter_kernel mp_filter_kernels[] = { {{"lanczos", 3, sinc, .resizable = true}, .window = "sinc"}, {{"ginseng", 3, sinc, .resizable = true}, .window = "jinc"}, // Jinc filters - {{"jinc", 3, jinc, .resizable = true}, .polar = true}, - {{"ewa_lanczos", 3, jinc, .resizable = true}, .polar = true, .window = "jinc"}, - {{"ewa_hanning", 3, jinc, .resizable = true}, .polar = true, .window = "hanning" }, - {{"ewa_ginseng", 3, jinc, .resizable = true}, .polar = true, .window = "sinc"}, + {{"jinc", JINC_R3, jinc, .resizable = true}, .polar = true}, + {{"ewa_lanczos", JINC_R3, jinc, .resizable = true}, .polar = true, .window = "jinc"}, + {{"ewa_hanning", JINC_R3, jinc, .resizable = true}, .polar = true, .window = "hanning" }, + {{"ewa_ginseng", JINC_R3, jinc, .resizable = true}, .polar = true, .window = "sinc"}, // Radius is based on the true jinc radius, slightly sharpened as per // calculations by Nicolas Robidoux. Source: Imagemagick's magick/resize.c {{"ewa_lanczossharp", JINC_R3, jinc, .blur = 0.9812505644269356, .resizable = true},