tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master

Browse source
This commit is contained in:
Xin Li 2022-06-29 21:21:49 +00:00 committed by Android (Google) Code Review
commit 3d82b087ff
6 changed files with 94 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
minui/graphics.cpp
View file

@ -36,7 +36,6 @@ static int overscan_offset_x = 0;
static int overscan_offset_y = 0;
static uint32_t gr_current = ~0;
static constexpr uint32_t alpha_mask = 0xff000000;
// gr_draw is owned by backends.
static GRSurface* gr_draw = nullptr;
@ -79,7 +78,7 @@ int gr_font_size(const GRFont* font, int* x, int* y) {
}
// Blends gr_current onto pix value, assumes alpha as most significant byte.
static inline uint32_t pixel_blend(uint8_t alpha, uint32_t pix) {
static inline uint32_t pixel_blend_argb(uint8_t alpha, uint32_t pix) {
if (alpha == 255) return gr_current;
if (alpha == 0) return pix;
uint32_t pix_r = pix & 0xff;
@ -96,6 +95,48 @@ static inline uint32_t pixel_blend(uint8_t alpha, uint32_t pix) {
return (out_r & 0xff) | (out_g & 0xff00) | (out_b & 0xff0000) | (gr_current & 0xff000000);
}
static inline uint32_t pixel_blend_rgba(uint8_t alpha, uint32_t pix) {
if (alpha == 255) return gr_current;
if (alpha == 0) return pix;
uint32_t pix_r = pix & 0xff00;
uint32_t pix_g = pix & 0xff0000;
uint32_t pix_b = pix & 0xff000000;
uint32_t cur_r = gr_current & 0xff00;
uint32_t cur_g = gr_current & 0xff0000;
uint32_t cur_b = gr_current & 0xff000000;
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 (gr_current & 0xff) | (out_r & 0xff00) | (out_g & 0xff0000) | (out_b & 0xff000000);
}
static inline uint32_t pixel_blend(uint8_t alpha, uint32_t pix) {
if (pixel_format == PixelFormat::RGBA) {
return pixel_blend_rgba(alpha, pix);
}
return pixel_blend_argb(alpha, pix);
}
static inline uint32_t get_alphamask() {
if (pixel_format == PixelFormat::RGBA) {
return 0x000000ff;
}
return 0xff000000;
}
static inline uint8_t get_alpha_shift() {
if (pixel_format == PixelFormat::RGBA) {
return 0;
}
return 24;
}
static inline uint8_t get_alpha(uint32_t pix) {
return static_cast<uint8_t>((pix & (gr_current & get_alphamask())) >> get_alpha_shift());
}
// Increments pixel pointer right, with current rotation.
static void incr_x(uint32_t** p, int row_pixels) {
if (rotation == GRRotation::LEFT) {
@ -143,7 +184,7 @@ static uint32_t* PixelAt(GRSurface* surface, int x, int y, int row_pixels) {
static void TextBlend(const 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);
uint8_t alpha_current = get_alpha(gr_current);
for (int j = 0; j < height; ++j) {
const uint8_t* sx = src_p;
uint32_t* px = dst_p;
@ -158,7 +199,7 @@ static void TextBlend(const uint8_t* src_p, int src_row_bytes, uint32_t* dst_p,
}
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;
if (!font || !font->texture || (gr_current & get_alphamask()) == 0) return;
if (font->texture->pixel_bytes != 1) {
printf("gr_text: font has wrong format\n");
@ -213,6 +254,8 @@ 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 (pixel_format == PixelFormat::ARGB || pixel_format == PixelFormat::BGRA) {
gr_current = (a32 << 24) | (r32 << 16) | (g32 << 8) | b32;
} else if (pixel_format == PixelFormat::RGBA) {
gr_current = (b32 << 24) | (g32 << 16) | (r32 << 8) | a32;
} else {
gr_current = (a32 << 24) | (b32 << 16) | (g32 << 8) | r32;
}
@ -247,7 +290,7 @@ void gr_fill(int x1, int y1, int x2, int y2) {
int row_pixels = gr_draw->row_bytes / gr_draw->pixel_bytes;
uint32_t* p = PixelAt(gr_draw, x1, y1, row_pixels);
uint8_t alpha = static_cast<uint8_t>(((gr_current & alpha_mask) >> 24));
uint8_t alpha = get_alpha(gr_current);
if (alpha > 0) {
for (int y = y1; y < y2; ++y) {
uint32_t* px = p;
@ -369,6 +412,8 @@ int gr_init(std::initializer_list<GraphicsBackend> backends) {
pixel_format = PixelFormat::ARGB;
} else if (format == "BGRA_8888") {
pixel_format = PixelFormat::BGRA;
} else if (format == "RGBA_8888") {
pixel_format = PixelFormat::RGBA;
} else {
pixel_format = PixelFormat::UNKNOWN;
}

1
minui/include/minui/minui.h
View file

@ -102,6 +102,7 @@ enum class PixelFormat : int {
RGBX = 2,
BGRA = 3,
ARGB = 4,
RGBA = 5, // LSB Alpha
};
enum class GraphicsBackend : int {

56
minui/resources.cpp
View file

@ -153,32 +153,57 @@ static void TransformRgbToDraw(const uint8_t* input_row, uint8_t* output_row, in
int width) {
const uint8_t* ip = input_row;
uint8_t* op = output_row;
PixelFormat pixel_format = gr_pixel_format();
switch (channels) {
case 1:
// expand gray level to RGBX
for (int x = 0; x < width; ++x) {
*op++ = *ip;
*op++ = *ip;
*op++ = *ip;
*op++ = 0xff;
if (pixel_format == PixelFormat::RGBA) {
*op++ = 0xff;
*op++ = *ip;
*op++ = *ip;
*op++ = *ip;
} else {
*op++ = *ip;
*op++ = *ip;
*op++ = *ip;
*op++ = 0xff;
}
ip++;
}
break;
case 3:
// expand RGBA to RGBX
for (int x = 0; x < width; ++x) {
*op++ = *ip++;
*op++ = *ip++;
*op++ = *ip++;
*op++ = 0xff;
// expand RGBA to RGBX
if (pixel_format == PixelFormat::RGBA) {
*op++ = 0xff;
*op++ = *ip++;
*op++ = *ip++;
*op++ = *ip++;
} else {
*op++ = *ip++;
*op++ = *ip++;
*op++ = *ip++;
*op++ = 0xff;
}
}
break;
case 4:
// copy RGBA to RGBX
memcpy(output_row, input_row, width * 4);
if (pixel_format == PixelFormat::RGBA) {
for (int x = 0; x < width; ++x) {
*op++ = *(ip + 3);
*op++ = *ip++;
*op++ = *ip++;
*op++ = *ip++;
ip++;
}
} else {
// copy RGBA to RGBX
memcpy(output_row, input_row, width * 4);
}
break;
}
}
@ -201,6 +226,8 @@ int res_create_display_surface(const char* name, GRSurface** pSurface) {
PixelFormat pixel_format = gr_pixel_format();
if (pixel_format == PixelFormat::ARGB || pixel_format == PixelFormat::BGRA) {
png_set_bgr(png_ptr);
} else if (pixel_format == PixelFormat::RGBA) {
png_set_swap_alpha(png_ptr);
}
for (png_uint_32 y = 0; y < height; ++y) {
@ -273,6 +300,8 @@ int res_create_multi_display_surface(const char* name, int* frames, int* fps,
if (gr_pixel_format() == PixelFormat::ARGB || gr_pixel_format() == PixelFormat::BGRA) {
png_set_bgr(png_ptr);
} else if (gr_pixel_format() == PixelFormat::RGBA) {
png_set_swap_alpha(png_ptr);
}
for (png_uint_32 y = 0; y < height; ++y) {
@ -316,11 +345,6 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface) {
return -8;
}
PixelFormat pixel_format = gr_pixel_format();
if (pixel_format == PixelFormat::ARGB || pixel_format == PixelFormat::BGRA) {
png_set_bgr(png_ptr);
}
for (png_uint_32 y = 0; y < height; ++y) {
uint8_t* p_row = surface->data() + y * surface->row_bytes;
png_read_row(png_ptr, p_row, nullptr);

2
tools/recovery_l10n/res/values-ky/strings.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="recovery_installing" msgid="2013591905463558223">"Система жаңырууда"</string>
<string name="recovery_installing" msgid="2013591905463558223">"Тутум жаңырууда"</string>
<string name="recovery_erasing" msgid="7334826894904037088">"Тазаланууда"</string>
<string name="recovery_no_command" msgid="4465476568623024327">"Буйрук берилген жок"</string>
<string name="recovery_error" msgid="5748178989622716736">"Ката!"</string>

2
tools/recovery_l10n/res/values-nb/strings.xml
View file

@ -7,7 +7,7 @@
<string name="recovery_error" msgid="5748178989622716736">"Feil!"</string>
<string name="recovery_installing_security" msgid="9184031299717114342">"Installerer sikkerhetsoppdateringen"</string>
<string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Kan ikke laste inn Android-systemet. Dataene dine er muligens skadet. Hvis du fortsetter å se denne meldingen, må du muligens tilbakestille til fabrikkstandard og tømme alle brukerdataene som er lagret på denne enheten."</string>
<string name="recovery_try_again" msgid="7168248750158873496">"Prøv på nytt"</string>
<string name="recovery_try_again" msgid="7168248750158873496">"Prøv igjen"</string>
<string name="recovery_factory_data_reset" msgid="7321351565602894783">"Tilbakestill til fabrikkstandard"</string>
<string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Vil du viske ut alle brukerdataene?\n\n DETTE KAN IKKE ANGRES!"</string>
<string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Avbryt"</string>

2
tools/recovery_l10n/res/values-te/strings.xml
View file

@ -10,5 +10,5 @@
<string name="recovery_try_again" msgid="7168248750158873496">"మళ్లీ ప్రయత్నించు"</string>
<string name="recovery_factory_data_reset" msgid="7321351565602894783">"ఫ్యాక్టరీ డేటా రీసెట్"</string>
<string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"వినియోగదారు డేటా మొత్తాన్ని తొలగించాలా?\n\n ఈ చర్యను రద్దు చేయలేరు!"</string>
<string name="recovery_cancel_wipe_data" msgid="66987687653647384">"రద్దు చేయండి"</string>
<string name="recovery_cancel_wipe_data" msgid="66987687653647384">"రద్దు చేయి"</string>
</resources>