RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-19 18:05:21 +00:00
Code Issues Releases Wiki Activity

f_decoder_wrapper: retry decoding if libavcodec returns invalid state

Browse Source 
At least the libavcodec MediaCodec wrapper sometimes seems to break the
libavcodec API, and does the following sequence:

  send_packet() -> EAGAIN
  receive_frame() -> EAGAIN
  send_packet() -> OK

The libavcodec API never allows returning EAGAIN from both functions, so
we discarded packets in this case. Change it to retrying decoding, for
the sake of MediaCodec. Note that it could also happen due to internal
bugs in the vd_lavc.c hw fallback code, but if there are any remaining,
they should be fixed properly instead.

Requested.
This commit is contained in:
wm4 2018-03-21 14:55:37 +01:00
parent f81ae9c3fc
commit 0b4120919a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
filters/f_decoder_wrapper.c
View File

@ -710,8 +710,13 @@ void lavc_process(struct mp_filter *f, bool *eof_flag,
}
return;
}
if (!send(f, pkt))
MP_WARN(f, "could not consume packet\n"); // should never happen
if (!send(f, pkt)) {
// Should never happen, but can happen with broken decoders.
MP_WARN(f, "could not consume packet\n");
mp_pin_out_unread(f->ppins[0], frame);
mp_filter_wakeup(f);
return;
}
talloc_free(pkt);
mp_filter_internal_mark_progress(f);
}