mirror of https://github.com/mpv-player/mpv
vo_gpu: hwdec_vaapi: silence errors while probing
Silences warnings related to DRM format modifiers that can show up while probing formats.
This commit is contained in:
parent
8fc8df3d39
commit
da0c1b8404
|
@ -249,7 +249,7 @@ static int mapper_map(struct ra_hwdec_mapper *mapper)
|
||||||
CHECK_VA_STATUS(mapper, "vaSyncSurface()");
|
CHECK_VA_STATUS(mapper, "vaSyncSurface()");
|
||||||
p->surface_acquired = true;
|
p->surface_acquired = true;
|
||||||
|
|
||||||
if (!p_owner->interop_map(mapper))
|
if (!p_owner->interop_map(mapper, p_owner->probing_formats))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
if (p->desc.fourcc == VA_FOURCC_YV12)
|
if (p->desc.fourcc == VA_FOURCC_YV12)
|
||||||
|
|
|
@ -33,7 +33,7 @@ struct priv_owner {
|
||||||
const struct ra_imgfmt_desc *desc);
|
const struct ra_imgfmt_desc *desc);
|
||||||
void (*interop_uninit)(const struct ra_hwdec_mapper *mapper);
|
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);
|
void (*interop_unmap)(struct ra_hwdec_mapper *mapper);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,7 @@ static void vaapi_gl_mapper_uninit(const struct ra_hwdec_mapper *mapper)
|
||||||
p_mapper->desc.layers[n].pitch[plane]); \
|
p_mapper->desc.layers[n].pitch[plane]); \
|
||||||
} while (0)
|
} 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 priv *p_mapper = mapper->priv;
|
||||||
struct vaapi_gl_mapper_priv *p = p_mapper->interop_mapper_priv;
|
struct vaapi_gl_mapper_priv *p = p_mapper->interop_mapper_priv;
|
||||||
|
|
|
@ -21,8 +21,9 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "hwdec_vaapi.h"
|
#include "hwdec_vaapi.h"
|
||||||
#include "video/out/placebo/ra_pl.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;
|
struct priv *p = mapper->priv;
|
||||||
const struct pl_gpu *gpu = ra_pl_get(mapper->ra);
|
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);
|
const struct pl_tex *pltex = pl_tex_create(gpu, &tex_params);
|
||||||
|
mppl_ctx_set_log(gpu->ctx, mapper->ra->log, false);
|
||||||
if (!pltex) {
|
if (!pltex) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue