michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: display: Add support for RGB565 to SDL display

Browse source 
Added support for RGB565 and BGR565 to SDL display driver

Signed-off-by: Jan Van Winkel <jan.van_winkel@dxplore.eu>
This commit is contained in:
Jan Van Winkel 2020-01-16 23:53:20 +01:00 • committed by Maureen Helm
commit b153f0b914
2 changed files with 70 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/display/Kconfig.sdl
View file

@ -42,6 +42,12 @@ choice SDL_DISPLAY_DEFAULT_PIXEL_FORMAT
config SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10 config SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10
bool "Mono Black=1" bool "Mono Black=1"
config SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_RGB_565
bool "RGB 565"
config SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_BGR_565
bool "BGR 565"
endchoice endchoice
endif # SDL_DISPLAY endif # SDL_DISPLAY

65
drivers/display/display_sdl.c
View file

@ -9,6 +9,7 @@
#include <SDL.h> #include <SDL.h>
#include <string.h> #include <string.h>
#include <soc.h> #include <soc.h>
#include <sys/byteorder.h>
#define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL #define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL
#include <logging/log.h> #include <logging/log.h>
@ -40,6 +41,10 @@ static int sdl_display_init(struct device *dev)
PIXEL_FORMAT_MONO01 PIXEL_FORMAT_MONO01
#elif defined(CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10) #elif defined(CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_MONO10)
PIXEL_FORMAT_MONO10 PIXEL_FORMAT_MONO10
#elif defined(CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_RGB_565)
PIXEL_FORMAT_RGB_565
#elif defined(CONFIG_SDL_DISPLAY_DEFAULT_PIXEL_FORMAT_BGR_565)
PIXEL_FORMAT_BGR_565
#else /* SDL_DISPLAY_DEFAULT_PIXEL_FORMAT */ #else /* SDL_DISPLAY_DEFAULT_PIXEL_FORMAT */
PIXEL_FORMAT_ARGB_8888 PIXEL_FORMAT_ARGB_8888
#endif /* SDL_DISPLAY_DEFAULT_PIXEL_FORMAT */ #endif /* SDL_DISPLAY_DEFAULT_PIXEL_FORMAT */
@ -112,6 +117,56 @@ static void sdl_display_write_rgb888(u8_t *disp_buf,
} }
} }
static void sdl_display_write_rgb565(u8_t *disp_buf,
const struct display_buffer_descriptor *desc, const void *buf)
{
u32_t w_idx;
u32_t h_idx;
u32_t pixel;
const u16_t *pix_ptr;
u16_t rgb565;
__ASSERT((desc->pitch * 2U * desc->height) <= desc->buf_size,
"Input buffer to small");
for (h_idx = 0U; h_idx < desc->height; ++h_idx) {
for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
pix_ptr = (const u16_t *)buf +
((h_idx * desc->pitch) + w_idx);
rgb565 = sys_be16_to_cpu(*pix_ptr);
pixel = (((rgb565 >> 11) & 0x1F) * 255 / 31) << 16;
pixel |= (((rgb565 >> 5) & 0x3F) * 255 / 63) << 8;
pixel |= (rgb565 & 0x1F) * 255 / 31;
*((u32_t *)disp_buf) = pixel;
disp_buf += 4;
}
}
}
static void sdl_display_write_bgr565(u8_t *disp_buf,
const struct display_buffer_descriptor *desc, const void *buf)
{
u32_t w_idx;
u32_t h_idx;
u32_t pixel;
const u16_t *pix_ptr;
__ASSERT((desc->pitch * 2U * desc->height) <= desc->buf_size,
"Input buffer to small");
for (h_idx = 0U; h_idx < desc->height; ++h_idx) {
for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
pix_ptr = (const u16_t *)buf +
((h_idx * desc->pitch) + w_idx);
pixel = (((*pix_ptr >> 11) & 0x1F) * 255 / 31) << 16;
pixel |= (((*pix_ptr >> 5) & 0x3F) * 255 / 63) << 8;
pixel |= (*pix_ptr & 0x1F) * 255 / 31;
*((u32_t *)disp_buf) = pixel;
disp_buf += 4;
}
}
}
static void sdl_display_write_mono(u8_t *disp_buf, static void sdl_display_write_mono(u8_t *disp_buf,
const struct display_buffer_descriptor *desc, const void *buf, const struct display_buffer_descriptor *desc, const void *buf,
const bool one_is_black) const bool one_is_black)
@ -179,6 +234,10 @@ static int sdl_display_write(const struct device *dev, const u16_t x,
sdl_display_write_mono(disp_data->buf, desc, buf, true); sdl_display_write_mono(disp_data->buf, desc, buf, true);
} else if (disp_data->current_pixel_format == PIXEL_FORMAT_MONO01) { } else if (disp_data->current_pixel_format == PIXEL_FORMAT_MONO01) {
sdl_display_write_mono(disp_data->buf, desc, buf, false); sdl_display_write_mono(disp_data->buf, desc, buf, false);
} else if (disp_data->current_pixel_format == PIXEL_FORMAT_RGB_565) {
sdl_display_write_rgb565(disp_data->buf, desc, buf);
} else if (disp_data->current_pixel_format == PIXEL_FORMAT_BGR_565) {
sdl_display_write_bgr565(disp_data->buf, desc, buf);
} }
rect.x = x; rect.x = x;
@ -283,7 +342,9 @@ static void sdl_display_get_capabilities(
capabilities->supported_pixel_formats = PIXEL_FORMAT_ARGB_8888 | capabilities->supported_pixel_formats = PIXEL_FORMAT_ARGB_8888 |
PIXEL_FORMAT_RGB_888 | PIXEL_FORMAT_RGB_888 |
PIXEL_FORMAT_MONO01 | PIXEL_FORMAT_MONO01 |
PIXEL_FORMAT_MONO10; PIXEL_FORMAT_MONO10 |
PIXEL_FORMAT_RGB_565 |
PIXEL_FORMAT_BGR_565;
capabilities->current_pixel_format = disp_data->current_pixel_format; capabilities->current_pixel_format = disp_data->current_pixel_format;
capabilities->screen_info = SCREEN_INFO_MONO_VTILED | capabilities->screen_info = SCREEN_INFO_MONO_VTILED |
SCREEN_INFO_MONO_MSB_FIRST; SCREEN_INFO_MONO_MSB_FIRST;
@ -300,6 +361,8 @@ static int sdl_display_set_pixel_format(const struct device *dev,
case PIXEL_FORMAT_RGB_888: case PIXEL_FORMAT_RGB_888:
case PIXEL_FORMAT_MONO01: case PIXEL_FORMAT_MONO01:
case PIXEL_FORMAT_MONO10: case PIXEL_FORMAT_MONO10:
case PIXEL_FORMAT_RGB_565:
case PIXEL_FORMAT_BGR_565:
disp_data->current_pixel_format = pixel_format; disp_data->current_pixel_format = pixel_format;
return 0; return 0;
default: default: