mirror of https://github.com/mpv-player/mpv
5d5fdb77e9
ad_lavc and vd_lavc use the lavc_process() helper to translate the FFmpeg push/pull API to the internal filter API (which completely mismatch, even though I'm responsible for both, just fucking kill me). This interface was "slightly" too tight. It returned only a bool indicating "progress", which was not enough to handle some cases (see following commit). While we're at it, move all state into a struct. This is only a single bool, but we get the chance to add more if needed. This fixes mpv falling asleep if decoding returns an error during draining. If decoding fails when we already sent EOF, the state machine stopped making progress. This left mpv just sitting around and doing nothing. A test case can be created with: echo $RANDOM >> image.png This makes libavformat read a proper packet plus a packet of garbage. libavcodec will decode a frame, and then return an error code. The lavc_process() wrapper could not deal with this, because there was no way to differentiate between "retry" and "send new packet". Normally, it would send a new packet, so decoding would make progress anyway. If there was "progress", we couldn't just retry, because it'd retry forever. This is made worse by the fact that it tries to decode at least two frames before starting display, meaning it will "sit around and do nothing" before the picture is displayed. Change it so that on error return, "receiving" a frame is retried. This will make it return the EOF, so everything works properly. This is a high-risk change, because all these funny bullshit exceptions for hardware decoding are in the way, and I didn't retest them. For example, if hardware decoding is enabled, it keeps a list of packets, that are fed into the decoder again if hardware decoding fails, and a software fallback is performed. Another case of horrifying accidental complexity. Fixes: #6618 |
||
|---|---|---|
| .. | ||
| f_auto_filters.c | ||
| f_auto_filters.h | ||
| f_autoconvert.c | ||
| f_autoconvert.h | ||
| f_decoder_wrapper.c | ||
| f_decoder_wrapper.h | ||
| f_demux_in.c | ||
| f_demux_in.h | ||
| f_hwtransfer.c | ||
| f_hwtransfer.h | ||
| f_lavfi.c | ||
| f_lavfi.h | ||
| f_output_chain.c | ||
| f_output_chain.h | ||
| f_swresample.c | ||
| f_swresample.h | ||
| f_swscale.c | ||
| f_swscale.h | ||
| f_utils.c | ||
| f_utils.h | ||
| filter.c | ||
| filter.h | ||
| filter_internal.h | ||
| frame.c | ||
| frame.h | ||
| user_filters.c | ||
| user_filters.h | ||