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

f_hwtransfer: fix too aggressive preference to use direct upload format 

Well, this was thinko on last minute code simplification I made. We need
to check both input and output formats.
This commit is contained in:
Kacper Michajłow 2024-10-04 04:17:15 +02:00
parent 216abbc121
commit a6c363e8da
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
filters/f_hwtransfer.c
View File

@ -129,18 +129,23 @@ static bool select_format(struct priv *p, int input_fmt,
int *upload_fmts = &p->upload_fmts[p->fmt_upload_index[index]]; int *upload_fmts = &p->upload_fmts[p->fmt_upload_index[index]];
int num_upload_fmts = p->fmt_upload_num[index]; int num_upload_fmts = p->fmt_upload_num[index];
// Select the output format as the upload format if available to avoid double // Select the best input format from the available upload formats.
// conversion. Note that this will prevent double conversion but does not int hw_input_fmt = mp_imgfmt_select_best_list(upload_fmts, num_upload_fmts, input_fmt);
// guarantee that the conversion chain is optimal. Conversion during upload
// might already be done on hardware, in which case it may be better to // If the input format is not directly uploadable, conversion will be needed.
// prefer a lighter conversion before upload, instead of going directly to // Attempt to convert directly to the output format to avoid double conversion.
// the output format. However, such cases are uncommon, and in practice, if (input_fmt != hw_input_fmt) {
// there is no good way to predict this without hardcoding specific rules. int upload_output_fmt = mp_imgfmt_select_best_list(upload_fmts, num_upload_fmts, hw_output_fmt);
int hw_input_fmt = mp_imgfmt_select_best_list(upload_fmts, num_upload_fmts, hw_output_fmt); // Use this format only if it avoids double conversion, i.e., if we can
// upload the output format directly. If that's not the case, just use
// the best format for the input format selected earlier, as double
// conversion is unavoidable anyway. This approach prefers a closer
// conversion before upload and do remaining conversion during upload,
// which may be hardware-accelerated.
if (upload_output_fmt == hw_output_fmt)
hw_input_fmt = upload_output_fmt;
}
// Select best input format for the available upload formats otherwise.
if (hw_input_fmt != hw_output_fmt)
hw_input_fmt = mp_imgfmt_select_best_list(upload_fmts, num_upload_fmts, input_fmt);
if (!hw_input_fmt) if (!hw_input_fmt)
return false; return false;