设备在升级界面文字或图像方向偏转问题修改方案(RK3399方案)
2024-06-03 12:15:01
根据实际情况，在项目目录的mk文件配置：
#rotate screen to 0, 90, 180, 270 for recovery
#0: ROTATION_NONE
#90: ROTATION_RIGHT
#180: ROTATION_DOWN
#270: ROTATION_LEFT
TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT
如：根据问题现象，需要在目前方向顺时针旋转270度后可以显示正常，则在项目目录下客制化TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT，达到预期效果。
相关patch:
From 822325166e4b8ad01a9edf6cb11a18d57e84fae9 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@sykean.com>
Date: Wed, 27 Apr 2022 18:17:02 +0800
Subject: [PATCH] Issue: RK3288-bootable：Bugfix：1080*1920 LCD屏recovery升级UI界面旋转90度后系统启动失败 Reason: 疑似和3288 sdk的旋转接口中临时内存申请有关，改小申请大小后可以正常启动但UI会花屏 Project: RK3288 Reference git: bootable.git Modify: 移植RK3399 SDK recovery流程有关文件 Test Requestment: 线刷升级及恢复出厂设置时recovery UI方向符合预期 owner: 王琦 Reviewer: 马全杰 王宇哲 Commit: none Range: 1Change-Id: I32993839f228d75b621e173a86c8a9746badb26e
---diff --git a/recovery/minui/Android.mk b/recovery/minui/Android.mk
index af1cc84..39b8113 100644
--- a/recovery/minui/Android.mk
+++ b/recovery/minui/Android.mk
@@ -13,6 +13,7 @@LOCAL_WHOLE_STATIC_LIBRARIES += libdrmLOCAL_STATIC_LIBRARIES += libpng+LOCAL_C_INCLUDES += external/libdrmLOCAL_MODULE := libminuiLOCAL_CLANG := true
@@ -31,30 +32,18 @@LOCAL_CFLAGS += -DRECOVERY_BGRAendif-#rotate screen to 0, 90, 180, 270
-#0: rotate_0
-#90: rotate_90
-#180: rotate_180
-#270: rotate_270
-ifeq ($(strip $(ROTATE_SCREEN)), rotate_0)
- LOCAL_CFLAGS += -DRotateScreen_0
-endif
-ifeq ($(strip $(ROTATE_SCREEN)), rotate_90)
- LOCAL_CFLAGS += -DRotateScreen_90
-endif
-ifeq ($(strip $(ROTATE_SCREEN)), rotate_180)
- LOCAL_CFLAGS += -DRotateScreen_180
-endif
-ifeq ($(strip $(ROTATE_SCREEN)), rotate_270)
- LOCAL_CFLAGS += -DRotateScreen_270
-endif
-ifneq ($(TARGET_RECOVERY_OVERSCAN_PERCENT),)LOCAL_CFLAGS += -DOVERSCAN_PERCENT=$(TARGET_RECOVERY_OVERSCAN_PERCENT)elseLOCAL_CFLAGS += -DOVERSCAN_PERCENT=0endif+ifneq ($(TARGET_RECOVERY_DEFAULT_ROTATION),)
+ LOCAL_CFLAGS += -DDEFAULT_ROTATION=$(TARGET_RECOVERY_DEFAULT_ROTATION)
+else
+ LOCAL_CFLAGS += -DDEFAULT_ROTATION=ROTATION_NONE
+endif
+ifeq ($(TARGET_BOARD_PLATFORM_PRODUCT),box)LOCAL_CFLAGS += -DPLATFORM_PRODUCT_BOXendif
diff --git a/recovery/minui/graphics.cpp b/recovery/minui/graphics.cpp
index bbff3cf..9d38cfe 100644
--- a/recovery/minui/graphics.cpp
+++ b/recovery/minui/graphics.cpp
@@ -14,6 +14,7 @@* limitations under the License.*/+#include <stdint.h>#include <stdbool.h>#include <stdlib.h>#include <string.h>
@@ -42,327 +43,311 @@static int overscan_offset_x = 0;static int overscan_offset_y = 0;-static unsigned char gr_current_r = 255;
-static unsigned char gr_current_g = 255;
-static unsigned char gr_current_b = 255;
-static unsigned char gr_current_a = 255;
+static uint32_t gr_current = ~0;
+static constexpr uint32_t alpha_mask = 0xff000000;static GRSurface* gr_draw = NULL;
+static GRRotation rotation = ROTATION_NONE;-//撤销旋转
-void back_no_rotate(){
-#ifdef RotateScreen_90
- rk_rotate_surface_270(gr_draw, gr_draw->width, gr_draw->height);
-#elif defined RotateScreen_180
- rk_rotate_surface_180(gr_draw);
-#elif defined RotateScreen_270
- rk_rotate_surface_90(gr_draw, gr_draw->width, gr_draw->height);
-#endif
+static bool outside(int x, int y) {
+ return x < 0 || x >= (rotation % 2 ? gr_draw->height : gr_draw->width) || y < 0 ||
+ y >= (rotation % 2 ? gr_draw->width : gr_draw->height);}-static unsigned int gr_get_draw_width(GRSurface* surface) {
- if (surface == NULL) {
- return 0;
+const GRFont* gr_sys_font() {
+ return gr_font;
+}
+
+int gr_measure(const GRFont* font, const char* s) {
+ return font->char_width * strlen(s);
+}
+
+void gr_font_size(const GRFont* font, int* x, int* y) {
+ *x = font->char_width;
+ *y = font->char_height;
+}
+
+// Blends gr_current onto pix value, assumes alpha as most significant byte.
+static inline uint32_t pixel_blend(uint8_t alpha, uint32_t pix) {
+ if (alpha == 255) return gr_current;
+ if (alpha == 0) return pix;
+ uint32_t pix_r = pix & 0xff;
+ uint32_t pix_g = pix & 0xff00;
+ uint32_t pix_b = pix & 0xff0000;
+ uint32_t cur_r = gr_current & 0xff;
+ uint32_t cur_g = gr_current & 0xff00;
+ uint32_t cur_b = gr_current & 0xff0000;
+
+ uint32_t out_r = (pix_r * (255 - alpha) + cur_r * alpha) / 255;
+ uint32_t out_g = (pix_g * (255 - alpha) + cur_g * alpha) / 255;
+ uint32_t out_b = (pix_b * (255 - alpha) + cur_b * alpha) / 255;
+
+ return (out_r & 0xff) | (out_g & 0xff00) | (out_b & 0xff0000) | (gr_current & 0xff000000);
+}
+
+// increments pixel pointer right, with current rotation.
+static void incr_x(uint32_t** p, int row_pixels) {
+ if (rotation % 2) {
+ *p = *p + (rotation == 1 ? 1 : -1) * row_pixels;
+ } else {
+ *p = *p + (rotation ? -1 : 1);
+ }
+}
+
+// increments pixel pointer down, with current rotation.
+static void incr_y(uint32_t** p, int row_pixels) {
+ if (rotation % 2) {
+ *p = *p + (rotation == 1 ? -1 : 1);
+ } else {
+ *p = *p + (rotation ? -1 : 1) * row_pixels;
+ }
+}
+
+// returns pixel pointer at given coordinates with rotation adjustment.
+static uint32_t* pixel_at(GRSurface* surf, int x, int y, int row_pixels) {
+ switch (rotation) {
+ case ROTATION_NONE:
+ return reinterpret_cast<uint32_t*>(surf->data) + y * row_pixels + x;
+ case ROTATION_RIGHT:
+ return reinterpret_cast<uint32_t*>(surf->data) + x * row_pixels + (surf->width - y);
+ case ROTATION_DOWN:
+ return reinterpret_cast<uint32_t*>(surf->data) + (surf->height - 1 - y) * row_pixels +
+ (surf->width - 1 - x);
+ case ROTATION_LEFT:
+ return reinterpret_cast<uint32_t*>(surf->data) + (surf->height - 1 - x) * row_pixels + y;
+ default:
+ printf("invalid rotation %d", rotation);
+ }
+ return nullptr;
+}
+
+static void text_blend(uint8_t* src_p, int src_row_bytes, uint32_t* dst_p, int dst_row_pixels,
+ int width, int height) {
+ uint8_t alpha_current = static_cast<uint8_t>((alpha_mask & gr_current) >> 24);
+ for (int j = 0; j < height; ++j) {
+ uint8_t* sx = src_p;
+ uint32_t* px = dst_p;
+ for (int i = 0; i < width; ++i, incr_x(&px, dst_row_pixels)) {
+ uint8_t a = *sx++;
+ if (alpha_current < 255) a = (static_cast<uint32_t>(a) * alpha_current) / 255;
+ *px = pixel_blend(a, *px);}
-#if (defined RotateScreen_90) || (defined RotateScreen_270)
- return surface->height;
-#endif
- return surface->width;
+ src_p += src_row_bytes;
+ incr_y(&dst_p, dst_row_pixels);
+ }}-static unsigned int gr_get_draw_height(GRSurface* surface) {
- if (surface == NULL) {
- return 0;
- }
-#if (defined RotateScreen_90) || (defined RotateScreen_270)
- return surface->width;
-#endif
- return surface->height;
-}
+void gr_text(const GRFont* font, int x, int y, const char* s, bool bold) {
+ if (!font || !font->texture || (gr_current & alpha_mask) == 0) return;-static unsigned int gr_get_row_bytes(GRSurface* surface){
- int row_bytes;
+ if (font->texture->pixel_bytes != 1) {
+ printf("gr_text: font has wrong format\n");
+ return;
+ }- if(surface == NULL){
- return 0;
+ bold = bold && (font->texture->height != font->char_height);
+
+ x += overscan_offset_x;
+ y += overscan_offset_y;
+
+ unsigned char ch;
+ while ((ch = *s++)) {
+ if (outside(x, y) || outside(x + font->char_width - 1, y + font->char_height - 1)) break;
+
+ if (ch < ' ' || ch > '~') {
+ ch = '?';}- row_bytes = ((gr_get_draw_width(surface)+ 15) & (~15)) * surface->pixel_bytes;
+ int row_pixels = gr_draw->row_bytes / gr_draw->pixel_bytes;
+ uint8_t* src_p = font->texture->data + ((ch - ' ') * font->char_width) +
+ (bold ? font->char_height * font->texture->row_bytes : 0);
+ uint32_t* dst_p = pixel_at(gr_draw, x, y, row_pixels);- return row_bytes;
-}
-static bool outside(int x, int y)
-{
- return x < 0 || x >= gr_get_draw_width(gr_draw) || y < 0 || y >= gr_get_draw_height(gr_draw);
-}
+ text_blend(src_p, font->texture->row_bytes, dst_p, row_pixels, font->char_width,
+ font->char_height);-const GRFont* gr_sys_font()
-{
- return gr_font;
-}
-
-int gr_measure(const GRFont* font, const char *s)
-{
- return font->char_width * strlen(s);
-}
-
-void gr_font_size(const GRFont* font, int *x, int *y)
-{
- *x = font->char_width;
- *y = font->char_height;
-}
-
-static void text_blend(unsigned char* src_p, int src_row_bytes,
- unsigned char* dst_p, int dst_row_bytes,
- int width, int height)
-{
- for (int j = 0; j < height; ++j) {
- unsigned char* sx = src_p;
- unsigned char* px = dst_p;
- for (int i = 0; i < width; ++i) {
- unsigned char a = *sx++;
- if (gr_current_a < 255) a = ((int)a * gr_current_a) / 255;
- if (a == 255) {
- *px++ = gr_current_r;
- *px++ = gr_current_g;
- *px++ = gr_current_b;
- px++;
- } else if (a > 0) {
- *px = (*px * (255-a) + gr_current_r * a) / 255;
- ++px;
- *px = (*px * (255-a) + gr_current_g * a) / 255;
- ++px;
- *px = (*px * (255-a) + gr_current_b * a) / 255;
- ++px;
- ++px;
- } else {
- px += 4;
- }
- }
- src_p += src_row_bytes;
- dst_p += dst_row_bytes;
- }
-}
-
-void gr_text(const GRFont* font, int x, int y, const char *s, bool bold)
-{
- if (!font->texture || gr_current_a == 0) return;
-
- bold = bold && (font->texture->height != font->char_height);
-
- x += overscan_offset_x;
- y += overscan_offset_y;
-
- unsigned char ch;
- while ((ch = *s++)) {
- if (outside(x, y) || outside(x+font->char_width-1, y+font->char_height-1)) break;
-
- if (ch < ' ' || ch > '~') {
- ch = '?';
- }
-
- unsigned char* src_p = font->texture->data + ((ch - ' ') * font->char_width) +
- (bold ? font->char_height * font->texture->row_bytes : 0);
-
- unsigned char* dst_p = gr_draw->data + y*gr_get_row_bytes(gr_draw) + x*gr_draw->pixel_bytes;
- text_blend(src_p, font->texture->row_bytes,dst_p, gr_get_row_bytes(gr_draw),font->char_width, font->char_height);
-
- x += font->char_width;
- }
+ x += font->char_width;
+ }}void gr_texticon(int x, int y, GRSurface* icon) {
- if (icon == NULL) return;
+ if (icon == NULL) return;- if (icon->pixel_bytes != 1) {
- printf("gr_texticon: source has wrong format\n");
- return;
- }
+ if (icon->pixel_bytes != 1) {
+ printf("gr_texticon: source has wrong format\n");
+ return;
+ }- x += overscan_offset_x;
- y += overscan_offset_y;
+ x += overscan_offset_x;
+ y += overscan_offset_y;- if (outside(x, y) || outside(x+icon->width-1, y+icon->height-1)) return;
+ if (outside(x, y) || outside(x + icon->width - 1, y + icon->height - 1)) return;- unsigned char* src_p = icon->data;
- unsigned char* dst_p = gr_draw->data + y*gr_get_row_bytes(gr_draw) + x*gr_draw->pixel_bytes;
+ int row_pixels = gr_draw->row_bytes / gr_draw->pixel_bytes;
+ uint8_t* src_p = icon->data;
+ uint32_t* dst_p = pixel_at(gr_draw, x, y, row_pixels);- text_blend(src_p, icon->row_bytes,
- dst_p, gr_get_row_bytes(gr_draw),
- icon->width, icon->height);
+ text_blend(src_p, icon->row_bytes, dst_p, row_pixels, icon->width, icon->height);}-void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
+void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a) {
+ uint32_t r32 = r, g32 = g, b32 = b, a32 = a;#if defined(RECOVERY_ABGR) || defined(RECOVERY_BGRA)
- gr_current_r = b;
- gr_current_g = g;
- gr_current_b = r;
- gr_current_a = a;
+ gr_current = (a32 << 24) | (r32 << 16) | (g32 << 8) | b32;#else
- gr_current_r = r;
- gr_current_g = g;
- gr_current_b = b;
- gr_current_a = a;
+ gr_current = (a32 << 24) | (b32 << 16) | (g32 << 8) | r32;#endif}-void gr_clear()
-{
- if (gr_current_r == gr_current_g && gr_current_r == gr_current_b) {
- memset(gr_draw->data, gr_current_r, gr_draw->height * gr_draw->row_bytes);
- } else {
- unsigned char* px = gr_draw->data;
- for (int y = 0; y < gr_draw->height; ++y) {
- for (int x = 0; x < gr_draw->width; ++x) {
- *px++ = gr_current_r;
- *px++ = gr_current_g;
- *px++ = gr_current_b;
- px++;
- }
- px += gr_draw->row_bytes - (gr_draw->width * gr_draw->pixel_bytes);
- }
+void gr_clear() {
+ if ((gr_current & 0xff) == ((gr_current >> 8) & 0xff) &&
+ (gr_current & 0xff) == ((gr_current >> 16) & 0xff) &&
+ (gr_current & 0xff) == ((gr_current >> 24) & 0xff) &&
+ gr_draw->row_bytes == gr_draw->width * gr_draw->pixel_bytes) {
+ memset(gr_draw->data, gr_current & 0xff, gr_draw->height * gr_draw->row_bytes);
+ } else {
+ uint32_t* px = reinterpret_cast<uint32_t*>(gr_draw->data);
+ int row_diff = gr_draw->row_bytes / gr_draw->pixel_bytes - gr_draw->width;
+ for (int y = 0; y < gr_draw->height; ++y) {
+ for (int x = 0; x < gr_draw->width; ++x) {
+ *px++ = gr_current;
+ }
+ px += row_diff;}
+ }}-void gr_fill(int x1, int y1, int x2, int y2)
-{
- x1 += overscan_offset_x;
- y1 += overscan_offset_y;
+void gr_fill(int x1, int y1, int x2, int y2) {
+ x1 += overscan_offset_x;
+ y1 += overscan_offset_y;- x2 += overscan_offset_x;
- y2 += overscan_offset_y;
+ x2 += overscan_offset_x;
+ y2 += overscan_offset_y;- if (outside(x1, y1) || outside(x2-1, y2-1)) return;
+ if (outside(x1, y1) || outside(x2 - 1, y2 - 1)) return;- unsigned char* p = gr_draw->data + y1 * gr_get_row_bytes(gr_draw) + x1 * gr_draw->pixel_bytes;
- if (gr_current_a == 255) {
- int x, y;
- for (y = y1; y < y2; ++y) {
- unsigned char* px = p;
- for (x = x1; x < x2; ++x) {
- *px++ = gr_current_r;
- *px++ = gr_current_g;
- *px++ = gr_current_b;
- px++;
- }
- p += gr_get_row_bytes(gr_draw);
- }
- } else if (gr_current_a > 0) {
- int x, y;
- for (y = y1; y < y2; ++y) {
- unsigned char* px = p;
- for (x = x1; x < x2; ++x) {
- *px = (*px * (255-gr_current_a) + gr_current_r * gr_current_a) / 255;
- ++px;
- *px = (*px * (255-gr_current_a) + gr_current_g * gr_current_a) / 255;
- ++px;
- *px = (*px * (255-gr_current_a) + gr_current_b * gr_current_a) / 255;
- ++px;
- ++px;
- }
- p += gr_get_row_bytes(gr_draw);
- }
+ int row_pixels = gr_draw->row_bytes / gr_draw->pixel_bytes;
+ uint32_t* p = pixel_at(gr_draw, x1, y1, row_pixels);
+ uint8_t alpha = static_cast<uint8_t>(((gr_current & alpha_mask) >> 24));
+ if (alpha > 0) {
+ for (int y = y1; y < y2; ++y) {
+ uint32_t* px = p;
+ for (int x = x1; x < x2; ++x) {
+ *px = pixel_blend(alpha, *px);
+ incr_x(&px, row_pixels);
+ }
+ incr_y(&p, row_pixels);}
+ }}void gr_blit(GRSurface* source, int sx, int sy, int w, int h, int dx, int dy) {
- if (source == NULL) return;
+ if (source == NULL) return;- if (gr_draw->pixel_bytes != source->pixel_bytes) {
- printf("gr_blit: source has wrong format\n");
- return;
+ if (gr_draw->pixel_bytes != source->pixel_bytes) {
+ printf("gr_blit: source has wrong format\n");
+ return;
+ }
+
+ dx += overscan_offset_x;
+ dy += overscan_offset_y;
+
+ if (outside(dx, dy) || outside(dx + w - 1, dy + h - 1)) return;
+
+ if (rotation) {
+ int src_row_pixels = source->row_bytes / source->pixel_bytes;
+ int row_pixels = gr_draw->row_bytes / gr_draw->pixel_bytes;
+ uint32_t* src_py = reinterpret_cast<uint32_t*>(source->data) + sy * source->row_bytes / 4 + sx;
+ uint32_t* dst_py = pixel_at(gr_draw, dx, dy, row_pixels);
+
+ for (int y = 0; y < h; y += 1) {
+ uint32_t* src_px = src_py;
+ uint32_t* dst_px = dst_py;
+ for (int x = 0; x < w; x += 1) {
+ *dst_px = *src_px++;
+ incr_x(&dst_px, row_pixels);
+ }
+ src_py += src_row_pixels;
+ incr_y(&dst_py, row_pixels);}
-
- dx += overscan_offset_x;
- dy += overscan_offset_y;
-
- while (outside(dx, dy) || outside(dx+w-1, dy+h-1)){
- return ;
- w = w - 4;
- if(outside(dx, dy)){
- return ;
- }
- }
-
- unsigned char* src_p = source->data + sy*source->row_bytes + sx*source->pixel_bytes;
- unsigned char* dst_p = gr_draw->data + dy*gr_get_row_bytes(gr_draw) + dx*gr_draw->pixel_bytes;
+ } else {
+ unsigned char* src_p = source->data + sy * source->row_bytes + sx * source->pixel_bytes;
+ unsigned char* dst_p = gr_draw->data + dy * gr_draw->row_bytes + dx * gr_draw->pixel_bytes;int i;for (i = 0; i < h; ++i) {
- memcpy(dst_p, src_p, w * source->pixel_bytes);
- src_p += source->row_bytes;
- dst_p += gr_get_row_bytes(gr_draw);
+ memcpy(dst_p, src_p, w * source->pixel_bytes);
+ src_p += source->row_bytes;
+ dst_p += gr_draw->row_bytes;}
+ }}unsigned int gr_get_width(GRSurface* surface) {
- if (surface == NULL) {
- return 0;
- }
- return surface->width;
+ if (surface == NULL) {
+ return 0;
+ }
+ return surface->width;}unsigned int gr_get_height(GRSurface* surface) {
- if (surface == NULL) {
- return 0;
- }
- return surface->height;
+ if (surface == NULL) {
+ return 0;
+ }
+ return surface->height;}int gr_init_font(const char* name, GRFont** dest) {
- GRFont* font = reinterpret_cast<GRFont*>(calloc(1, sizeof(*gr_font)));
- if (font == nullptr) {
- return -1;
- }
+ GRFont* font = static_cast<GRFont*>(calloc(1, sizeof(*gr_font)));
+ if (font == nullptr) {
+ return -1;
+ }- int res = res_create_alpha_surface(name, &(font->texture));
- if (res < 0) {
- free(font);
- return res;
- }
+ int res = res_create_alpha_surface(name, &(font->texture));
+ if (res < 0) {
+ free(font);
+ return res;
+ }- // The font image should be a 96x2 array of character images. The
- // columns are the printable ASCII characters 0x20 - 0x7f. The
- // top row is regular text; the bottom row is bold.
- font->char_width = font->texture->width / 96;
- font->char_height = font->texture->height / 2;
+ // The font image should be a 96x2 array of character images. The
+ // columns are the printable ASCII characters 0x20 - 0x7f. The
+ // top row is regular text; the bottom row is bold.
+ font->char_width = font->texture->width / 96;
+ font->char_height = font->texture->height / 2;- *dest = font;
+ *dest = font;- return 0;
+ return 0;}-static void gr_init_font(void)
-{
- int res = gr_init_font("font", &gr_font);
- if (res == 0) {
- return;
- }
+static void gr_init_font(void) {
+ int res = gr_init_font("font", &gr_font);
+ if (res == 0) {
+ return;
+ }- printf("failed to read font: res=%d\n", res);
+ printf("failed to read font: res=%d\n", res);+ // fall back to the compiled-in font.
+ gr_font = static_cast<GRFont*>(calloc(1, sizeof(*gr_font)));
+ gr_font->texture = static_cast<GRSurface*>(malloc(sizeof(*gr_font->texture)));
+ gr_font->texture->width = font.width;
+ gr_font->texture->height = font.height;
+ gr_font->texture->row_bytes = font.width;
+ gr_font->texture->pixel_bytes = 1;- // fall back to the compiled-in font.
- gr_font = reinterpret_cast<GRFont*>(calloc(1, sizeof(*gr_font)));
- gr_font->texture = reinterpret_cast<GRSurface*>(malloc(sizeof(*gr_font->texture)));
- gr_font->texture->width = font.width;
- gr_font->texture->height = font.height;
- gr_font->texture->row_bytes = font.width;
- gr_font->texture->pixel_bytes = 1;
+ unsigned char* bits = static_cast<unsigned char*>(malloc(font.width * font.height));
+ gr_font->texture->data = bits;- unsigned char* bits = reinterpret_cast<unsigned char*>(malloc(font.width * font.height));
- gr_font->texture->data = reinterpret_cast<unsigned char*>(bits);
+ unsigned char data;
+ unsigned char* in = font.rundata;
+ while ((data = *in++)) {
+ memset(bits, (data & 0x80) ? 255 : 0, data & 0x7f);
+ bits += (data & 0x7f);
+ }- unsigned char data;
- unsigned char* in = font.rundata;
- while((data = *in++)) {
- memset(bits, (data & 0x80) ? 255 : 0, data & 0x7f);
- bits += (data & 0x7f);
- }
-
- gr_font->char_width = font.char_width;
- gr_font->char_height = font.char_height;
+ gr_font->char_width = font.char_width;
+ gr_font->char_height = font.char_height;}#if 0
@@ -449,6 +434,12 @@gr_flip();gr_flip();+ gr_rotate(DEFAULT_ROTATION);
+
+ if (gr_draw->pixel_bytes != 4) {
+ printf("gr_init: Only 4-byte pixel formats supported\n");
+ }
+return 0;}@@ -457,17 +448,22 @@gr_backend->exit(gr_backend);}-int gr_fb_width(void)
-{
- return (gr_get_draw_width(gr_draw) - 2*overscan_offset_x);
+int gr_fb_width() {
+ return rotation % 2 ? gr_draw->height - 2 * overscan_offset_y
+ : gr_draw->width - 2 * overscan_offset_x;}-int gr_fb_height(void)
-{
- return (gr_get_draw_height(gr_draw) - 2*overscan_offset_y);
+int gr_fb_height() {
+ return rotation % 2 ? gr_draw->width - 2 * overscan_offset_x
+ : gr_draw->height - 2 * overscan_offset_y;}void gr_fb_blank(bool blank){gr_backend->blank(gr_backend, blank);}
+
+void gr_rotate(GRRotation rot) {
+ printf("gr_rotate: rot=%d\n", rot);
+ rotation = rot;
+}
diff --git a/recovery/minui/graphics.h b/recovery/minui/graphics.h
index 0a06f9a..52968eb 100644
--- a/recovery/minui/graphics.h
+++ b/recovery/minui/graphics.h
@@ -40,8 +40,4 @@minui_backend* open_adf();minui_backend* open_drm();-void rk_rotate_surface_90(GRSurface* surface, int width, int height);
-void rk_rotate_surface_180(GRSurface* surface);
-void rk_rotate_surface_270(GRSurface* surface, int width, int height);
-#endif
diff --git a/recovery/minui/graphics_drm.cpp b/recovery/minui/graphics_drm.cpp
index 6490fb8..4d7177f 100644
--- a/recovery/minui/graphics_drm.cpp
+++ b/recovery/minui/graphics_drm.cpp
@@ -30,6 +30,7 @@#include "minui.h"#include "graphics.h"
+#include "libdrm_macros.h"#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*(A)))@@ -78,7 +79,7 @@drm_disable_crtc(drm_fd, main_monitor_crtc);elsedrm_enable_crtc(drm_fd, main_monitor_crtc,
- drm_surfaces[1 - current_buffer]);
+ drm_surfaces[current_buffer]);}static void drm_destroy_surface(struct drm_surface *surface) {
@@ -193,7 +194,7 @@surface->base.row_bytes = create_dumb.pitch;surface->base.pixel_bytes = create_dumb.bpp / 8;surface->base.data = (unsigned char*)
- mmap(NULL,
+ drm_mmap(NULL,surface->base.height * surface->base.row_bytes,PROT_READ | PROT_WRITE, MAP_SHARED,drm_fd, map_dumb.offset);
@@ -443,14 +444,6 @@static GRSurface* drm_flip(minui_backend* backend __unused) {int ret;
-
-#ifdef RotateScreen_90
- rk_rotate_surface_90(&(drm_surfaces[current_buffer]->base), drm_surfaces[current_buffer]->base.height, drm_surfaces[current_buffer]->base.width);
-#elif defined RotateScreen_180
- rk_rotate_surface_180(&(drm_surfaces[current_buffer]->base));
-#elif defined RotateScreen_270
- rk_rotate_surface_270(&(drm_surfaces[current_buffer]->base), drm_surfaces[current_buffer]->base.height, drm_surfaces[current_buffer]->base.width);
-#endifret = drmModePageFlip(drm_fd, main_monitor_crtc->crtc_id,drm_surfaces[current_buffer]->fb_id, 0, NULL);
diff --git a/recovery/minui/graphics_fbdev.cpp b/recovery/minui/graphics_fbdev.cpp
index 3fd28b5..1aa1c36 100644
--- a/recovery/minui/graphics_fbdev.cpp
+++ b/recovery/minui/graphics_fbdev.cpp
@@ -53,78 +53,6 @@.exit = fbdev_exit,};-void rk_rotate_surface_90(GRSurface* surface, int width, int height){
- int byt = 4; // 4 byte for ARGB_8888 (2 byte for RGB_565)
- int draw_width = (width + 15) & (~15);
- int draw_height = (height + 15) & (~15);
- int length = draw_width * draw_height;
- unsigned char* des_data = (unsigned char *)malloc(sizeof(unsigned char)*length*byt);
- memset(des_data, 0, sizeof(unsigned char)*length*byt);
- memcpy(des_data, surface->data, sizeof(unsigned char)*length*byt);
-
- int i, j;
- int n1, n2;
- for(i = 0; i < draw_height; i++){
- for(j = 0; j < draw_width; j++){
- n1 = j*draw_height+draw_height-i-1;
- n2 = i*draw_width+j;
- surface->data[n1*byt] = des_data[n2*byt];
- surface->data[n1*byt+1] = des_data[n2*byt+1];
- surface->data[n1*byt+2] = des_data[n2*byt+2];
- surface->data[n1*byt+3] = des_data[n2*byt+3];
- }
- }
- free(des_data);
-}
-
-void rk_rotate_surface_180(GRSurface* surface)
-{
- printf("(%s:%d) --- start.\n", __func__, __LINE__);
- int draw_width = (surface->width + 15) & (~15);
- int draw_height = (surface->height + 15) & (~15);
- int byt = 4; // 4 byte for ARGB_8888 (2 byte for RGB_565)
-
- int length = draw_width * draw_height;
- unsigned char * des_data = (unsigned char *)malloc(sizeof(unsigned char)*length*byt);
- memcpy(des_data,surface->data,sizeof(unsigned char)*length*byt);
-
- memset(surface->data, 0, sizeof(unsigned char)*length*byt);
- int i = 0;
- for (i=0; i<length; i++)
- {
- surface->data[i*byt] = des_data[(length-i-1)*byt];
- surface->data[i*byt+1] = des_data[(length-i-1)*byt+1];
- surface->data[i*byt+2] = des_data[(length-i-1)*byt+2];
- surface->data[i*byt+3] = des_data[(length-i-1)*byt+3];
- }
-
- free(des_data);
-}
-
-void rk_rotate_surface_270(GRSurface* surface, int width, int height){
- int byt = 4; // 4 byte for ARGB_8888 (2 byte for RGB_565)
- int draw_width = (width + 15) & (~15);
- int draw_height = (height + 15) & (~15);
- int length = draw_width * draw_height;
- unsigned char* des_data = (unsigned char *)malloc(sizeof(unsigned char)*length*byt);
- memcpy(des_data, surface->data, sizeof(unsigned char)*length*byt);
- memset(surface->data, 0, sizeof(unsigned char)*length*byt);
- int i, j;
- int n1, n2;
- for(i = 0; i < draw_height; i++){
- for(j = 0; j < draw_width; j++){
- n1 = (draw_width-j-1)*draw_height+i;
- n2 = i*draw_width+j;
- surface->data[n1*byt] = des_data[n2*byt];
- surface->data[n1*byt+1] = des_data[n2*byt+1];
- surface->data[n1*byt+2] = des_data[n2*byt+2];
- surface->data[n1*byt+3] = des_data[n2*byt+3];
- }
- }
-
- free(des_data);
-}
-minui_backend* open_fbdev() {return &my_backend;}
@@ -272,13 +200,6 @@// then flip the driver so we're displaying the other buffer// instead.gr_draw = gr_framebuffer + displayed_buffer;
-#ifdef RotateScreen_90
- rk_rotate_surface_90(&gr_framebuffer[1-displayed_buffer], gr_framebuffer[1-displayed_buffer].height, gr_framebuffer[1-displayed_buffer].width);
-#elif defined RotateScreen_180
- rk_rotate_surface_180(&gr_framebuffer[1-displayed_buffer]);
-#elif defined RotateScreen_270
- rk_rotate_surface_270(&gr_framebuffer[1-displayed_buffer], gr_framebuffer[1-displayed_buffer].height, gr_framebuffer[1-displayed_buffer].width);
-#endifset_displayed_framebuffer(1-displayed_buffer);} else {// Copy from the in-memory surface to the framebuffer.
diff --git a/recovery/minui/minui.h b/recovery/minui/minui.h
index a72aec8..b2b9aa3 100644
--- a/recovery/minui/minui.h
+++ b/recovery/minui/minui.h
@@ -26,17 +26,24 @@//struct GRSurface {
- int width;
- int height;
- int row_bytes;
- int pixel_bytes;
- unsigned char* data;
+ int width;
+ int height;
+ int row_bytes;
+ int pixel_bytes;
+ unsigned char* data;};struct GRFont {
- GRSurface* texture;
- int char_width;
- int char_height;
+ GRSurface* texture;
+ int char_width;
+ int char_height;
+};
+
+enum GRRotation {
+ ROTATION_NONE = 0,
+ ROTATION_RIGHT = 1,
+ ROTATION_DOWN = 2,
+ ROTATION_LEFT = 3,};int gr_init();
@@ -56,15 +63,16 @@const GRFont* gr_sys_font();int gr_init_font(const char* name, GRFont** dest);
-void gr_text(const GRFont* font, int x, int y, const char *s, bool bold);
-int gr_measure(const GRFont* font, const char *s);
-void gr_font_size(const GRFont* font, int *x, int *y);
+void gr_text(const GRFont* font, int x, int y, const char* s, bool bold);
+int gr_measure(const GRFont* font, const char* s);
+void gr_font_size(const GRFont* font, int* x, int* y);void gr_blit(GRSurface* source, int sx, int sy, int w, int h, int dx, int dy);unsigned int gr_get_width(GRSurface* surface);unsigned int gr_get_height(GRSurface* surface);
-//撤销旋转
-void back_no_rotate();
+
+// Set rotation, flips gr_fb_width/height if 90 degree rotation difference
+void gr_rotate(GRRotation rotation);//// Input events.
@@ -115,8 +123,8 @@// should have a 'Frames' text chunk whose value is the number of// frames this image represents. The pixel data itself is interlaced// by row.
-int res_create_multi_display_surface(const char* name, int* frames,
- int* fps, GRSurface*** pSurface);
+int res_create_multi_display_surface(const char* name, int* frames, int* fps,
+ GRSurface*** pSurface);// Load a single alpha surface from a grayscale PNG image.int res_create_alpha_surface(const char* name, GRSurface** pSurface);
diff --git a/recovery/screen_ui.cpp b/recovery/screen_ui.cpp
index f785a6f..95b97d1 100644
--- a/recovery/screen_ui.cpp
+++ b/recovery/screen_ui.cpp
@@ -344,7 +344,6 @@// Redraw everything on the screen and flip the screen (make it visible).// Should only be called with updateMutex locked.void ScreenRecoveryUI::update_screen_locked() {
- back_no_rotate();draw_screen_locked();gr_flip();}
@@ -352,7 +351,6 @@// Updates only the progress bar, if possible, otherwise redraws the screen.// Should only be called with updateMutex locked.void ScreenRecoveryUI::update_progress_locked() {
- back_no_rotate();if (show_text || !pagesIdentical) {draw_screen_locked(); // Must redraw the whole screenpagesIdentical = true;
设备在升级界面文字或图像方向偏转问题修改方案(RK3399方案)相关推荐
- 在CSS3中，可以利用transform功能来实现文字或图像的旋转、缩放、倾斜、移动这四种类型的变形处理...
CSS3中的变形处理(transform)属 transform的功能分类 1.旋转 transform:rotate(45deg); 该语句使div元素顺时针旋转45度.deg是CSS 3的&quo ...
- 【转】DICOM中几个判断图像方向的tag
转自:https://www.cnblogs.com/h2zZhou/p/9072967.html 在DICOM标准里,有三个TAG与成像的方向相关. 参考来源:Kitware关于DICOM方向的说明 ...
- 华为手机卡在升级界面_华为通用强制升级教程 华为官方卡刷教程
2016-03-29 15:09:03 华为通用强制升级教程 华为官方卡刷教程 标签:华为刷机,华为官方卡刷,华为强制升级 [ROM之家]很多使用华为手机的朋友会出现刷机失败无法开机,反复重启等情况, ...
- 使用计算机制作数字文本格式,计算机中数字、文字、图像、声音和视频的表示与编码...
设计计算机的最初目的是进行数值计算,计算机中首先表示的数据就是各种数字信息.随着应用的发展,现在计算机数据以不同的形式出现,如:数字.文字.图像.声音和视频等.但是,在计算机内部,这些数据形式还是以数 ...
- 用Powerpoint打开ppt文件出现提示：PowerPoint无法显示文件中某些幻灯片中的文字、图像或对象，“xx.ppt”解决办法
今天用Powerpoint打开ppt文件出现提示:"PowerPoint无法显示文件中某些幻灯片中的文字.图像或对象,"xx.ppt",因为他们已被损坏.演示文稿中受影响 ...
- 计算机应用国防教育方向,计算机应用专业图形图像方向人才培养方案.DOC
计算机应用专业图形图像方向人才培养方案 河 套 大 学 人 才 培 养 方 案 院 系(章): 理学系 专 业: 计算机应用技术专业 专业方向: 图形图像 年 级: 2008级 修业年限: 三年 制定 ...
- android 如何构建半屏显示的界面_如何实现android设备进入recovery界面后自动重启...
问题背景: 因项目开发及测试需要,设备升级频率比较高,升级出现失败的情况肯定是有的,原因用多方面,如:故意使用非法的升级包,升级版本不匹配等等. 出现升级失败问题后,对于手机用户来说可以选择重启手机即 ...
- android系统恢复出厂设置和升级界面的修改方法
最近需要定制恢复出厂设置和升级的画面,将原生的绿色机器人改成其他的图片. 基于的android版本是4.4.4,改起来挺简单的,但是遇到了几个坑,特地记录下. android 4.4.4的升级机器人图 ...
- vFW设备开局升级操作指北
一般拿到新设备后第一件事情是检查软件版本并进行升级.版本升级常用方法有3种:通过web页面进行升级.通过命令行进行升级.通过bootrom进行升级. 一般新设备能远程登录之后,就可以对设备做升级了. ...
最新文章
- 创建hugo博客_Hugo + Firebase：如何在几分钟内免费创建自己的静态网站
- 为啥JAVA虚拟机不开发系统_理解Java虚拟机体系结构
- python一维数组定义,python一维数组保存
- container_of宏
- 使用开源框架Sqlsugar结合mysql开发一个小demo
- 小米回应林斌退休传闻；哈工大等高校被禁止使用 MATLAB；统信软件 UOS20 SP1 系统升级| 极客头条...
- 支付宝“手机网站支付”开发的相关文档和工具
- 光盘安装 windowns 10 系统 与 Win10 英文系统修改成中文系统
- 基于protues与keli下贪吃蛇的实现
- html快闪软件制作,教你如何用PPT轻松完成快闪视频制作？
- 电脑qq语音连不到服务器,电脑问题：qq语音正常？
- discuz开启url伪静态
- php查重,知网查重时检测php之类的源码吗？【干货分享】
- -未来世界的幸存者- 读后感（现实篇和职业篇）
- 一款免费、炫酷的GUI：AWTK
- 极速办公ppt里面如何插入表格
- diskgenius克隆硬盘无法启动_克隆分区
- 普通路由器DMZ主机设置及访问方法
- 建立数据库模型：从业务模型、概念模型到逻辑模型
- html5 雷达,最强大脑雷达探点HTML5版本(示例代码)