RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-25 00:53:22 +00:00
Code Issues Releases Wiki Activity

video: remove vf_vavpp from automatic deinterlace property

Browse Source 
This reverts commit 6385a5fd1b, and in
addition removes the code that automatically inserts the vavpp filter.

The reason is the same as the commit that is being reverted: this
filter seems to trigger driver bugs. It can cause GPU freezes or
just doesn't work.

This variant of disabling the filter is better. There was no way to
add the "force" parameter to the automatically inserted filter, so
the old approach just made manual filter insertion (with the --vf
option or "vf" command) more cumbersome.
This commit is contained in:
wm4 2019-10-02 19:21:12 +02:00
parent bc03bc8214
commit 25e70f4743
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
filters/f_auto_filters.c
View File

@ -69,9 +69,6 @@ static void deint_process(struct mp_filter *f)
char *args[] = {"deint", "yes", NULL};
p->sub.filter =
mp_create_user_filter(f, MP_OUTPUT_CHAIN_VIDEO, "vdpaupp", args);
} else if (img->imgfmt == IMGFMT_VAAPI) {
p->sub.filter =
mp_create_user_filter(f, MP_OUTPUT_CHAIN_VIDEO, "vavpp", NULL);
} else if (img->imgfmt == IMGFMT_D3D11) {
p->sub.filter =
mp_create_user_filter(f, MP_OUTPUT_CHAIN_VIDEO, "d3d11vpp", NULL);

9
video/filter/vf_vavpp.c
View File

@ -54,7 +54,6 @@ struct opts {
int deint_type;
int interlaced_only;
int reversal_bug;
int force;
};
struct priv {
@ -449,13 +448,6 @@ static struct mp_filter *vf_vavpp_create(struct mp_filter *parent, void *options
p->queue = mp_refqueue_alloc(f);
if (!p->opts->force) {
MP_ERR(f, "This filter is disabled because it is known to cause GPU "
"lockups. This is a driver bug. You can override this by "
"passing force=yes as filter argument.\n");
goto error;
}
p->av_device_ref = mp_filter_load_hwdec_device(f, AV_HWDEVICE_TYPE_VAAPI);
if (!p->av_device_ref)
goto error;
@ -490,7 +482,6 @@ static const m_option_t vf_opts_fields[] = {
{"motion-compensated", 5})),
OPT_FLAG("interlaced-only", interlaced_only, 0),
OPT_FLAG("reversal-bug", reversal_bug, 0),
OPT_FLAG("force", force, 0),
{0}
};