[i-g-t 12/16] lib/igt_color: Add support for 3x4 matrices
Bhanuprakash Modem
bhanuprakash.modem at intel.com
Wed Jan 3 20:22:48 UTC 2024
From: Harry Wentland <harry.wentland at amd.com>
Also add a few matrices for testing.
v2: (Bhanu)
- Move few helpers to common place to reuse
Signed-off-by: Harry Wentland <harry.wentland at amd.com>
---
lib/igt_color.c | 106 +++++++++++++++++++++++++++++++++++++++
lib/igt_color.h | 30 +++++++++++
tests/kms_color_helper.c | 24 +++++++++
tests/kms_color_helper.h | 5 ++
4 files changed, 165 insertions(+)
diff --git a/lib/igt_color.c b/lib/igt_color.c
index 5355de7ca..ea8162547 100644
--- a/lib/igt_color.c
+++ b/lib/igt_color.c
@@ -9,12 +9,57 @@
#include <errno.h>
#include <math.h>
+#include "drmtest.h"
#include "igt_color.h"
#include "igt_core.h"
#include "igt_x86.h"
const struct igt_color_tf srgb_tf = {2.4f, (float)(1/1.055), (float)(0.055/1.055), (float)(1/12.92), 0.04045f, 0, 0};
+const igt_matrix_3x4_t igt_matrix_3x4_50_desat = { {
+ 0.5, 0.25, 0.25, 0.0,
+ 0.25, 0.5, 0.25, 0.0,
+ 0.25, 0.25, 0.5, 0.0
+} };
+
+const igt_matrix_3x4_t igt_matrix_3x4_overdrive = { {
+ 1.5, 0.0, 0.0, 0.0,
+ 0.0, 1.5, 0.0, 0.0,
+ 0.0, 0.0, 1.5, 0.0
+} };
+
+const igt_matrix_3x4_t igt_matrix_3x4_oversaturate = { {
+ 1.5, -0.25, -0.25, 0.0,
+ -0.25, 1.5, -0.25, 0.0,
+ -0.25, -0.25, 1.5, 0.0
+} };
+
+#if 0
+const igt_matrix_3x4_t igt_matrix_3x4_bt709_enc = { {
+ 0.2126, 0.7152, 0.0722, 0.0,
+ -0.1146, -0.3854, 0.5, 0.0,
+ 0.5, -0.4542, -0.0458, 0.0
+} };
+
+const igt_matrix_3x4_t igt_matrix_3x4_bt709_dec = { {
+ 1.0, 0.0, 1.5748, 0.0,
+ 1.0, -0.1873, -0.4681, 0.0,
+ 1.0, 1.8556, 0.0, 0.0
+} };
+#else
+const igt_matrix_3x4_t igt_matrix_3x4_bt709_enc = { {
+ 0.2126, 0.7152, 0.0722, 0.0,
+ -0.09991, -0.33609, 0.436, 0.0,
+ 0.615, -0.55861, -0.05639, 0.0
+} };
+
+const igt_matrix_3x4_t igt_matrix_3x4_bt709_dec = { {
+ 1.0, 0.0, 1.28033, 0.0,
+ 1.0, -0.21482, -0.38059, 0.0,
+ 1.0, 2.12798, 0.0, 0.0
+} };
+#endif
+
static float clamp(float val, float min, float max)
{
return ((val < min) ? min : ((val > max) ? max : val));
@@ -71,6 +116,62 @@ void igt_color_srgb_eotf(igt_pixel_t *pixel)
pixel->b = igt_color_tf_eval(&srgb_tf, pixel->b);
}
+static void igt_color_apply_3x4_ctm(igt_pixel_t *pixel, const igt_matrix_3x4_t *matrix)
+{
+ igt_pixel_t result;
+
+ memcpy(&result, pixel, sizeof(result));
+
+ result.r = matrix->m[0] * pixel->r +
+ matrix->m[1] * pixel->g +
+ matrix->m[2] * pixel->b +
+ matrix->m[3];
+
+ result.g = matrix->m[4] * pixel->r +
+ matrix->m[5] * pixel->g +
+ matrix->m[6] * pixel->b +
+ matrix->m[7];
+
+ result.b = matrix->m[8] * pixel->r +
+ matrix->m[9] * pixel->g +
+ matrix->m[10] * pixel->b +
+ matrix->m[11];
+
+ memcpy(pixel, &result, sizeof(result));
+
+}
+
+void igt_color_ctm_3x4_50_desat(igt_pixel_t *pixel)
+{
+ /* apply a 50% desat matrix */
+ igt_color_apply_3x4_ctm(pixel, &igt_matrix_3x4_50_desat);
+}
+
+void igt_color_ctm_3x4_overdrive(igt_pixel_t *pixel)
+{
+ /* apply a 50% desat matrix */
+ igt_color_apply_3x4_ctm(pixel, &igt_matrix_3x4_overdrive);
+}
+
+void igt_color_ctm_3x4_oversaturate(igt_pixel_t *pixel)
+{
+ /* apply a 50% desat matrix */
+ igt_color_apply_3x4_ctm(pixel, &igt_matrix_3x4_oversaturate);
+}
+
+void igt_color_ctm_3x4_bt709_enc(igt_pixel_t *pixel)
+{
+ /* apply a 50% desat matrix */
+ igt_color_apply_3x4_ctm(pixel, &igt_matrix_3x4_bt709_enc);
+}
+
+void igt_color_ctm_3x4_bt709_dec(igt_pixel_t *pixel)
+{
+ /* apply a 50% desat matrix */
+ igt_color_apply_3x4_ctm(pixel, &igt_matrix_3x4_bt709_dec);
+}
+
+
int igt_color_transform_pixels(igt_fb_t *fb, igt_pixel_transform transforms[], int num_transforms)
{
uint32_t *line = NULL;
@@ -137,6 +238,11 @@ int igt_color_transform_pixels(igt_fb_t *fb, igt_pixel_transform transforms[], i
for (i = 0; i < num_transforms; i++)
transforms[i](&pixel);
+ /* clip */
+ pixel.r = fmax(fmin(pixel.r, 1.0), 0.0);
+ pixel.g = fmax(fmin(pixel.g, 1.0), 0.0);
+ pixel.b = fmax(fmin(pixel.b, 1.0), 0.0);
+
/* de-normalize back to 8-bit */
pixel.r *= (0xff);
pixel.g *= (0xff);
diff --git a/lib/igt_color.h b/lib/igt_color.h
index 4fffea2c3..d11147892 100644
--- a/lib/igt_color.h
+++ b/lib/igt_color.h
@@ -27,6 +27,29 @@ typedef struct igt_pixel {
float b;
} igt_pixel_t;
+typedef struct igt_matrix_3x4 {
+ /*
+ * out matrix in
+ * |R| |0 1 2 3 | | R |
+ * |G| = |4 5 6 7 | x | G |
+ * |B| |8 9 10 12| | B |
+ * |1.0|
+ */
+ float m[12];
+} igt_matrix_3x4_t;
+
+extern const igt_matrix_3x4_t igt_matrix_3x4_50_desat;
+extern const igt_matrix_3x4_t igt_matrix_3x4_overdrive;
+extern const igt_matrix_3x4_t igt_matrix_3x4_oversaturate;
+#if 0
+extern const igt_matrix_3x4_t igt_matrix_3x4_bt709_enc;
+extern const igt_matrix_3x4_t igt_matrix_3x4_bt709_dec;
+#else
+extern const igt_matrix_3x4_t igt_matrix_3x4_bt709_enc;
+extern const igt_matrix_3x4_t igt_matrix_3x4_bt709_dec;
+#endif
+
+
bool igt_cmp_fb_component(uint16_t comp1, uint16_t comp2, uint8_t up, uint8_t down);
bool igt_cmp_fb_pixels(igt_fb_t *fb1, igt_fb_t *fb2, uint8_t up, uint8_t down);
@@ -37,7 +60,14 @@ typedef void (*igt_pixel_transform)(igt_pixel_t *pixel);
int igt_color_transform_pixels(igt_fb_t *fb, igt_pixel_transform transforms[], int num_transforms);
+/* transformations */
+
void igt_color_srgb_inv_eotf(igt_pixel_t *pixel);
void igt_color_srgb_eotf(igt_pixel_t *pixel);
+void igt_color_ctm_3x4_50_desat(igt_pixel_t *pixel);
+void igt_color_ctm_3x4_overdrive(igt_pixel_t *pixel);
+void igt_color_ctm_3x4_oversaturate(igt_pixel_t *pixel);
+void igt_color_ctm_3x4_bt709_dec(igt_pixel_t *pixel);
+void igt_color_ctm_3x4_bt709_enc(igt_pixel_t *pixel);
#endif
diff --git a/tests/kms_color_helper.c b/tests/kms_color_helper.c
index d512b085d..60f61575f 100644
--- a/tests/kms_color_helper.c
+++ b/tests/kms_color_helper.c
@@ -521,6 +521,30 @@ void set_color_pipeline(igt_display_t *display,
}
}
+void igt_colorop_set_ctm_3x4(igt_display_t *display,
+ igt_colorop_t *colorop,
+ const igt_matrix_3x4_t *matrix)
+{
+ struct drm_color_ctm_3x4 ctm;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(ctm.matrix); i++) {
+ if (matrix->m[i] < 0) {
+ ctm.matrix[i] =
+ (int64_t) (-matrix->m[i] *
+ ((int64_t) 1L << 32));
+ ctm.matrix[i] |= 1ULL << 63;
+ } else {
+ ctm.matrix[i] =
+ (int64_t) (matrix->m[i] *
+ ((int64_t) 1L << 32));
+ }
+ }
+
+ /* set blob property */
+ igt_colorop_replace_prop_blob(colorop, IGT_COLOROP_DATA, &ctm, sizeof(ctm));
+}
+
kms_colorop_t kms_colorop_srgb_eotf = {
.type = KMS_COLOROP_ENUMERATED_LUT1D,
.enumerated_lut1d_info = {
diff --git a/tests/kms_color_helper.h b/tests/kms_color_helper.h
index cc21cb01e..24cc74a52 100644
--- a/tests/kms_color_helper.h
+++ b/tests/kms_color_helper.h
@@ -164,6 +164,11 @@ typedef int (*transform_pixel)(igt_pixel_t *pixel);
extern kms_colorop_t kms_colorop_srgb_eotf;
extern kms_colorop_t kms_colorop_srgb_inv_eotf;
+/* colorop helpers */
+
+void igt_colorop_set_ctm_3x4(igt_display_t *display,
+ igt_colorop_t *colorop,
+ const igt_matrix_3x4_t *matrix);
igt_colorop_t *get_color_pipeline(igt_display_t *display, igt_plane_t *plane,
kms_colorop_t *colorops[]);
void set_colorop(igt_display_t *display, kms_colorop_t *colorop);
--
2.40.0
More information about the Intel-gfx-trybot
mailing list