[PATCH i-g-t v2] lib: Add non-subsampled YUV formats
Arthur Grillo
arthurgrillo at riseup.net
Thu Jan 4 13:31:32 UTC 2024
Add support to NV24, NV42, YUV444 and YVU444 non-subsampled YUV formats.
Signed-off-by: Arthur Grillo <arthurgrillo at riseup.net>
---
Changes in v2:
- Place DRM_FORMAT_NV24 below DRM_FORMAT_NV16 (Kamil)
- Link to v1: https://lore.kernel.org/r/20231228-non-ssampled-yuv-v1-1-06f8e877b566@riseup.net
---
lib/igt_color_encoding.c | 4 ++++
lib/igt_fb.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/lib/igt_color_encoding.c b/lib/igt_color_encoding.c
index a7bd2b22f73b..286784f10bbf 100644
--- a/lib/igt_color_encoding.c
+++ b/lib/igt_color_encoding.c
@@ -139,11 +139,15 @@ static const struct color_encoding_format {
{ DRM_FORMAT_NV12, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_NV16, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_NV21, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
+ { DRM_FORMAT_NV24, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
+ { DRM_FORMAT_NV42, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_NV61, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_YUV420, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_YUV422, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
+ { DRM_FORMAT_YUV444, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_YVU420, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_YVU422, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
+ { DRM_FORMAT_YVU444, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_YUYV, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_YVYU, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
{ DRM_FORMAT_UYVY, 255.f, 16.f, 235.f, 16.f, 128.f, 240.f },
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index 683eb176b7a4..b860308b1c0c 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -257,6 +257,16 @@ static const struct format_desc_struct {
.num_planes = 2, .plane_bpp = { 8, 16, },
.hsub = 2, .vsub = 2,
},
+ { .name = "NV24", .depth = -1, .drm_id = DRM_FORMAT_NV24,
+ .cairo_id = CAIRO_FORMAT_RGB24, .convert = true,
+ .num_planes = 2, .plane_bpp = { 8, 16, },
+ .hsub = 1, .vsub = 1,
+ },
+ { .name = "NV42", .depth = -1, .drm_id = DRM_FORMAT_NV42,
+ .cairo_id = CAIRO_FORMAT_RGB24, .convert = true,
+ .num_planes = 2, .plane_bpp = { 8, 16, },
+ .hsub = 1, .vsub = 1,
+ },
{ .name = "NV61", .depth = -1, .drm_id = DRM_FORMAT_NV61,
.cairo_id = CAIRO_FORMAT_RGB24, .convert = true,
.num_planes = 2, .plane_bpp = { 8, 16, },
@@ -292,6 +302,11 @@ static const struct format_desc_struct {
.num_planes = 3, .plane_bpp = { 8, 8, 8, },
.hsub = 2, .vsub = 1,
},
+ { .name = "YU24", .depth = -1, .drm_id = DRM_FORMAT_YUV444,
+ .cairo_id = CAIRO_FORMAT_RGB24, .convert = true,
+ .num_planes = 3, .plane_bpp = { 8, 8, 8, },
+ .hsub = 1, .vsub = 1,
+ },
{ .name = "YV12", .depth = -1, .drm_id = DRM_FORMAT_YVU420,
.cairo_id = CAIRO_FORMAT_RGB24, .convert = true,
.num_planes = 3, .plane_bpp = { 8, 8, 8, },
@@ -302,6 +317,11 @@ static const struct format_desc_struct {
.num_planes = 3, .plane_bpp = { 8, 8, 8, },
.hsub = 2, .vsub = 1,
},
+ { .name = "YV24", .depth = -1, .drm_id = DRM_FORMAT_YVU444,
+ .cairo_id = CAIRO_FORMAT_RGB24, .convert = true,
+ .num_planes = 3, .plane_bpp = { 8, 8, 8, },
+ .hsub = 1, .vsub = 1,
+ },
{ .name = "Y410", .depth = -1, .drm_id = DRM_FORMAT_Y410,
.cairo_id = CAIRO_FORMAT_RGBA128F, .convert = true,
.num_planes = 1, .plane_bpp = { 32, },
@@ -3395,6 +3415,8 @@ static void get_yuv_parameters(struct igt_fb *fb, struct yuv_parameters *params)
case DRM_FORMAT_NV12:
case DRM_FORMAT_NV16:
case DRM_FORMAT_NV21:
+ case DRM_FORMAT_NV24:
+ case DRM_FORMAT_NV42:
case DRM_FORMAT_NV61:
case DRM_FORMAT_P010:
case DRM_FORMAT_P012:
@@ -3405,8 +3427,10 @@ static void get_yuv_parameters(struct igt_fb *fb, struct yuv_parameters *params)
case DRM_FORMAT_YUV420:
case DRM_FORMAT_YUV422:
+ case DRM_FORMAT_YUV444:
case DRM_FORMAT_YVU420:
case DRM_FORMAT_YVU422:
+ case DRM_FORMAT_YVU444:
params->ay_inc = 1;
params->uv_inc = 1;
break;
@@ -3436,11 +3460,15 @@ static void get_yuv_parameters(struct igt_fb *fb, struct yuv_parameters *params)
case DRM_FORMAT_NV12:
case DRM_FORMAT_NV16:
case DRM_FORMAT_NV21:
+ case DRM_FORMAT_NV24:
+ case DRM_FORMAT_NV42:
case DRM_FORMAT_NV61:
case DRM_FORMAT_YUV420:
case DRM_FORMAT_YUV422:
+ case DRM_FORMAT_YUV444:
case DRM_FORMAT_YVU420:
case DRM_FORMAT_YVU422:
+ case DRM_FORMAT_YVU444:
case DRM_FORMAT_P010:
case DRM_FORMAT_P012:
case DRM_FORMAT_P016:
@@ -3468,12 +3496,14 @@ static void get_yuv_parameters(struct igt_fb *fb, struct yuv_parameters *params)
switch (fb->drm_format) {
case DRM_FORMAT_NV12:
case DRM_FORMAT_NV16:
+ case DRM_FORMAT_NV24:
params->y_offset = fb->offsets[0];
params->u_offset = fb->offsets[1];
params->v_offset = fb->offsets[1] + 1;
break;
case DRM_FORMAT_NV21:
+ case DRM_FORMAT_NV42:
case DRM_FORMAT_NV61:
params->y_offset = fb->offsets[0];
params->u_offset = fb->offsets[1] + 1;
@@ -3482,6 +3512,7 @@ static void get_yuv_parameters(struct igt_fb *fb, struct yuv_parameters *params)
case DRM_FORMAT_YUV420:
case DRM_FORMAT_YUV422:
+ case DRM_FORMAT_YUV444:
params->y_offset = fb->offsets[0];
params->u_offset = fb->offsets[1];
params->v_offset = fb->offsets[2];
@@ -3489,6 +3520,7 @@ static void get_yuv_parameters(struct igt_fb *fb, struct yuv_parameters *params)
case DRM_FORMAT_YVU420:
case DRM_FORMAT_YVU422:
+ case DRM_FORMAT_YVU444:
params->y_offset = fb->offsets[0];
params->u_offset = fb->offsets[2];
params->v_offset = fb->offsets[1];
@@ -4222,14 +4254,18 @@ static void fb_convert(struct fb_convert *cvt)
case DRM_FORMAT_NV12:
case DRM_FORMAT_NV16:
case DRM_FORMAT_NV21:
+ case DRM_FORMAT_NV24:
+ case DRM_FORMAT_NV42:
case DRM_FORMAT_NV61:
case DRM_FORMAT_UYVY:
case DRM_FORMAT_VYUY:
case DRM_FORMAT_YUV420:
case DRM_FORMAT_YUV422:
+ case DRM_FORMAT_YUV444:
case DRM_FORMAT_YUYV:
case DRM_FORMAT_YVU420:
case DRM_FORMAT_YVU422:
+ case DRM_FORMAT_YVU444:
case DRM_FORMAT_YVYU:
convert_yuv_to_rgb24(cvt);
return;
@@ -4240,14 +4276,18 @@ static void fb_convert(struct fb_convert *cvt)
case DRM_FORMAT_NV12:
case DRM_FORMAT_NV16:
case DRM_FORMAT_NV21:
+ case DRM_FORMAT_NV24:
+ case DRM_FORMAT_NV42:
case DRM_FORMAT_NV61:
case DRM_FORMAT_UYVY:
case DRM_FORMAT_VYUY:
case DRM_FORMAT_YUV420:
case DRM_FORMAT_YUV422:
+ case DRM_FORMAT_YUV444:
case DRM_FORMAT_YUYV:
case DRM_FORMAT_YVU420:
case DRM_FORMAT_YVU422:
+ case DRM_FORMAT_YVU444:
case DRM_FORMAT_YVYU:
convert_rgb24_to_yuv(cvt);
return;
@@ -4820,11 +4860,15 @@ bool igt_format_is_yuv(uint32_t drm_format)
case DRM_FORMAT_NV12:
case DRM_FORMAT_NV16:
case DRM_FORMAT_NV21:
+ case DRM_FORMAT_NV24:
+ case DRM_FORMAT_NV42:
case DRM_FORMAT_NV61:
case DRM_FORMAT_YUV420:
case DRM_FORMAT_YUV422:
+ case DRM_FORMAT_YUV444:
case DRM_FORMAT_YVU420:
case DRM_FORMAT_YVU422:
+ case DRM_FORMAT_YVU444:
case DRM_FORMAT_P010:
case DRM_FORMAT_P012:
case DRM_FORMAT_P016:
---
base-commit: 0340f23b38ce0fdab61fd0fbe5bc94cd91bcaa0d
change-id: 20231228-non-ssampled-yuv-e50c1269e225
Best regards,
--
Arthur Grillo <arthurgrillo at riseup.net>
More information about the igt-dev
mailing list