1*4882a593SmuzhiyunFrom b780905b23300534554421264bb43df15881ac32 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Thu, 13 Jan 2022 09:15:54 +0800 4*4882a593SmuzhiyunSubject: [PATCH 4/6] Support PIXMAN_nv16 format 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 7*4882a593Smuzhiyun--- 8*4882a593Smuzhiyun pixman/pixman-access.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 9*4882a593Smuzhiyun pixman/pixman.c | 3 +- 10*4882a593Smuzhiyun pixman/pixman.h | 2 ++ 11*4882a593Smuzhiyun 3 files changed, 79 insertions(+), 1 deletion(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/pixman/pixman-access.c b/pixman/pixman-access.c 14*4882a593Smuzhiyunindex e7f97ea..05c1a18 100644 15*4882a593Smuzhiyun--- a/pixman/pixman-access.c 16*4882a593Smuzhiyun+++ b/pixman/pixman-access.c 17*4882a593Smuzhiyun@@ -220,6 +220,14 @@ 18*4882a593Smuzhiyun ((uint8_t *) ((bits) + offset0 + \ 19*4882a593Smuzhiyun (stride) * ((line) >> 1))) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyun+/* 22*4882a593Smuzhiyun+ * NV16 setup and access macros 23*4882a593Smuzhiyun+ */ 24*4882a593Smuzhiyun+ 25*4882a593Smuzhiyun+#define NV16_SETUP(image) NV12_SETUP(image) 26*4882a593Smuzhiyun+#define NV16_Y(line) NV12_Y(line) 27*4882a593Smuzhiyun+#define NV16_UV(line) ((uint8_t *) ((bits) + offset0 + (stride) * (line))) 28*4882a593Smuzhiyun+ 29*4882a593Smuzhiyun /* Misc. helpers */ 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun static force_inline void 32*4882a593Smuzhiyun@@ -946,6 +954,42 @@ fetch_scanline_nv12 (bits_image_t *image, 33*4882a593Smuzhiyun } 34*4882a593Smuzhiyun } 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun+static void 37*4882a593Smuzhiyun+fetch_scanline_nv16 (bits_image_t *image, 38*4882a593Smuzhiyun+ int x, 39*4882a593Smuzhiyun+ int line, 40*4882a593Smuzhiyun+ int width, 41*4882a593Smuzhiyun+ uint32_t * buffer, 42*4882a593Smuzhiyun+ const uint32_t *mask) 43*4882a593Smuzhiyun+{ 44*4882a593Smuzhiyun+ NV16_SETUP (image); 45*4882a593Smuzhiyun+ uint8_t *y_line = NV16_Y (line); 46*4882a593Smuzhiyun+ uint8_t *uv_line = NV16_UV (line); 47*4882a593Smuzhiyun+ int i; 48*4882a593Smuzhiyun+ 49*4882a593Smuzhiyun+ for (i = 0; i < width; i++) 50*4882a593Smuzhiyun+ { 51*4882a593Smuzhiyun+ int16_t y, u, v; 52*4882a593Smuzhiyun+ int32_t r, g, b; 53*4882a593Smuzhiyun+ 54*4882a593Smuzhiyun+ y = y_line[x + i] - 16; 55*4882a593Smuzhiyun+ u = uv_line[(x + i) & -2] - 128; 56*4882a593Smuzhiyun+ v = uv_line[((x + i) & -2) + 1] - 128; 57*4882a593Smuzhiyun+ 58*4882a593Smuzhiyun+ /* R = 1.164(Y - 16) + 1.596(V - 128) */ 59*4882a593Smuzhiyun+ r = 0x012b27 * y + 0x019a2e * v; 60*4882a593Smuzhiyun+ /* G = 1.164(Y - 16) - 0.813(V - 128) - 0.391(U - 128) */ 61*4882a593Smuzhiyun+ g = 0x012b27 * y - 0x00d0f2 * v - 0x00647e * u; 62*4882a593Smuzhiyun+ /* B = 1.164(Y - 16) + 2.018(U - 128) */ 63*4882a593Smuzhiyun+ b = 0x012b27 * y + 0x0206a2 * u; 64*4882a593Smuzhiyun+ 65*4882a593Smuzhiyun+ *buffer++ = 0xff000000 | 66*4882a593Smuzhiyun+ (r >= 0 ? r < 0x1000000 ? r & 0xff0000 : 0xff0000 : 0) | 67*4882a593Smuzhiyun+ (g >= 0 ? g < 0x1000000 ? (g >> 8) & 0x00ff00 : 0x00ff00 : 0) | 68*4882a593Smuzhiyun+ (b >= 0 ? b < 0x1000000 ? (b >> 16) & 0x0000ff : 0x0000ff : 0); 69*4882a593Smuzhiyun+ } 70*4882a593Smuzhiyun+} 71*4882a593Smuzhiyun+ 72*4882a593Smuzhiyun /**************************** Pixel wise fetching *****************************/ 73*4882a593Smuzhiyun 74*4882a593Smuzhiyun #ifndef PIXMAN_FB_ACCESSORS 75*4882a593Smuzhiyun@@ -1189,6 +1233,32 @@ fetch_pixel_nv12 (bits_image_t *image, 76*4882a593Smuzhiyun (b >= 0 ? b < 0x1000000 ? (b >> 16) & 0x0000ff : 0x0000ff : 0); 77*4882a593Smuzhiyun } 78*4882a593Smuzhiyun 79*4882a593Smuzhiyun+static uint32_t 80*4882a593Smuzhiyun+fetch_pixel_nv16 (bits_image_t *image, 81*4882a593Smuzhiyun+ int offset, 82*4882a593Smuzhiyun+ int line) 83*4882a593Smuzhiyun+{ 84*4882a593Smuzhiyun+ NV16_SETUP (image); 85*4882a593Smuzhiyun+ int16_t y = NV16_Y (line)[offset] - 16; 86*4882a593Smuzhiyun+ int16_t u = NV16_UV (line)[offset & -2] - 128; 87*4882a593Smuzhiyun+ int16_t v = NV16_UV (line)[(offset & -2) + 1] - 128; 88*4882a593Smuzhiyun+ int32_t r, g, b; 89*4882a593Smuzhiyun+ 90*4882a593Smuzhiyun+ /* R = 1.164(Y - 16) + 1.596(V - 128) */ 91*4882a593Smuzhiyun+ r = 0x012b27 * y + 0x019a2e * v; 92*4882a593Smuzhiyun+ 93*4882a593Smuzhiyun+ /* G = 1.164(Y - 16) - 0.813(V - 128) - 0.391(U - 128) */ 94*4882a593Smuzhiyun+ g = 0x012b27 * y - 0x00d0f2 * v - 0x00647e * u; 95*4882a593Smuzhiyun+ 96*4882a593Smuzhiyun+ /* B = 1.164(Y - 16) + 2.018(U - 128) */ 97*4882a593Smuzhiyun+ b = 0x012b27 * y + 0x0206a2 * u; 98*4882a593Smuzhiyun+ 99*4882a593Smuzhiyun+ return 0xff000000 | 100*4882a593Smuzhiyun+ (r >= 0 ? r < 0x1000000 ? r & 0xff0000 : 0xff0000 : 0) | 101*4882a593Smuzhiyun+ (g >= 0 ? g < 0x1000000 ? (g >> 8) & 0x00ff00 : 0x00ff00 : 0) | 102*4882a593Smuzhiyun+ (b >= 0 ? b < 0x1000000 ? (b >> 16) & 0x0000ff : 0x0000ff : 0); 103*4882a593Smuzhiyun+} 104*4882a593Smuzhiyun+ 105*4882a593Smuzhiyun /*********************************** Store ************************************/ 106*4882a593Smuzhiyun 107*4882a593Smuzhiyun #ifndef PIXMAN_FB_ACCESSORS 108*4882a593Smuzhiyun@@ -1672,6 +1742,11 @@ static const format_info_t accessors[] = 109*4882a593Smuzhiyun fetch_pixel_nv12, fetch_pixel_generic_float, 110*4882a593Smuzhiyun NULL, NULL }, 111*4882a593Smuzhiyun 112*4882a593Smuzhiyun+ { PIXMAN_nv16, 113*4882a593Smuzhiyun+ fetch_scanline_nv16, fetch_scanline_generic_float, 114*4882a593Smuzhiyun+ fetch_pixel_nv16, fetch_pixel_generic_float, 115*4882a593Smuzhiyun+ NULL, NULL }, 116*4882a593Smuzhiyun+ 117*4882a593Smuzhiyun { PIXMAN_null }, 118*4882a593Smuzhiyun }; 119*4882a593Smuzhiyun 120*4882a593Smuzhiyundiff --git a/pixman/pixman.c b/pixman/pixman.c 121*4882a593Smuzhiyunindex ac06002..cd7479a 100644 122*4882a593Smuzhiyun--- a/pixman/pixman.c 123*4882a593Smuzhiyun+++ b/pixman/pixman.c 124*4882a593Smuzhiyun@@ -1072,6 +1072,7 @@ pixman_format_supported_source (pixman_format_code_t format) 125*4882a593Smuzhiyun case PIXMAN_yv12: 126*4882a593Smuzhiyun case PIXMAN_i420: 127*4882a593Smuzhiyun case PIXMAN_nv12: 128*4882a593Smuzhiyun+ case PIXMAN_nv16: 129*4882a593Smuzhiyun return TRUE; 130*4882a593Smuzhiyun 131*4882a593Smuzhiyun default: 132*4882a593Smuzhiyun@@ -1095,7 +1096,7 @@ pixman_format_supported_destination (pixman_format_code_t format) 133*4882a593Smuzhiyun { 134*4882a593Smuzhiyun /* YUV formats cannot be written to at the moment */ 135*4882a593Smuzhiyun if (format == PIXMAN_yuy2 || format == PIXMAN_yv12 || 136*4882a593Smuzhiyun- format == PIXMAN_nv12 || format == PIXMAN_i420) 137*4882a593Smuzhiyun+ format == PIXMAN_nv12 || format == PIXMAN_i420 || format == PIXMAN_nv16) 138*4882a593Smuzhiyun return FALSE; 139*4882a593Smuzhiyun 140*4882a593Smuzhiyun return pixman_format_supported_source (format); 141*4882a593Smuzhiyundiff --git a/pixman/pixman.h b/pixman/pixman.h 142*4882a593Smuzhiyunindex e8b0a78..2ff0d7f 100644 143*4882a593Smuzhiyun--- a/pixman/pixman.h 144*4882a593Smuzhiyun+++ b/pixman/pixman.h 145*4882a593Smuzhiyun@@ -864,6 +864,7 @@ struct pixman_indexed 146*4882a593Smuzhiyun /* HACK: Use maximum value to avoid conflict */ 147*4882a593Smuzhiyun #define PIXMAN_TYPE_NV12 0x3f 148*4882a593Smuzhiyun #define PIXMAN_TYPE_I420 0x3e 149*4882a593Smuzhiyun+#define PIXMAN_TYPE_NV16 0x3d 150*4882a593Smuzhiyun 151*4882a593Smuzhiyun #define PIXMAN_FORMAT_COLOR(f) \ 152*4882a593Smuzhiyun (PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_ARGB || \ 153*4882a593Smuzhiyun@@ -945,6 +946,7 @@ typedef enum { 154*4882a593Smuzhiyun 155*4882a593Smuzhiyun /* YUV formats */ 156*4882a593Smuzhiyun PIXMAN_yuy2 = PIXMAN_FORMAT(16,PIXMAN_TYPE_YUY2,0,0,0,0), 157*4882a593Smuzhiyun+ PIXMAN_nv16 = PIXMAN_FORMAT(16,PIXMAN_TYPE_NV16,0,0,0,0), 158*4882a593Smuzhiyun PIXMAN_yv12 = PIXMAN_FORMAT(12,PIXMAN_TYPE_YV12,0,0,0,0), 159*4882a593Smuzhiyun PIXMAN_i420 = PIXMAN_FORMAT(12,PIXMAN_TYPE_I420,0,0,0,0), 160*4882a593Smuzhiyun PIXMAN_nv12 = PIXMAN_FORMAT(12,PIXMAN_TYPE_NV12,0,0,0,0), 161*4882a593Smuzhiyun-- 162*4882a593Smuzhiyun2.20.1 163*4882a593Smuzhiyun 164