mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gl-renderer: Support NV24 shm format 

Some HDMI input devices may provide NV24 images.

Tested with:
gst-launch-1.0 videotestsrc ! 'video/x-raw,format=NV24' ! waylandsink

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
This commit is contained in:
Jeffy Chen 2024-03-29 16:27:01 +08:00
parent a073f93aba
commit be43297679
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libweston/renderer-gl/gl-renderer.c
View File

@ -305,6 +305,17 @@ struct yuv_format_descriptor yuv_formats[] = {
.format = DRM_FORMAT_GR88,
.plane_index = 1
}}
}, {
.format = DRM_FORMAT_NV24,
.output_planes = 2,
.shader_variant = SHADER_VARIANT_Y_UV,
{{
.format = DRM_FORMAT_R8,
.plane_index = 0
}, {
.format = DRM_FORMAT_GR88,
.plane_index = 1
}}
}, {
.format = DRM_FORMAT_P010,
.output_planes = 2,
@ -4265,6 +4276,7 @@ gl_renderer_display_create(struct weston_compositor *ec,
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUV444);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_NV12);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_NV16);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_NV24);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUYV);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_XYUV8888);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_ABGR8888);

58
tests/yuv-buffer-test.c
View File

@ -352,6 +352,63 @@ nv16_create_buffer(struct client *client,
return buf;
}
/*
* 2 plane YCbCr
* plane 0 = Y plane, [7:0] Y
* plane 1 = Cr:Cb plane, [15:0] Cr:Cb little endian
* non-subsampled Cr:Cb plane
*/
static struct yuv_buffer *
nv24_create_buffer(struct client *client,
uint32_t drm_format,
pixman_image_t *rgb_image)
{
struct image_header rgb = image_header_from(rgb_image);
struct yuv_buffer *buf;
size_t bytes;
int x, y;
uint32_t *rgb_row;
uint8_t *y_base;
uint16_t *uv_base;
uint8_t *y_row;
uint16_t *uv_row;
uint32_t argb;
uint8_t cr;
uint8_t cb;
assert(drm_format == DRM_FORMAT_NV24);
/* Full size Y, non-subsampled UV */
bytes = rgb.width * rgb.height +
rgb.width * rgb.height * sizeof(uint16_t);
buf = yuv_buffer_create(client, bytes, rgb.width, rgb.height,
rgb.width, drm_format);
y_base = buf->data;
uv_base = (uint16_t *)(y_base + rgb.width * rgb.height);
for (y = 0; y < rgb.height; y++) {
rgb_row = image_header_get_row_u32(&rgb, y / 2 * 2);
y_row = y_base + y * rgb.width;
uv_row = uv_base + y * rgb.width;
for (x = 0; x < rgb.width; x++) {
/*
* 2x2 sub-sample the source image to get the same
* result as the other YUV variants, so we can use the
* same reference image for checking.
*/
argb = *(rgb_row + x / 2 * 2);
x8r8g8b8_to_ycbcr8_bt601(argb, y_row + x,
&cb, &cr);
*(uv_row + x) = ((uint16_t)cr << 8) | cb;
}
}
return buf;
}
/*
* Packed YCbCr
*
@ -484,6 +541,7 @@ static const struct yuv_case yuv_cases[] = {
{ FMT(YUV444), y_u_v_create_buffer },
{ FMT(NV12), nv12_create_buffer },
{ FMT(NV16), nv16_create_buffer },
{ FMT(NV24), nv24_create_buffer },
{ FMT(YUYV), yuyv_create_buffer },
{ FMT(XYUV8888), xyuv8888_create_buffer },
#undef FMT