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

vo_opengl: hwdec_vaegl: use new format setup function 

Plus add a helper.
This commit is contained in:
wm4 2017-02-17 17:20:33 +01:00
parent e59e917e71
commit d8bf000d29
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
video/out/opengl/formats.c
View File

@ -303,7 +303,14 @@ int gl_bytes_per_pixel(GLenum format, GLenum type)
case GL_UNSIGNED_SHORT_8_8_REV_APPLE: return 2;
}
return gl_format_components(format) * gl_component_size(type);
return gl_component_size(type) * gl_format_components(format);
}
// The format has cleanly separated components (on byte boundaries).
bool gl_format_is_regular(const struct gl_format *fmt)
{
int bpp = gl_component_size(fmt->type) * gl_format_components(fmt->format);
return bpp == gl_bytes_per_pixel(fmt->format, fmt->type);
}
// dest = src.<w> (always using 4 components)

1
video/out/opengl/formats.h
View File

@ -51,6 +51,7 @@ const struct gl_format *gl_find_uint_format(GL *gl, int bytes_per_component,
int n_components);
const struct gl_format *gl_find_float16_format(GL *gl, int n_components);
int gl_format_type(const struct gl_format *format);
bool gl_format_is_regular(const struct gl_format *format);
GLenum gl_integer_format_to_base(GLenum format);
bool gl_is_integer_format(GLenum format);
int gl_component_size(GLenum type);

34
video/out/opengl/hwdec_vaegl.c
View File

@ -34,6 +34,7 @@
#include "video/img_fourcc.h"
#include "video/mp_image_pool.h"
#include "common.h"
#include "formats.h"
#ifndef GL_OES_EGL_image
typedef void* GLeglImageOES;
@ -319,7 +320,10 @@ static int map_frame(struct gl_hwdec *hw, struct mp_image *hw_image,
struct mp_image layout = {0};
mp_image_set_params(&layout, &hw_image->params);
mp_image_setfmt(&layout, p->current_mpfmt);
struct mp_imgfmt_desc fmt = layout.fmt;
struct gl_imgfmt_desc desc;
if (!gl_get_imgfmt_desc(gl, p->current_mpfmt, &desc))
goto err;
int drm_fmts[8] = {
// 1 bytes per component, 1-4 components
@ -338,21 +342,21 @@ static int map_frame(struct gl_hwdec *hw, struct mp_image *hw_image,
int attribs[20] = {EGL_NONE};
int num_attribs = 0;
int fmt_index = -1;
int cbits = fmt.component_bits;
if ((fmt.flags & (MP_IMGFLAG_YUV_P | MP_IMGFLAG_YUV_NV)) &&
(fmt.flags & MP_IMGFLAG_NE) && cbits >= 8 && cbits <= 16)
{
// Regular planar and semi-planar formats.
fmt_index = fmt.components[n] - 1 + 4 * ((cbits + 7) / 8 - 1);
} else if (fmt.id == IMGFMT_RGB0 || fmt.id == IMGFMT_BGR0) {
fmt_index = 3 + 4 * ((cbits + 7) / 8 - 1);
}
if (fmt_index < 0 || fmt_index >= 8 || !drm_fmts[fmt_index])
const struct gl_format *fmt = desc.planes[n];
if (gl_format_type(fmt) != MPGL_TYPE_UNORM)
goto err;
ADD_ATTRIB(EGL_LINUX_DRM_FOURCC_EXT, drm_fmts[fmt_index]);
int n_comp = gl_format_components(fmt->format);
int comp_s = gl_component_size(fmt->type);
if (!gl_format_is_regular(fmt))
goto err;
if (n_comp < 1 || n_comp > 3 || comp_s < 1 || comp_s > 2)
goto err;
int drm_fmt = drm_fmts[n_comp - 1 + (comp_s - 1) * 4];
if (!drm_fmt)
goto err;
ADD_ATTRIB(EGL_LINUX_DRM_FOURCC_EXT, drm_fmt);
ADD_ATTRIB(EGL_WIDTH, mp_image_plane_w(&layout, n));
ADD_ATTRIB(EGL_HEIGHT, mp_image_plane_h(&layout, n));
ADD_ATTRIB(EGL_DMA_BUF_PLANE0_FD_EXT, buffer_info.handle);
@ -379,6 +383,8 @@ static int map_frame(struct gl_hwdec *hw, struct mp_image *hw_image,
if (va_image->format.fourcc == VA_FOURCC_YV12)
MPSWAP(struct gl_hwdec_plane, out_frame->planes[1], out_frame->planes[2]);
snprintf(out_frame->swizzle, sizeof(out_frame->swizzle), "%s", desc.swizzle);
return 0;
err: