diff options
| author | wm4 <wm4@nowhere> | 2019-11-02 23:00:49 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-11-02 23:00:49 +0100 |
| commit | 67e17f1104761cd27cfa690d1d5f69d99db081ed (patch) | |
| tree | f250c18d4851ead81d8bc174226b005364a1425b /video | |
| parent | 0e1cfe0c421699ab7fbf6f17b83721d28135a0b8 (diff) | |
| download | mpv-67e17f1104761cd27cfa690d1d5f69d99db081ed.tar.bz2 mpv-67e17f1104761cd27cfa690d1d5f69d99db081ed.tar.xz | |
vd_lavc: don't keep packets for fallbacks if errors are tolerated
The user can raise the number of tolerated hardware decoding errors. On
the other hand, we have a static limit on packets that are "saved" for
fallback handling (and that's a good idea to avoid unbounded memory
usage). In this case, it could happen that the start of a file was fine
after a fallback, but after that buffered amount of data, it would
suddenly skip.
It's more useful to skip buffering entirely if the number of tolerated
decoding errors exceeds the fixed buffer.
(And also, I'm sure nobody gives a shit about this feature.)
Diffstat (limited to 'video')
| -rw-r--r-- | video/decode/vd_lavc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index fbb0e9c137..92065fde0c 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -993,7 +993,9 @@ static int send_packet(struct mp_filter *vd, struct demux_packet *pkt) if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) return ret; - if (ctx->hw_probing && ctx->num_sent_packets < 32) { + if (ctx->hw_probing && ctx->num_sent_packets < 32 && + ctx->opts->software_fallback <= 32) + { pkt = pkt ? demux_copy_packet(pkt) : NULL; MP_TARRAY_APPEND(ctx, ctx->sent_packets, ctx->num_sent_packets, pkt); } |