RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 12:17:12 +00:00
Code Issues Releases Wiki Activity

sws_utils: use zimg by default if available

Browse Source 
This seems stable enough to use. Change the default, and remove it from
the sw-fast profile.
This commit is contained in:
wm4 2020-02-12 18:06:53 +01:00
parent 7c8b40c38a
commit c3f93f5fdd
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DOCS/man/options.rst
View File

@ -4026,9 +4026,10 @@ Software Scaler
``--sws-allow-zimg=<yes|no>`` ``--sws-allow-zimg=<yes|no>``
Allow using zimg (if the component using the internal swscale wrapper Allow using zimg (if the component using the internal swscale wrapper
explicitly allows so). In this case, zimg *may* be used, if the internal explicitly allows so) (default: yes). In this case, zimg *may* be used, if
zimg wrapper supports the input and output formats. It will silently the internal zimg wrapper supports the input and output formats. It will
fall back to libswscale if one of these conditions does not apply. 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 If zimg is used, the other ``--sws-`` options are ignored, and the
``--zimg-`` options are used instead. ``--zimg-`` options are used instead.
@ -4041,9 +4042,7 @@ Software Scaler
.. note:: .. note::
The builtin ``sws-fast`` profile (which you are supposed to use when you Do note that zimg *may* be slower than libswscale. Usually,
use a VO that uses software conversion on weak hardware) sets this
option. But 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 it's faster on x86 platforms, but slower on ARM (due to lack of ARM
specific optimizations). The mpv zimg wrapper uses unoptimized repacking specific optimizations). The mpv zimg wrapper uses unoptimized repacking
for some formats, for which zimg cannot be blamed. for some formats, for which zimg cannot be blamed.

1
etc/builtin.conf
View File

@ -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. # For VOs which use software scalers, also affects screenshots and others.
sws-scaler=bilinear sws-scaler=bilinear
sws-fast=yes sws-fast=yes
sws-allow-zimg=yes
zimg-scaler=bilinear zimg-scaler=bilinear
zimg-dither=no zimg-dither=no

1
video/sws_utils.c
View File

@ -83,6 +83,7 @@ const struct m_sub_options sws_conf = {
.size = sizeof(struct sws_opts), .size = sizeof(struct sws_opts),
.defaults = &(const struct sws_opts){ .defaults = &(const struct sws_opts){
.scaler = SWS_LANCZOS, .scaler = SWS_LANCZOS,
.zimg = 1,
}, },
}; };