summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@nand.wakku.to>2015-02-23 17:42:49 +0100
committerNiklas Haas <git@nand.wakku.to>2015-02-23 17:42:49 +0100
commit99dfd3368d9564d39792b2f00253d92f736cec5e (patch)
tree76c5e13d852d0b1facb79b554c008b39d39005f5
parentc2c96f9b10e24f9975814f9079943c92c5856b88 (diff)
downloadmpv-99dfd3368d9564d39792b2f00253d92f736cec5e.tar.bz2
mpv-99dfd3368d9564d39792b2f00253d92f736cec5e.tar.xz
filter_kernels: rename ginseng to ewa_ginseng
This is done mainly for consistency, since all of the EWA filters share similar properties and it's important to distinguish them for documentation purposes.
-rw-r--r--DOCS/man/vo.rst2
-rw-r--r--video/out/filter_kernels.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 10019451e0..17b1d54e52 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -337,7 +337,7 @@ Available video output drivers are:
Set radius for filters listed below, must be a float number between 1.0
and 16.0. Defaults to be 3.0 if not specified.
- ``sinc``, ``lanczos``, ``ewa_lanczos``, ``ginseng``, ``blackman``, ``gaussian``
+ ``sinc``, ``lanczos``, ``ewa_lanczos``, ``ewa_ginseng``, ``blackman``, ``gaussian``
Note that depending on filter implementation details and video scaling
ratio, the radius that actually being used might be different
diff --git a/video/out/filter_kernels.c b/video/out/filter_kernels.c
index a498234c7d..e0b45afe4d 100644
--- a/video/out/filter_kernels.c
+++ b/video/out/filter_kernels.c
@@ -294,7 +294,7 @@ static double lanczos(kernel *k, double x)
return radius * sin(pix) * sin(pix / radius) / (pix * pix);
}
-static double ginseng(kernel *k, double x)
+static double ewa_ginseng(kernel *k, double x)
{
double radius = k->radius;
if (fabs(x) >= radius)
@@ -352,7 +352,7 @@ const struct filter_kernel mp_filter_kernels[] = {
{"sinc", -1, sinc},
{"ewa_lanczos", -1, ewa_lanczos, .polar = true},
{"ewa_hanning", -1, ewa_hanning, .polar = true},
- {"ginseng", -1, ginseng, .polar = true},
+ {"ewa_ginseng", -1, ewa_ginseng, .polar = true},
{"lanczos", -1, lanczos},
{"blackman", -1, blackman},
{0}