diff options
| author | Niklas Haas <git@nand.wakku.to> | 2015-03-30 06:38:49 +0200 |
|---|---|---|
| committer | Niklas Haas <git@nand.wakku.to> | 2015-04-04 15:36:26 +0200 |
| commit | 8876572e2c60e8c5e59f2e8376096099aa3a8d7f (patch) | |
| tree | 7e47c0d7b4bbaf21f6e6b1e07b723d0675283bb6 | |
| parent | 34caa8b01cf9ab9050554be7cd96218c213cb3b8 (diff) | |
| download | mpv-8876572e2c60e8c5e59f2e8376096099aa3a8d7f.tar.bz2 mpv-8876572e2c60e8c5e59f2e8376096099aa3a8d7f.tar.xz | |
vo_opengl: make jinc presets resizable
No real reason this is disabled with the new configuration API.
| -rw-r--r-- | DOCS/man/vo.rst | 3 | ||||
| -rw-r--r-- | video/out/filter_kernels.c | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index f061609a5f..4b8c3d100c 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -323,9 +323,6 @@ Available video output drivers are: an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default. - Note: This filter has a fixed radius. Use ``ewa_lanczos`` if you - want to adjust it. - ``mitchell`` Mitchell-Netravali. The ``B`` and ``C`` parameters can be set with ``scale-param1`` and ``scale-param2``. This filter is very good at diff --git a/video/out/filter_kernels.c b/video/out/filter_kernels.c index d7163893ed..f4b1cfacbf 100644 --- a/video/out/filter_kernels.c +++ b/video/out/filter_kernels.c @@ -352,16 +352,16 @@ const struct filter_kernel mp_filter_kernels[] = { {{"ewa_ginseng", 3, 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", 3.2383154841662362, jinc, .blur = 0.9812505644269356}, - .polar = true, .window = "jinc"}, + {{"ewa_lanczossharp", 3.2383154841662362, jinc, .blur = 0.9812505644269356, + .resizable = true}, .polar = true, .window = "jinc"}, // Similar to the above, but softened instead. This one makes hash patterns // disappear completely. Blur determined by trial and error. - {{"ewa_lanczossoft", 3.2383154841662362, jinc, .blur = 1.015}, - .polar = true, .window = "jinc"}, + {{"ewa_lanczossoft", 3.2383154841662362, jinc, .blur = 1.015, + .resizable = true}, .polar = true, .window = "jinc"}, // Very soft (blurred) hanning-windowed jinc; removes almost all aliasing. // Blur paramater picked to match orthogonal and diagonal contributions - {{"haasnsoft", 3.2383154841662362, jinc, .blur = 1.11}, .polar = true, - .window = "hanning"}, + {{"haasnsoft", 3.2383154841662362, jinc, .blur = 1.11, .resizable = true}, + .polar = true, .window = "hanning"}, // Cubic filters {{"bicubic", 2, bicubic}}, {{"bcspline", 2, cubic_bc, .params = {0.5, 0.5} }}, |