RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vd_lavc: repeatedly attempt to fallback if hwdec fails in reinit 

In the same way that fallback in receive_frame() needs to be repeated
until we get a working decoder, we have to do the same thing in
reinit(). Calling force_fallback() only once can still yield a non
functional decoder.

The reason why we have these multiple paths which each require their
own fallback logic is that we can fail at different stages:
* hwdec init
* decoder init <- repeated fallback was missing here
* frame decoding

Fixes #12084
This commit is contained in:
Philip Langdale 2023-08-06 11:41:14 +08:00 committed by Philip Langdale
parent 6729285502
commit e8144ac231
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
video/decode/vd_lavc.c
View File

@ -659,8 +659,11 @@ static void reinit(struct mp_filter *vd)
bool use_hwdec = ctx->use_hwdec; bool use_hwdec = ctx->use_hwdec;
init_avctx(vd); init_avctx(vd);
if (!ctx->avctx && use_hwdec) if (!ctx->avctx && use_hwdec) {
force_fallback(vd); do {
force_fallback(vd);
} while (!ctx->avctx);
}
} }
static void init_avctx(struct mp_filter *vd) static void init_avctx(struct mp_filter *vd)