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

hwtransfer: handle constraints for hwdec with NULL supported_formats 

Some hwdecs (eg: dxva) have no frames constraints and no static
supported_formats, which ends up segfaulting. This change fixes the
segfault, but also includes additional changes to avoid concluding that
direct output of hardware decoded video is impossible.

In the case where there are no frame constraints and no
supported_formats, we basically have no idea what the hardware actually
supports. Previously, we just tried to display the frame, but all the
work I did to detect incompatible formats causes this scenario to now
conclude that no formats can be displayed, and forces a HW download to
system memory.

I have made a couple of small changes to assume that direct display is
possible. If it's not, the VO will error out down the line, which is
what happened previously.
This commit is contained in:
Philip Langdale 2023-10-22 09:31:53 -07:00 committed by Philip Langdale
parent 7768c3d035
commit 05e6813eb2
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
filters/f_hwtransfer.c
View File

@ -100,6 +100,16 @@ static bool select_format(struct priv *p, int input_fmt,
return false; return false;
} }
// If there is no capability to do uploads or conversions during uploads,
// assume that directly displaying the input format works. Maybe it does,
// maybe it doesn't but at this point, it's clear that we simply don't know
// and should assume it works, rather than blocking unnecessarily.
if (p->num_fmts == 0 && p->num_upload_fmts == 0) {
*out_hw_input_fmt = input_fmt;
*out_hw_output_fmt = input_fmt;
return true;
}
// First find the closest hw input fmt. Some hwdec APIs return crazy lists of // First find the closest hw input fmt. Some hwdec APIs return crazy lists of
// "supported" formats, which then are not supported or crash (???), so // "supported" formats, which then are not supported or crash (???), so
// the this is a good way to avoid problems. // the this is a good way to avoid problems.
@ -281,8 +291,8 @@ static AVHWFramesConstraints *build_static_constraints(struct mp_hwdec_ctx *ctx)
int num_sw_formats; int num_sw_formats;
for (num_sw_formats = 0; for (num_sw_formats = 0;
ctx->supported_formats[num_sw_formats] != 0; ctx->supported_formats && ctx->supported_formats[num_sw_formats] != 0;
num_sw_formats++); num_sw_formats++);
cstr->valid_sw_formats = cstr->valid_sw_formats =
av_malloc_array(num_sw_formats + 1, av_malloc_array(num_sw_formats + 1,
@ -523,7 +533,15 @@ static bool probe_formats(struct mp_filter *f, int hw_imgfmt, bool use_conversio
return false; return false;
p->conversion_filter_name = ctx->conversion_filter_name; p->conversion_filter_name = ctx->conversion_filter_name;
return p->num_upload_fmts > 0; /*
* In the case of needing to do hardware conversion vs uploading, we will
* still consider ourselves to be successful if we see no available upload
* formats for a conversion and there is no conversion filter. This means
* that we cannot do conversions at all, and should just assume we can pass
* through whatever format we are given.
*/
return p->num_upload_fmts > 0 ||
(use_conversion_filter && !p->conversion_filter_name);
} }
struct mp_hwupload mp_hwupload_create(struct mp_filter *parent, int hw_imgfmt, struct mp_hwupload mp_hwupload_create(struct mp_filter *parent, int hw_imgfmt,