diff options
| -rw-r--r-- | DOCS/man/options.rst | 11 | ||||
| -rw-r--r-- | etc/builtin.conf | 1 | ||||
| -rw-r--r-- | video/sws_utils.c | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 6b05a9cb36..0574831880 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -4026,9 +4026,10 @@ Software Scaler ``--sws-allow-zimg=<yes|no>`` Allow using zimg (if the component using the internal swscale wrapper - explicitly allows so). In this case, zimg *may* be used, if the internal - zimg wrapper supports the input and output formats. It will silently - fall back to libswscale if one of these conditions does not apply. + explicitly allows so) (default: yes). In this case, zimg *may* be used, if + the internal zimg wrapper supports the input and output formats. It will + silently or noisily fall back to libswscale if one of these conditions does + not apply. If zimg is used, the other ``--sws-`` options are ignored, and the ``--zimg-`` options are used instead. @@ -4041,9 +4042,7 @@ Software Scaler .. note:: - The builtin ``sws-fast`` profile (which you are supposed to use when you - use a VO that uses software conversion on weak hardware) sets this - option. But do note that zimg *may* be slower than libswscale. Usually, + Do note that zimg *may* be slower than libswscale. Usually, it's faster on x86 platforms, but slower on ARM (due to lack of ARM specific optimizations). The mpv zimg wrapper uses unoptimized repacking for some formats, for which zimg cannot be blamed. diff --git a/etc/builtin.conf b/etc/builtin.conf index 6984d57769..ce3c64f965 100644 --- a/etc/builtin.conf +++ b/etc/builtin.conf @@ -66,7 +66,6 @@ stream-buffer-size=4k # minimal buffer size; normally not needed # For VOs which use software scalers, also affects screenshots and others. sws-scaler=bilinear sws-fast=yes -sws-allow-zimg=yes zimg-scaler=bilinear zimg-dither=no diff --git a/video/sws_utils.c b/video/sws_utils.c index ce22e79e03..855c1ba821 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -83,6 +83,7 @@ const struct m_sub_options sws_conf = { .size = sizeof(struct sws_opts), .defaults = &(const struct sws_opts){ .scaler = SWS_LANCZOS, + .zimg = 1, }, }; |