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/mpegplayer/mpegplayer.c | |
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/mpegplayer/mpegplayer.c')
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index e72d2828e3..619be8f1ef 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -620,6 +620,14 @@ struct fps | |||
620 | static struct osd osd; | 620 | static struct osd osd; |
621 | static struct fps fps NOCACHEBSS_ATTR; /* Accessed on other processor */ | 621 | static struct fps fps NOCACHEBSS_ATTR; /* Accessed on other processor */ |
622 | 622 | ||
623 | #ifdef LCD_PORTRAIT | ||
624 | static fb_data* get_framebuffer(void) | ||
625 | { | ||
626 | struct viewport *vp_main = *(rb->screens[SCREEN_MAIN]->current_viewport); | ||
627 | return vp_main->buffer->fb_ptr; | ||
628 | } | ||
629 | #endif | ||
630 | |||
623 | static void osd_show(unsigned show); | 631 | static void osd_show(unsigned show); |
624 | 632 | ||
625 | #ifdef LCD_LANDSCAPE | 633 | #ifdef LCD_LANDSCAPE |
@@ -821,7 +829,7 @@ static void draw_oriented_mono_bitmap_part(const unsigned char *src, | |||
821 | src_y &= 7; | 829 | src_y &= 7; |
822 | src_end = src + width; | 830 | src_end = src + width; |
823 | 831 | ||
824 | dst = *rb->lcd_framebuffer + (LCD_WIDTH - y) + x*LCD_WIDTH; | 832 | dst = get_framebuffer() + (LCD_WIDTH - y) + x*LCD_WIDTH; |
825 | do | 833 | do |
826 | { | 834 | { |
827 | const unsigned char *src_col = src++; | 835 | const unsigned char *src_col = src++; |
@@ -953,7 +961,7 @@ static void draw_oriented_alpha_bitmap_part(const unsigned char *src, | |||
953 | fg_pattern = rb->lcd_get_foreground(); | 961 | fg_pattern = rb->lcd_get_foreground(); |
954 | /*bg_pattern=*/ rb->lcd_get_background(); | 962 | /*bg_pattern=*/ rb->lcd_get_background(); |
955 | 963 | ||
956 | dst_start = *rb->lcd_framebuffer + (LCD_WIDTH - y - 1) + x*LCD_WIDTH; | 964 | dst_start = get_framebuffer() + (LCD_WIDTH - y - 1) + x*LCD_WIDTH; |
957 | int col, row = height; | 965 | int col, row = height; |
958 | unsigned data, pixels; | 966 | unsigned data, pixels; |
959 | unsigned skip_end = (stride - width); | 967 | unsigned skip_end = (stride - width); |