From da0c1b8404fc17586dd945b013ee732cc4628a7c Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Wed, 19 May 2021 04:05:46 +0200 Subject: vo_gpu: hwdec_vaapi: silence errors while probing Silences warnings related to DRM format modifiers that can show up while probing formats. --- video/out/hwdec/hwdec_vaapi.c | 2 +- video/out/hwdec/hwdec_vaapi.h | 2 +- video/out/hwdec/hwdec_vaapi_gl.c | 2 +- video/out/hwdec/hwdec_vaapi_vk.c | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/video/out/hwdec/hwdec_vaapi.c b/video/out/hwdec/hwdec_vaapi.c index 3ed9602400..2a8e1811eb 100644 --- a/video/out/hwdec/hwdec_vaapi.c +++ b/video/out/hwdec/hwdec_vaapi.c @@ -249,7 +249,7 @@ static int mapper_map(struct ra_hwdec_mapper *mapper) CHECK_VA_STATUS(mapper, "vaSyncSurface()"); p->surface_acquired = true; - if (!p_owner->interop_map(mapper)) + if (!p_owner->interop_map(mapper, p_owner->probing_formats)) goto err; if (p->desc.fourcc == VA_FOURCC_YV12) diff --git a/video/out/hwdec/hwdec_vaapi.h b/video/out/hwdec/hwdec_vaapi.h index 471283a0ca..b060ba3bcb 100644 --- a/video/out/hwdec/hwdec_vaapi.h +++ b/video/out/hwdec/hwdec_vaapi.h @@ -33,7 +33,7 @@ struct priv_owner { const struct ra_imgfmt_desc *desc); void (*interop_uninit)(const struct ra_hwdec_mapper *mapper); - bool (*interop_map)(struct ra_hwdec_mapper *mapper); + bool (*interop_map)(struct ra_hwdec_mapper *mapper, bool probing); void (*interop_unmap)(struct ra_hwdec_mapper *mapper); }; diff --git a/video/out/hwdec/hwdec_vaapi_gl.c b/video/out/hwdec/hwdec_vaapi_gl.c index 1617167464..f29a9d9ff2 100644 --- a/video/out/hwdec/hwdec_vaapi_gl.c +++ b/video/out/hwdec/hwdec_vaapi_gl.c @@ -137,7 +137,7 @@ static void vaapi_gl_mapper_uninit(const struct ra_hwdec_mapper *mapper) p_mapper->desc.layers[n].pitch[plane]); \ } while (0) -static bool vaapi_gl_map(struct ra_hwdec_mapper *mapper) +static bool vaapi_gl_map(struct ra_hwdec_mapper *mapper, bool probing) { struct priv *p_mapper = mapper->priv; struct vaapi_gl_mapper_priv *p = p_mapper->interop_mapper_priv; diff --git a/video/out/hwdec/hwdec_vaapi_vk.c b/video/out/hwdec/hwdec_vaapi_vk.c index afb81be82a..24cdce760e 100644 --- a/video/out/hwdec/hwdec_vaapi_vk.c +++ b/video/out/hwdec/hwdec_vaapi_vk.c @@ -21,8 +21,9 @@ #include "config.h" #include "hwdec_vaapi.h" #include "video/out/placebo/ra_pl.h" +#include "video/out/placebo/utils.h" -static bool vaapi_vk_map(struct ra_hwdec_mapper *mapper) +static bool vaapi_vk_map(struct ra_hwdec_mapper *mapper, bool probing) { struct priv *p = mapper->priv; const struct pl_gpu *gpu = ra_pl_get(mapper->ra); @@ -92,7 +93,9 @@ static bool vaapi_vk_map(struct ra_hwdec_mapper *mapper) }, }; + mppl_ctx_set_log(gpu->ctx, mapper->ra->log, probing); const struct pl_tex *pltex = pl_tex_create(gpu, &tex_params); + mppl_ctx_set_log(gpu->ctx, mapper->ra->log, false); if (!pltex) { return false; } -- cgit v1.2.3