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

hwdec/dmabuf_interop: reduce magic constant use

This commit is contained in:
sfan5 2024-02-25 11:24:51 +01:00
parent 73556036a2
commit bbbc0e248b
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/hwdec/dmabuf_interop.h
View File

@ -38,7 +38,7 @@ struct dmabuf_interop {
struct dmabuf_interop_priv {
int num_planes;
struct mp_image layout;
struct ra_tex *tex[4];
struct ra_tex *tex[AV_DRM_MAX_PLANES];
AVDRMFrameDescriptor desc;
bool surface_acquired;

17
video/out/hwdec/dmabuf_interop_gl.c
View File

@ -52,10 +52,10 @@ typedef void *EGLImageKHR;
#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A
struct vaapi_gl_mapper_priv {
GLuint gl_textures[4];
EGLImageKHR images[4];
GLuint gl_textures[AV_DRM_MAX_PLANES];
EGLImageKHR images[AV_DRM_MAX_PLANES];
const struct ra_format *planes[4];
const struct ra_format *planes[AV_DRM_MAX_PLANES];
EGLImageKHR (EGLAPIENTRY *CreateImageKHR)(EGLDisplay, EGLContext,
EGLenum, EGLClientBuffer,
@ -72,7 +72,7 @@ static bool gl_create_textures(struct ra_hwdec_mapper *mapper)
struct vaapi_gl_mapper_priv *p = p_mapper->interop_mapper_priv;
GL *gl = ra_gl_get(mapper->ra);
gl->GenTextures(4, p->gl_textures);
gl->GenTextures(AV_DRM_MAX_PLANES, p->gl_textures);
for (int n = 0; n < p_mapper->num_planes; n++) {
gl->BindTexture(GL_TEXTURE_2D, p->gl_textures[n]);
gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@ -109,8 +109,8 @@ static void gl_delete_textures(const struct ra_hwdec_mapper *mapper)
struct vaapi_gl_mapper_priv *p = p_mapper->interop_mapper_priv;
GL *gl = ra_gl_get(mapper->ra);
gl->DeleteTextures(4, p->gl_textures);
for (int n = 0; n < 4; n++) {
gl->DeleteTextures(AV_DRM_MAX_PLANES, p->gl_textures);
for (int n = 0; n < AV_DRM_MAX_PLANES; n++) {
p->gl_textures[n] = 0;
ra_tex_free(mapper->ra, &p_mapper->tex[n]);
}
@ -143,6 +143,9 @@ static bool vaapi_gl_mapper_init(struct ra_hwdec_mapper *mapper,
return false;
}
static_assert(MP_ARRAY_SIZE(desc->planes) == AV_DRM_MAX_PLANES, "");
static_assert(MP_ARRAY_SIZE(mapper->tex) == AV_DRM_MAX_PLANES, "");
// remember format to allow texture recreation
for (int n = 0; n < desc->num_planes; n++) {
p->planes[n] = desc->planes[n];
@ -325,7 +328,7 @@ static void vaapi_gl_unmap(struct ra_hwdec_mapper *mapper)
gl_delete_textures(mapper);
}
for (int n = 0; n < 4; n++) {
for (int n = 0; n < AV_DRM_MAX_PLANES; n++) {
if (p->images[n])
p->DestroyImageKHR(eglGetCurrentDisplay(), p->images[n]);
p->images[n] = 0;

2
video/out/hwdec/dmabuf_interop_pl.c
View File

@ -110,7 +110,7 @@ static bool vaapi_pl_map(struct ra_hwdec_mapper *mapper,
static void vaapi_pl_unmap(struct ra_hwdec_mapper *mapper)
{
for (int n = 0; n < 4; n++)
for (int n = 0; n < MP_ARRAY_SIZE(mapper->tex); n++)
ra_tex_free(mapper->ra, &mapper->tex[n]);
}