From ed876a7175c54a68735e8bcacd1a22cbc84034ed Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 31 Jul 2018 21:32:50 -0700 Subject: [PATCH] minui: Use runtime properties instead of build time vars. This CL removes the use of the following build time macros, and uses the runtime property values instead. - TARGET_RECOVERY_PIXEL_FORMAT - TARGET_RECOVERY_OVERSCAN_PERCENT - TARGET_RECOVERY_DEFAULT_ROTATION Bug: 110380063 Test: Set up taimen with `TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT`. Build and check recovery UI. Test: Set up taimen with `TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888`. Build and check recovery UI. Change-Id: I4439556a03fde4805a18011ef72eff1373f31d47 --- minui/Android.mk | 26 ------------------------- minui/graphics.cpp | 39 ++++++++++++++++++++++++++----------- minui/graphics_adf.cpp | 19 +++++++++--------- minui/graphics_drm.cpp | 19 +++++++++--------- minui/include/minui/minui.h | 10 ++++++++++ minui/resources.cpp | 20 ++++++++++--------- 6 files changed, 69 insertions(+), 64 deletions(-) diff --git a/minui/Android.mk b/minui/Android.mk index ae1552b1..e858eaaa 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -41,32 +41,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_MODULE := libminui -# This used to compare against values in double-quotes (which are just -# ordinary characters in this context). Strip double-quotes from the -# value so that either will work. - -ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),ABGR_8888) - LOCAL_CFLAGS += -DRECOVERY_ABGR -endif -ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),RGBX_8888) - LOCAL_CFLAGS += -DRECOVERY_RGBX -endif -ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),BGRA_8888) - LOCAL_CFLAGS += -DRECOVERY_BGRA -endif - -ifneq ($(TARGET_RECOVERY_OVERSCAN_PERCENT),) - LOCAL_CFLAGS += -DOVERSCAN_PERCENT=$(TARGET_RECOVERY_OVERSCAN_PERCENT) -else - LOCAL_CFLAGS += -DOVERSCAN_PERCENT=0 -endif - -ifneq ($(TARGET_RECOVERY_DEFAULT_ROTATION),) - LOCAL_CFLAGS += -DDEFAULT_ROTATION=$(TARGET_RECOVERY_DEFAULT_ROTATION) -else - LOCAL_CFLAGS += -DDEFAULT_ROTATION=ROTATION_NONE -endif - include $(BUILD_STATIC_LIBRARY) # libminui (shared library) diff --git a/minui/graphics.cpp b/minui/graphics.cpp index 9df058e2..4fe0fdc7 100644 --- a/minui/graphics.cpp +++ b/minui/graphics.cpp @@ -23,6 +23,8 @@ #include +#include + #include "graphics_adf.h" #include "graphics_drm.h" #include "graphics_fbdev.h" @@ -31,7 +33,6 @@ static GRFont* gr_font = nullptr; static MinuiBackend* gr_backend = nullptr; -static int overscan_percent = OVERSCAN_PERCENT; static int overscan_offset_x = 0; static int overscan_offset_y = 0; @@ -41,6 +42,7 @@ static constexpr uint32_t alpha_mask = 0xff000000; // gr_draw is owned by backends. static const GRSurface* gr_draw = nullptr; static GRRotation rotation = GRRotation::NONE; +static PixelFormat pixel_format = PixelFormat::UNKNOWN; static bool outside(int x, int y) { auto swapped = (rotation == GRRotation::LEFT || rotation == GRRotation::RIGHT); @@ -52,6 +54,10 @@ const GRFont* gr_sys_font() { return gr_font; } +PixelFormat gr_pixel_format() { + return pixel_format; +} + int gr_measure(const GRFont* font, const char* s) { if (font == nullptr) { return -1; @@ -203,11 +209,11 @@ void gr_texticon(int x, int y, GRSurface* icon) { 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 = (a32 << 24) | (r32 << 16) | (g32 << 8) | b32; -#else - gr_current = (a32 << 24) | (b32 << 16) | (g32 << 8) | r32; -#endif + if (pixel_format == PixelFormat::ABGR || pixel_format == PixelFormat::BGRA) { + gr_current = (a32 << 24) | (r32 << 16) | (g32 << 8) | b32; + } else { + gr_current = (a32 << 24) | (b32 << 16) | (g32 << 8) | r32; + } } void gr_clear() { @@ -335,6 +341,18 @@ void gr_flip() { } int gr_init() { + // pixel_format needs to be set before loading any resources or initializing backends. + std::string format = android::base::GetProperty("ro.recovery.ui.pixel_format", ""); + if (format == "ABGR_8888") { + pixel_format = PixelFormat::ABGR; + } else if (format == "RGBX_8888") { + pixel_format = PixelFormat::RGBX; + } else if (format == "BGRA_8888") { + pixel_format = PixelFormat::BGRA; + } else { + pixel_format = PixelFormat::UNKNOWN; + } + int ret = gr_init_font("font", &gr_font); if (ret != 0) { printf("Failed to init font: %d, continuing graphic backend initialization without font file\n", @@ -360,6 +378,7 @@ int gr_init() { gr_backend = backend.release(); + int overscan_percent = android::base::GetIntProperty("ro.recovery.ui.overscan_percent", 0); overscan_offset_x = gr_draw->width * overscan_percent / 100; overscan_offset_y = gr_draw->height * overscan_percent / 100; @@ -370,17 +389,15 @@ int gr_init() { return -1; } -#define __STRINGIFY(x) #x -#define STRINGIFY(x) __STRINGIFY(x) - - std::string rotation_str(STRINGIFY(DEFAULT_ROTATION)); + std::string rotation_str = + android::base::GetProperty("ro.recovery.ui.default_rotation", "ROTATION_NONE"); if (rotation_str == "ROTATION_RIGHT") { gr_rotate(GRRotation::RIGHT); } else if (rotation_str == "ROTATION_DOWN") { gr_rotate(GRRotation::DOWN); } else if (rotation_str == "ROTATION_LEFT") { gr_rotate(GRRotation::LEFT); - } else { // "ROTATION_NONE" + } else { // "ROTATION_NONE" or unknown string gr_rotate(GRRotation::NONE); } diff --git a/minui/graphics_adf.cpp b/minui/graphics_adf.cpp index a59df00c..7439df9a 100644 --- a/minui/graphics_adf.cpp +++ b/minui/graphics_adf.cpp @@ -104,15 +104,16 @@ int MinuiBackendAdf::DeviceInit(adf_device* dev) { } GRSurface* MinuiBackendAdf::Init() { -#if defined(RECOVERY_ABGR) - format = DRM_FORMAT_ABGR8888; -#elif defined(RECOVERY_BGRA) - format = DRM_FORMAT_BGRA8888; -#elif defined(RECOVERY_RGBX) - format = DRM_FORMAT_RGBX8888; -#else - format = DRM_FORMAT_RGB565; -#endif + PixelFormat pixel_format = gr_pixel_format(); + if (pixel_format == PixelFormat::ABGR) { + format = DRM_FORMAT_ABGR8888; + } else if (pixel_format == PixelFormat::BGRA) { + format = DRM_FORMAT_BGRA8888; + } else if (pixel_format == PixelFormat::RGBX) { + format = DRM_FORMAT_RGBX8888; + } else { + format = DRM_FORMAT_RGB565; + } adf_id_t* dev_ids = nullptr; ssize_t n_dev_ids = adf_devices(&dev_ids); diff --git a/minui/graphics_drm.cpp b/minui/graphics_drm.cpp index 57912d1e..9336a1e6 100644 --- a/minui/graphics_drm.cpp +++ b/minui/graphics_drm.cpp @@ -116,15 +116,16 @@ GRSurfaceDrm* MinuiBackendDrm::DrmCreateSurface(int width, int height) { *surface = {}; uint32_t format; -#if defined(RECOVERY_ABGR) - format = DRM_FORMAT_RGBA8888; -#elif defined(RECOVERY_BGRA) - format = DRM_FORMAT_ARGB8888; -#elif defined(RECOVERY_RGBX) - format = DRM_FORMAT_XBGR8888; -#else - format = DRM_FORMAT_RGB565; -#endif + PixelFormat pixel_format = gr_pixel_format(); + if (pixel_format == PixelFormat::ABGR) { + format = DRM_FORMAT_ABGR8888; + } else if (pixel_format == PixelFormat::BGRA) { + format = DRM_FORMAT_BGRA8888; + } else if (pixel_format == PixelFormat::RGBX) { + format = DRM_FORMAT_RGBX8888; + } else { + format = DRM_FORMAT_RGB565; + } drm_mode_create_dumb create_dumb = {}; create_dumb.height = height; diff --git a/minui/include/minui/minui.h b/minui/include/minui/minui.h index 97660d47..fa13ecdf 100644 --- a/minui/include/minui/minui.h +++ b/minui/include/minui/minui.h @@ -48,6 +48,13 @@ enum class GRRotation : int { LEFT = 3, }; +enum class PixelFormat : int { + UNKNOWN = 0, + ABGR = 1, + RGBX = 2, + BGRA = 3, +}; + // Initializes the graphics backend and loads font file. Returns 0 on success, or -1 on error. Note // that the font initialization failure would be non-fatal, as caller may not need to draw any text // at all. Caller can check the font initialization result via gr_sys_font() as needed. @@ -85,6 +92,9 @@ unsigned int gr_get_height(const GRSurface* surface); // Sets rotation, flips gr_fb_width/height if 90 degree rotation difference void gr_rotate(GRRotation rotation); +// Returns the current PixelFormat being used. +PixelFormat gr_pixel_format(); + // // Input events. // diff --git a/minui/resources.cpp b/minui/resources.cpp index c018d9b8..477fbe2a 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp @@ -207,9 +207,10 @@ int res_create_display_surface(const char* name, GRSurface** pSurface) { return -8; } -#if defined(RECOVERY_ABGR) || defined(RECOVERY_BGRA) - png_set_bgr(png_ptr); -#endif + PixelFormat pixel_format = gr_pixel_format(); + if (pixel_format == PixelFormat::ABGR || pixel_format == PixelFormat::BGRA) { + png_set_bgr(png_ptr); + } for (png_uint_32 y = 0; y < height; ++y) { std::vector p_row(width * 4); @@ -278,9 +279,9 @@ int res_create_multi_display_surface(const char* name, int* frames, int* fps, } } -#if defined(RECOVERY_ABGR) || defined(RECOVERY_BGRA) - png_set_bgr(png_ptr); -#endif + if (gr_pixel_format() == PixelFormat::ABGR || gr_pixel_format() == PixelFormat::BGRA) { + png_set_bgr(png_ptr); + } for (png_uint_32 y = 0; y < height; ++y) { std::vector p_row(width * 4); @@ -327,9 +328,10 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface) { surface->row_bytes = width; surface->pixel_bytes = 1; -#if defined(RECOVERY_ABGR) || defined(RECOVERY_BGRA) - png_set_bgr(png_ptr); -#endif + PixelFormat pixel_format = gr_pixel_format(); + if (pixel_format == PixelFormat::ABGR || pixel_format == PixelFormat::BGRA) { + png_set_bgr(png_ptr); + } for (png_uint_32 y = 0; y < height; ++y) { unsigned char* p_row = surface->data + y * surface->row_bytes;