summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.dev>2021-11-07 11:25:27 +0100
committerNiklas Haas <git@haasn.dev>2021-11-07 11:32:57 +0100
commit459f7d4a8d7f303782e4288bdaf0b9c20c9a47a9 (patch)
tree5679ce89d0ad909cc6775acf7db425d8fb873a45
parentec16769c2d37d74d53192d422d80c8e20a708fb7 (diff)
downloadmpv-459f7d4a8d7f303782e4288bdaf0b9c20c9a47a9.tar.bz2
mpv-459f7d4a8d7f303782e4288bdaf0b9c20c9a47a9.tar.xz
vo_gpu_next: remove --builtin-scalers option
Looking at this again I'm not sure it does anything useful at all. The man page entry is also wrong: `bicubic` is not affected, only `bicubic_fast`, and those filters are not configurable anyways. So this would only ever be a debugging option, and I don't see a pressing need for it. No interface-change.rst update because it only just got added anyways.
-rw-r--r--DOCS/man/options.rst6
-rw-r--r--video/out/vo_gpu_next.c4
2 files changed, 0 insertions, 10 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 7bce292d4f..254321d6ce 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -5192,12 +5192,6 @@ them.
will reproduce the source image perfectly if no scaling is performed.
Enabled by default. Note that this option never affects ``--cscale``.
-``--builtin-scalers``
- Allow using faster built-in replacements for common scalers such as
- ``nearest``, ``bilinear`` or ``bicubic``. These have the disadvantage of
- not being configurable, unlike normal scaler kernels. Defaults to
- enabled. (This option only affects ``--vo=gpu-next``)
-
``--correct-downscaling``
When using convolution based filters, extend the filter size when
downscaling. Increases quality, but reduces performance while downscaling.
diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c
index d2d2e9d9f5..df902802ee 100644
--- a/video/out/vo_gpu_next.c
+++ b/video/out/vo_gpu_next.c
@@ -126,7 +126,6 @@ struct priv {
struct voctrl_performance_data perf;
int delayed_peak;
- int builtin_scalers;
int inter_preserve;
};
@@ -673,7 +672,6 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
}
p->params.preserve_mixing_cache = p->inter_preserve && !frame->still;
- p->params.disable_builtin_scalers = !p->builtin_scalers;
p->params.allow_delayed_peak_detect = p->delayed_peak;
// Render frame
@@ -1253,13 +1251,11 @@ const struct vo_driver video_out_gpu_next = {
.priv_size = sizeof(struct priv),
.priv_defaults = &(const struct priv) {
.delayed_peak = true,
- .builtin_scalers = true,
.inter_preserve = true,
},
.options = (const struct m_option[]) {
{"allow-delayed-peak-detect", OPT_FLAG(delayed_peak)},
- {"builtin-scalers", OPT_FLAG(builtin_scalers)},
{"interpolation-preserve", OPT_FLAG(inter_preserve)},
{"lut", OPT_STRING(lut.opt), .flags = M_OPT_FILE},
{"lut-type", OPT_CHOICE_C(lut.type, lut_types)},