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

vo_gpu: hwdec_vaapi: Suppress format errors when probing 

Today, we normally see a format error when probing because yuyv422
cannot be used, but it's in the normal set of probed formats.

This error is distracting and confusing, so only log probing errors
at the VERBOSE level.

Fixes #6411
This commit is contained in:
Philip Langdale 2019-06-16 10:31:25 -07:00 committed by sfan5
parent b70ed35ba4
commit b33ced193e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
video/out/hwdec/hwdec_vaapi.c
View File

@ -417,7 +417,8 @@ static int mapper_map(struct ra_hwdec_mapper *mapper)
VA_EXPORT_SURFACE_READ_ONLY |
VA_EXPORT_SURFACE_SEPARATE_LAYERS,
&p->desc);
if (!CHECK_VA_STATUS(mapper, "vaExportSurfaceHandle()")) {
if (!CHECK_VA_STATUS_LEVEL(mapper, "vaExportSurfaceHandle()",
p_owner->probing_formats ? MSGL_V : MSGL_ERR)) {
if (status == VA_STATUS_ERROR_UNIMPLEMENTED)
p->esh_not_implemented = true;
goto esh_failed;

7
video/vaapi.h
View File

@ -36,9 +36,12 @@ struct mp_vaapi_ctx {
void (*destroy_native_ctx)(void *native_ctx);
};
#define CHECK_VA_STATUS(ctx, msg) \
#define CHECK_VA_STATUS_LEVEL(ctx, msg, level) \
(status == VA_STATUS_SUCCESS ? true \
: (MP_ERR(ctx, "%s failed (%s)\n", msg, vaErrorStr(status)), false))
: (MP_MSG(ctx, level, "%s failed (%s)\n", msg, vaErrorStr(status)), false))
#define CHECK_VA_STATUS(ctx, msg) \
CHECK_VA_STATUS_LEVEL(ctx, msg, MSGL_ERR)
int va_get_colorspace_flag(enum mp_csp csp);