diff options
authorwm4 <wm4@nowhere>2018-02-05 21:09:30 +0100
committerKevin Mitchell <>2018-02-05 23:34:42 -0800
commit9282a34fbf718618b4fb2a19b9043ec6f104eab3 (patch)
parente3d93fde2f60c3eef9673e73d7fe156f27ee715f (diff)
vd_lavc: fix stall with some uses of --hwdec=copy
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.
1 files changed, 6 insertions, 3 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index b306e57ffa..fa07298571 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -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)) {
@@ -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
- return false;
+ return true;