diff options
authorwm4 <wm4@nowhere>2013-11-23 22:28:39 +0100
committerwm4 <wm4@nowhere>2013-11-23 22:28:39 +0100
commit5a3e01fa80b2b129fe55d82247c12e6609cc052c (patch)
parentf99aff1b31a7b23e7761a6da4fc4550d698e06fe (diff)
vd_lavc: when falling back to software, revert filter error status
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.
1 files changed, 2 insertions, 0 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index c8a7cd322e..a7ebc22b20 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -808,6 +808,8 @@ static struct mp_image *decode_with_fallback(struct dec_video *vd,
init_avctx(vd, decoder, NULL);
if (ctx->avctx) {
mpi = NULL;
+ if (vd->vf_initialized < 0)
+ vd->vf_initialized = 0;
decode(vd, packet, flags, reordered_pts, &mpi);
return mpi;