mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

vd_lavc: when falling back to software, revert filter error status

Browse Source 
When mpv is started with some video filters set (--vf is used), and
hardware decoding is requested, and hardware decoding would be possible,
but is prevented due to video filters that accept software formats only,
the fallback didn't work properly sometimes.

This fallback works rather violently: it tries to initialize the filter
chain, and if it fails it throws away the frame decoded using the
hardware, and retries with software. The case that didn't work was when
decoding the current packet didn't immediately lead to a new frame. Then
the filter chain wouldn't be reinitialized, and the playloop would stop
playback as soon as it encounters the error flag.

Fix this by resetting the filter error flag (back to "uninitialized"),
which is a rather violent, but somewhat working solution.

The fallback in general should perhaps be cleaned up later.

Conflicts:
	video/decode/vd_lavc.c
This commit is contained in:
wm4 2013-11-23 22:28:39 +01:00
parent fc465f1f26
commit 600193749d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/decode/vd_lavc.c
View File

@ -791,6 +791,8 @@ static struct mp_image *decode_with_fallback(struct sh_video *sh,
init_avctx(sh, decoder, NULL);
if (ctx->avctx) {
mpi = NULL;
if (sh->vf_initialized < 0)
sh->vf_initialized = 0;
decode(sh, packet, flags, reordered_pts, &mpi);
return mpi;
}