system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-22 11:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gl-renderer: add support of WL_SHM_FORMAT_YUYV

Browse source 
This patch allow gl-renderer to accept WL_SHM_FORMAT_YUYV buffers.
This is the pixel format supported by most of the USB webcams.

v2:
 - fix hsub Vs vsub inversion

Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Vincent ABRIOU 2016-10-20 16:20:11 +02:00 committed by Daniel Stone
parent 225bf9dff1
commit e5732c7866
1 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
libweston/gl-renderer.c
View file

@ -163,7 +163,8 @@ struct gl_surface_state {
/* Extension needed for SHM YUV texture */ /* Extension needed for SHM YUV texture */
int offset[3]; /* offset per plane */ int offset[3]; /* offset per plane */
int hvsub[3]; /* horizontal vertical subsampling per plane */ int hsub[3]; /* horizontal subsampling per plane */
int vsub[3]; /* vertical subsampling per plane */
struct weston_surface *surface; struct weston_surface *surface;
@ -1272,8 +1273,8 @@ gl_renderer_flush_damage(struct weston_surface *surface)
glBindTexture(GL_TEXTURE_2D, gs->textures[j]); glBindTexture(GL_TEXTURE_2D, gs->textures[j]);
glTexImage2D(GL_TEXTURE_2D, 0, glTexImage2D(GL_TEXTURE_2D, 0,
gs->gl_format[j], gs->gl_format[j],
gs->pitch / gs->hvsub[j], gs->pitch / gs->hsub[j],
buffer->height / gs->hvsub[j], buffer->height / gs->vsub[j],
0, 0,
gs->gl_format[j], gs->gl_format[j],
gs->gl_pixel_type, gs->gl_pixel_type,
@ -1294,8 +1295,8 @@ gl_renderer_flush_damage(struct weston_surface *surface)
glBindTexture(GL_TEXTURE_2D, gs->textures[j]); glBindTexture(GL_TEXTURE_2D, gs->textures[j]);
glTexImage2D(GL_TEXTURE_2D, 0, glTexImage2D(GL_TEXTURE_2D, 0,
gs->gl_format[j], gs->gl_format[j],
gs->pitch / gs->hvsub[j], gs->pitch / gs->hsub[j],
buffer->height / gs->hvsub[j], buffer->height / gs->vsub[j],
0, 0,
gs->gl_format[j], gs->gl_format[j],
gs->gl_pixel_type, gs->gl_pixel_type,
@ -1317,10 +1318,10 @@ gl_renderer_flush_damage(struct weston_surface *surface)
for (j = 0; j < gs->num_textures; j++) { for (j = 0; j < gs->num_textures; j++) {
glBindTexture(GL_TEXTURE_2D, gs->textures[j]); glBindTexture(GL_TEXTURE_2D, gs->textures[j]);
glTexSubImage2D(GL_TEXTURE_2D, 0, glTexSubImage2D(GL_TEXTURE_2D, 0,
r.x1 / gs->hvsub[j], r.x1 / gs->hsub[j],
r.y1 / gs->hvsub[j], r.y1 / gs->vsub[j],
(r.x2 - r.x1) / gs->hvsub[j], (r.x2 - r.x1) / gs->hsub[j],
(r.y2 - r.y1) / gs->hvsub[j], (r.y2 - r.y1) / gs->vsub[j],
gs->gl_format[j], gs->gl_format[j],
gs->gl_pixel_type, gs->gl_pixel_type,
data + gs->offset[j]); data + gs->offset[j]);
@ -1374,7 +1375,8 @@ gl_renderer_attach_shm(struct weston_surface *es, struct weston_buffer *buffer,
num_planes = 1; num_planes = 1;
gs->offset[0] = 0; gs->offset[0] = 0;
gs->hvsub[0] = 1; gs->hsub[0] = 1;
gs->vsub[0] = 1;
switch (wl_shm_buffer_get_format(shm_buffer)) { switch (wl_shm_buffer_get_format(shm_buffer)) {
case WL_SHM_FORMAT_XRGB8888: case WL_SHM_FORMAT_XRGB8888:
@ -1400,12 +1402,14 @@ gl_renderer_attach_shm(struct weston_surface *es, struct weston_buffer *buffer,
pitch = wl_shm_buffer_get_stride(shm_buffer); pitch = wl_shm_buffer_get_stride(shm_buffer);
gl_pixel_type = GL_UNSIGNED_BYTE; gl_pixel_type = GL_UNSIGNED_BYTE;
num_planes = 3; num_planes = 3;
gs->offset[1] = gs->offset[0] + (pitch / gs->hvsub[0]) * gs->offset[1] = gs->offset[0] + (pitch / gs->hsub[0]) *
(buffer->height / gs->hvsub[0]); (buffer->height / gs->vsub[0]);
gs->hvsub[1] = 2; gs->hsub[1] = 2;
gs->offset[2] = gs->offset[1] + (pitch / gs->hvsub[1]) * gs->vsub[1] = 2;
(buffer->height / gs->hvsub[1]); gs->offset[2] = gs->offset[1] + (pitch / gs->hsub[1]) *
gs->hvsub[2] = 2; (buffer->height / gs->vsub[1]);
gs->hsub[2] = 2;
gs->vsub[2] = 2;
if (gr->has_gl_texture_rg) { if (gr->has_gl_texture_rg) {
gl_format[0] = GL_R8_EXT; gl_format[0] = GL_R8_EXT;
gl_format[1] = GL_R8_EXT; gl_format[1] = GL_R8_EXT;
@ -1421,8 +1425,10 @@ gl_renderer_attach_shm(struct weston_surface *es, struct weston_buffer *buffer,
pitch = wl_shm_buffer_get_stride(shm_buffer); pitch = wl_shm_buffer_get_stride(shm_buffer);
gl_pixel_type = GL_UNSIGNED_BYTE; gl_pixel_type = GL_UNSIGNED_BYTE;
num_planes = 2; num_planes = 2;
gs->offset[1] = gs->offset[0] + (pitch / gs->hvsub[0]) * (buffer->height / gs->hvsub[0]); gs->offset[1] = gs->offset[0] + (pitch / gs->hsub[0]) *
gs->hvsub[1] = 2; (buffer->height / gs->vsub[0]);
gs->hsub[1] = 2;
gs->vsub[1] = 2;
if (gr->has_gl_texture_rg) { if (gr->has_gl_texture_rg) {
gl_format[0] = GL_R8_EXT; gl_format[0] = GL_R8_EXT;
gl_format[1] = GL_RG8_EXT; gl_format[1] = GL_RG8_EXT;
@ -1431,6 +1437,19 @@ gl_renderer_attach_shm(struct weston_surface *es, struct weston_buffer *buffer,
gl_format[1] = GL_LUMINANCE_ALPHA; gl_format[1] = GL_LUMINANCE_ALPHA;
} }
break; break;
case WL_SHM_FORMAT_YUYV:
gs->shader = &gr->texture_shader_y_xuxv;
pitch = wl_shm_buffer_get_stride(shm_buffer) / 2;
gl_pixel_type = GL_UNSIGNED_BYTE;
num_planes = 2;
gs->hsub[1] = 2;
gs->vsub[1] = 1;
if (gr->has_gl_texture_rg)
gl_format[0] = GL_RG8_EXT;
else
gl_format[0] = GL_LUMINANCE_ALPHA;
gl_format[1] = GL_BGRA_EXT;
break;
default: default:
weston_log("warning: unknown shm buffer format: %08x\n", weston_log("warning: unknown shm buffer format: %08x\n",
wl_shm_buffer_get_format(shm_buffer)); wl_shm_buffer_get_format(shm_buffer));
@ -3139,6 +3158,7 @@ gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform,
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_RGB565); wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_RGB565);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUV420); wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUV420);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_NV12); wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_NV12);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUYV);
wl_signal_init(&gr->destroy_signal); wl_signal_init(&gr->destroy_signal);