diff options
author | William Wilgus <wilgus.william@gmail.com> | 2020-10-07 02:01:35 -0400 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2020-10-26 12:28:48 -0400 |
commit | 3237ae4a4ff9296a377ff9194a11038da161208f (patch) | |
tree | af4338c78467b9b0845d76c39da1fbe10f25e23e /apps/plugins/imageviewer | |
parent | 12f3ed1699d6bef25bed90ba95cbcc1a6bb4934a (diff) | |
download | rockbox-3237ae4a4ff9296a377ff9194a11038da161208f.tar.gz rockbox-3237ae4a4ff9296a377ff9194a11038da161208f.zip |
LCD core move buf ptr and address look up function viewport struct
I'm currently running up against the limitations of the lcd_draw functions
I want these functions to be able to be used on any size buffer not
just buffers with a stride matching the underlying device
[DONE] allow the framebuffer to be decoupled from the device framebuffer
[DONE need examples] allow for some simple blit like transformations
[DONE] remove the device framebuffer from the plugin api
[DONE}ditto remote framebuffer
[DONE] remove _viewport_get_framebuffer you can call struct *vp = lcd_set_viewport(NULL) and vp->buffer->fb_ptr
while remote lcds may compile (and work in the sim) its not been tested on targets
[FIXED] backdrops need work to be screen agnostic
[FIXED] screen statusbar is not being combined into the main viewport correctly yet
[FIXED] screen elements are displayed incorrectly after switch to void*
[FIXED] core didn't restore proper viewport on splash etc.
[NEEDS TESTING] remote lcd garbled data
[FIXED] osd lib garbled screen on bmp_part
[FIXED] grey_set_vp needs to return old viewport like lcd_set_viewport
[FIXED] Viewport update now handles viewports with differing buffers/strides by copying to the main buffer
[FIXED] splash on top of WPS leaves old framebuffer data (doesn't redraw)
[UPDATE] refined this a bit more to have clear_viewport set the clean bit and have skin_render do its own screen clear
scrolling viewports no longer trigger wps refresh
also fixed a bug where guisyncyesno was displaying and then disappearing
[ADDED!] New LCD macros that allow you to create properly size frame buffers in you desired size without wasting bytes
(LCD_ and LCD_REMOTE_)
LCD_STRIDE(w, h) same as STRIDE_MAIN
LCD_FBSTRIDE(w, h) returns target specific stride for a buffer W x H
LCD_NBELEMS(w, h) returns the number of fb_data sized elemenst needed for a buffer W x H
LCD_NATIVE_STRIDE(s) conversion between rockbox native vertical and lcd native stride (2bitH)
test_viewports.c has an example of usage
[FIXED!!] 2bit targets don't respect non-native strides
[FIXED] Few define snags
Change-Id: I0d04c3834e464eca84a5a715743a297a0cefd0af
Diffstat (limited to 'apps/plugins/imageviewer')
-rw-r--r-- | apps/plugins/imageviewer/imageviewer.c | 11 | ||||
-rw-r--r-- | apps/plugins/imageviewer/jpeg/yuv2rgb.c | 12 |
2 files changed, 18 insertions, 5 deletions
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c index 37c5838d73..4b1a982438 100644 --- a/apps/plugins/imageviewer/imageviewer.c +++ b/apps/plugins/imageviewer/imageviewer.c | |||
@@ -509,6 +509,13 @@ static void pan_view_up(struct image_info *info) | |||
509 | the bottom */ | 509 | the bottom */ |
510 | static void pan_view_down(struct image_info *info) | 510 | static void pan_view_down(struct image_info *info) |
511 | { | 511 | { |
512 | static fb_data *lcd_fb = NULL; | ||
513 | if (!lcd_fb) | ||
514 | { | ||
515 | struct viewport *vp_main = *(rb->screens[SCREEN_MAIN]->current_viewport); | ||
516 | lcd_fb = vp_main->buffer->fb_ptr; | ||
517 | } | ||
518 | |||
512 | int move; | 519 | int move; |
513 | 520 | ||
514 | move = MIN(VSCROLL, info->height - info->y - LCD_HEIGHT); | 521 | move = MIN(VSCROLL, info->height - info->y - LCD_HEIGHT); |
@@ -526,7 +533,7 @@ static void pan_view_down(struct image_info *info) | |||
526 | */ | 533 | */ |
527 | move++, info->y--; | 534 | move++, info->y--; |
528 | rb->memcpy(rgb_linebuf, | 535 | rb->memcpy(rgb_linebuf, |
529 | *rb->lcd_framebuffer + (LCD_HEIGHT - move)*LCD_WIDTH, | 536 | lcd_fb + (LCD_HEIGHT - move)*LCD_WIDTH, |
530 | LCD_WIDTH*sizeof (fb_data)); | 537 | LCD_WIDTH*sizeof (fb_data)); |
531 | } | 538 | } |
532 | #endif | 539 | #endif |
@@ -539,7 +546,7 @@ static void pan_view_down(struct image_info *info) | |||
539 | && settings.jpeg_dither_mode == DITHER_DIFFUSION) | 546 | && settings.jpeg_dither_mode == DITHER_DIFFUSION) |
540 | { | 547 | { |
541 | /* Cover the first row drawn with previous image data. */ | 548 | /* Cover the first row drawn with previous image data. */ |
542 | rb->memcpy(*rb->lcd_framebuffer + (LCD_HEIGHT - move)*LCD_WIDTH, | 549 | rb->memcpy(lcd_fb + (LCD_HEIGHT - move)*LCD_WIDTH, |
543 | rgb_linebuf, LCD_WIDTH*sizeof (fb_data)); | 550 | rgb_linebuf, LCD_WIDTH*sizeof (fb_data)); |
544 | info->y++; | 551 | info->y++; |
545 | } | 552 | } |
diff --git a/apps/plugins/imageviewer/jpeg/yuv2rgb.c b/apps/plugins/imageviewer/jpeg/yuv2rgb.c index 5504e425e6..d0d5cb683b 100644 --- a/apps/plugins/imageviewer/jpeg/yuv2rgb.c +++ b/apps/plugins/imageviewer/jpeg/yuv2rgb.c | |||
@@ -236,15 +236,15 @@ static fb_data (* const pixel_funcs[COLOUR_NUM_MODES][DITHER_NUM_MODES])(void) = | |||
236 | [DITHER_DIFFUSION] = pixel_fsdither_to_lcd, | 236 | [DITHER_DIFFUSION] = pixel_fsdither_to_lcd, |
237 | }, | 237 | }, |
238 | }; | 238 | }; |
239 | 239 | static fb_data *lcd_fb = NULL; | |
240 | /* These defines are used fornormal horizontal strides and vertical strides. */ | 240 | /* These defines are used fornormal horizontal strides and vertical strides. */ |
241 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 241 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE |
242 | #define LCDADDR(x, y) (*rb->lcd_framebuffer + LCD_HEIGHT*(x) + (y)) | 242 | #define LCDADDR(x, y) (lcd_fb + LCD_HEIGHT*(x) + (y)) |
243 | #define ROWENDOFFSET (width*LCD_HEIGHT) | 243 | #define ROWENDOFFSET (width*LCD_HEIGHT) |
244 | #define ROWOFFSET (1) | 244 | #define ROWOFFSET (1) |
245 | #define COLOFFSET (LCD_HEIGHT) | 245 | #define COLOFFSET (LCD_HEIGHT) |
246 | #else | 246 | #else |
247 | #define LCDADDR(x, y) (*rb->lcd_framebuffer + LCD_WIDTH*(y) + (x)) | 247 | #define LCDADDR(x, y) (lcd_fb + LCD_WIDTH*(y) + (x)) |
248 | #define ROWENDOFFSET (width) | 248 | #define ROWENDOFFSET (width) |
249 | #define ROWOFFSET (LCD_WIDTH) | 249 | #define ROWOFFSET (LCD_WIDTH) |
250 | #define COLOFFSET (1) | 250 | #define COLOFFSET (1) |
@@ -261,6 +261,12 @@ void yuv_bitmap_part(unsigned char *src[3], int csub_x, int csub_y, | |||
261 | int x, int y, int width, int height, | 261 | int x, int y, int width, int height, |
262 | int colour_mode, int dither_mode) | 262 | int colour_mode, int dither_mode) |
263 | { | 263 | { |
264 | if (!lcd_fb) | ||
265 | { | ||
266 | struct viewport *vp_main = *(rb->screens[SCREEN_MAIN]->current_viewport); | ||
267 | lcd_fb = vp_main->buffer->fb_ptr; | ||
268 | } | ||
269 | |||
264 | fb_data *dst, *dst_end; | 270 | fb_data *dst, *dst_end; |
265 | fb_data (*pixel_func)(void); | 271 | fb_data (*pixel_func)(void); |
266 | struct rgb_pixel px; | 272 | struct rgb_pixel px; |