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

vd_lavc: fix stall with some uses of --hwdec=copy

Browse Source 
Also a regression of the filter change. The new code is more picky about
EOF states, and it turns out the weird delay queue (used with some hwdec
copy back modes only) accidentally dropped an EOF event. It reset the
avctx before the delay queue was drained, which meant it never returned
the expected AVERROR_EOF status code.

Also don't signal EOF when copy back fails. It should just try to
continue until fallback is performed.
This commit is contained in:
wm4 2018-02-05 21:09:30 +01:00 committed by Kevin Mitchell
parent e3d93fde2f
commit 9282a34fbf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
video/decode/vd_lavc.c
View File

@ -1009,8 +1009,11 @@ static bool decode_frame(struct mp_filter *vd)
int ret = avcodec_receive_frame(avctx, ctx->pic);
if (ret == AVERROR_EOF) {
// If flushing was initialized earlier and has ended now, make it start
// over in case we get new packets at some point in the future.
reset_avctx(vd);
// over in case we get new packets at some point in the future. This
// must take the delay queue into account, so avctx returns EOF until
// the delay queue has been drained.
if (!ctx->num_delay_queue)
reset_avctx(vd);
return false;
} else if (ret < 0 && ret != AVERROR(EAGAIN)) {
handle_err(vd);
@ -1084,7 +1087,7 @@ static bool receive_frame(struct mp_filter *vd, struct mp_frame *out_frame)
MP_ERR(vd, "Could not copy back hardware decoded frame.\n");
ctx->hwdec_fail_count = INT_MAX - 1; // force fallback
handle_err(vd);
return false;
return true;
}
}