From df5c3e15e8d04d519b7870fe809c15053783c14c Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Thu, 10 Jan 2008 22:51:33 +0000 Subject: Greyscale library: * Introduced some extra macros dealing with block size, allowing to write some parts with less #ifdefing. * Optimised grey_update_rect() for horizontally packed LCDs, and unbuffered scrolling. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16050 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/lib/grey.h | 9 +- apps/plugins/lib/grey_core.c | 58 +++++---- apps/plugins/lib/grey_draw.c | 13 +- apps/plugins/lib/grey_scroll.c | 273 +++++++++++++++++++---------------------- 4 files changed, 168 insertions(+), 185 deletions(-) (limited to 'apps/plugins/lib') diff --git a/apps/plugins/lib/grey.h b/apps/plugins/lib/grey.h index 9a3bd7d3f8..5bef88a89a 100644 --- a/apps/plugins/lib/grey.h +++ b/apps/plugins/lib/grey.h @@ -121,15 +121,18 @@ void grey_ub_scroll_down(int count); #endif #if LCD_PIXELFORMAT == HORIZONTAL_PACKING -#define _GREY_X_ADVANCE 1 +#define _GREY_BSHIFT 0 #else #if LCD_DEPTH == 1 -#define _GREY_X_ADVANCE 8 +#define _GREY_BSHIFT 3 #elif LCD_DEPTH == 2 -#define _GREY_X_ADVANCE 4 +#define _GREY_BSHIFT 2 #endif #endif /* LCD_PIXELFORMAT */ +#define _GREY_BSIZE (1<<_GREY_BSHIFT) +#define _GREY_BMASK (_GREY_BSIZE-1) + /* The greyscale buffer management structure */ struct _grey_info { diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c index 43eed9b022..5ba5f41404 100644 --- a/apps/plugins/lib/grey_core.c +++ b/apps/plugins/lib/grey_core.c @@ -373,7 +373,10 @@ bool grey_init(struct plugin_api* newrb, unsigned char *gbuf, long gbuf_size, return false; #ifndef SIMULATOR + /* Init to white */ _grey_rb->memset(_grey_info.values, 0x80, plane_size); + + /* Init phases with random bits */ dst = (unsigned*)(_grey_info.phases); end = (unsigned*)(_grey_info.phases + plane_size); @@ -516,7 +519,7 @@ void grey_update_rect(int x, int y, int width, int height) void grey_update_rect(int x, int y, int width, int height) { - unsigned char *src; + unsigned char *src, *dst; if ((width <= 0) || (height <= 0)) return; /* nothing to do */ @@ -527,26 +530,31 @@ void grey_update_rect(int x, int y, int width, int height) width = _grey_info.width - x; src = _grey_info.buffer + _GREY_MULUQ(_grey_info.width, y) + x; + +#if LCD_PIXELFORMAT == HORIZONTAL_PACKING + dst = _grey_info.values + _GREY_MULUQ(_grey_info.width, y) + x; - do + do + { + _grey_rb->memcpy(dst, src, width); + dst += _grey_info.width; + src += _grey_info.width; + } + while (--height > 0); + +#else /* LCD_PIXELFORMAT == VRTICAL_PACKING */ + do { -#if LCD_PIXELFORMAT == HORIZONTAL_PACKING - int idx = _GREY_MULUQ(_grey_info.width, y) + x; -#else -#if LCD_DEPTH == 1 - int idx = _GREY_MULUQ(_grey_info.width, y & ~7) + (x << 3) + (~y & 7); -#elif LCD_DEPTH == 2 - int idx = _GREY_MULUQ(_grey_info.width, y & ~3) + (x << 2) + (~y & 3); -#endif -#endif /* LCD_PIXELFORMAT */ - unsigned char *dst_row = _grey_info.values + idx; unsigned char *src_row = src; unsigned char *src_end = src + width; - + + dst = _grey_info.values + + _GREY_MULUQ(_grey_info.width, y & ~_GREY_BMASK) + + (x << _GREY_BSHIFT) + (~y & _GREY_BMASK); do { - *dst_row = *src_row++; - dst_row += _GREY_X_ADVANCE; + *dst = *src_row++; + dst += _GREY_BSIZE; } while (src_row < src_end); @@ -554,6 +562,8 @@ void grey_update_rect(int x, int y, int width, int height) src += _grey_info.width; } while (--height > 0); + +#endif /* LCD_PIXELFORMAT */ } #endif /* !SIMULATOR */ @@ -687,18 +697,12 @@ static void grey_screendump_hook(int fd) #ifdef SIMULATOR unsigned char *src = _grey_info.buffer + _GREY_MULUQ(_grey_info.width, gy) + gx; - - for (i = 0; i < 4; i++) - linebuf[x + i] = BMP_FIXEDCOLORS + *src++; #else unsigned char *src = _grey_info.values + _GREY_MULUQ(_grey_info.width, gy) + gx; - for (i = 0; i < 4; i++) - { - linebuf[x + i] = BMP_FIXEDCOLORS + *src; - src += _GREY_X_ADVANCE; - } #endif + for (i = 0; i < 4; i++) + linebuf[x + i] = BMP_FIXEDCOLORS + *src++; } else { @@ -730,7 +734,9 @@ static void grey_screendump_hook(int fd) #else linebuf[x] = BMP_FIXEDCOLORS + _grey_info.values[_GREY_MULUQ(_grey_info.width, - gy & ~7) + (gx << 3) + (~gy & 7)]; + gy & ~_GREY_BMASK) + + (gx << _GREY_BSHIFT) + + (~gy & _GREY_BMASK)]; #endif } else @@ -757,7 +763,9 @@ static void grey_screendump_hook(int fd) #else linebuf[x] = BMP_FIXEDCOLORS + _grey_info.values[_GREY_MULUQ(_grey_info.width, - gy & ~3) + (gx << 2) + (~gy & 3)]; + gy & ~_GREY_BMASK) + + (gx << _GREY_BSHIFT) + + (~gy & _GREY_BMASK)]; #endif } else diff --git a/apps/plugins/lib/grey_draw.c b/apps/plugins/lib/grey_draw.c index ccb8deae7b..683793129e 100644 --- a/apps/plugins/lib/grey_draw.c +++ b/apps/plugins/lib/grey_draw.c @@ -634,18 +634,15 @@ void grey_ub_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, if (y + height > _grey_info.height) height = _grey_info.height - y; - src += _GREY_MULUQ(stride, src_y) + src_x; /* move starting point */ - + src += _GREY_MULUQ(stride, src_y) + src_x; /* move starting point */ + do { #if LCD_PIXELFORMAT == HORIZONTAL_PACKING int idx = _GREY_MULUQ(_grey_info.width, y) + x; #else -#if LCD_DEPTH == 1 - int idx = _GREY_MULUQ(_grey_info.width, y & ~7) + (x << 3) + (~y & 7); -#elif LCD_DEPTH == 2 - int idx = _GREY_MULUQ(_grey_info.width, y & ~3) + (x << 2) + (~y & 3); -#endif + int idx = _GREY_MULUQ(_grey_info.width, y & ~_GREY_BMASK) + + (x << _GREY_BSHIFT) + (~y & _GREY_BMASK); #endif /* LCD_PIXELFORMAT */ unsigned char *dst_row = _grey_info.values + idx; const unsigned char *src_row = src; @@ -654,7 +651,7 @@ void grey_ub_gray_bitmap_part(const unsigned char *src, int src_x, int src_y, do { *dst_row = _grey_info.gvalue[*src_row++]; - dst_row += _GREY_X_ADVANCE; + dst_row += _GREY_BSIZE; } while (src_row < src_end); diff --git a/apps/plugins/lib/grey_scroll.c b/apps/plugins/lib/grey_scroll.c index 4a18d7d29e..4e1d5070fc 100644 --- a/apps/plugins/lib/grey_scroll.c +++ b/apps/plugins/lib/grey_scroll.c @@ -46,8 +46,9 @@ void grey_scroll_left(int count) do { _grey_rb->memmove(data, data + count, length); - _grey_rb->memset(data + length, blank, count); - data += _grey_info.width; + data += length; + _grey_rb->memset(data, blank, count); + data += count; } while (data < data_end); } @@ -149,210 +150,184 @@ void grey_ub_scroll_down(int count) /* Scroll left */ void grey_ub_scroll_left(int count) { - unsigned char *dst, *src, *end; - int blank, y, idx; + unsigned char *data, *data_end; + int blank, length; - if ((count == 0) || ((unsigned)count >= (unsigned)_grey_info.width)) + if ((unsigned)count >= (unsigned)_grey_info.width) return; - + + data = _grey_info.values; + data_end = data + _GREY_MULUQ(_grey_info.width, _grey_info.height); + length = (_grey_info.width - count) << _GREY_BSHIFT; + count <<= _GREY_BSHIFT; blank = (_grey_info.drawmode & DRMODE_INVERSEVID) ? _grey_info.fg_val : _grey_info.bg_val; - for (y = 0; y < _grey_info.height; y++) + do { -#if LCD_PIXELFORMAT == HORIZONTAL_PACKING - idx = _GREY_MULUQ(_grey_info.width, y); -#else -#if LCD_DEPTH == 1 - idx = _GREY_MULUQ(_grey_info.width, y & ~7) + (~y & 7); -#elif LCD_DEPTH == 2 - idx = _GREY_MULUQ(_grey_info.width, y & ~3) + (~y & 3); -#endif -#endif /* LCD_PIXELFORMAT */ - dst = _grey_info.values + idx; - src = dst + count * _GREY_X_ADVANCE; - end = dst + _grey_info.width * _GREY_X_ADVANCE; - - do - { - *dst = *src; - dst += _GREY_X_ADVANCE; - src += _GREY_X_ADVANCE; - } - while (src < end); - - do - { - *dst = blank; - dst += _GREY_X_ADVANCE; - } - while (dst < end); + _grey_rb->memmove(data, data + count, length); + data += length; + _grey_rb->memset(data, blank, count); + data += count; } + while (data < data_end); } /* Scroll right */ void grey_ub_scroll_right(int count) { - unsigned char *dst, *src, *start; - int blank, y, idx; + unsigned char *data, *data_end; + int blank, length; - if ((count == 0) || ((unsigned)count >= (unsigned)_grey_info.width)) + if ((unsigned)count >= (unsigned)_grey_info.width) return; - + + data = _grey_info.values; + data_end = data + _GREY_MULUQ(_grey_info.width, _grey_info.height); + length = (_grey_info.width - count) << _GREY_BSHIFT; + count <<= _GREY_BSHIFT; blank = (_grey_info.drawmode & DRMODE_INVERSEVID) ? _grey_info.fg_val : _grey_info.bg_val; - for (y = 0; y < _grey_info.height; y++) + do { -#if LCD_PIXELFORMAT == HORIZONTAL_PACKING - idx = _GREY_MULUQ(_grey_info.width, y); -#else -#if LCD_DEPTH == 1 - idx = _GREY_MULUQ(_grey_info.width, y & ~7) + (~y & 7); -#elif LCD_DEPTH == 2 - idx = _GREY_MULUQ(_grey_info.width, y & ~3) + (~y & 3); -#endif -#endif /* LCD_PIXELFORMAT */ - start = _grey_info.values + idx; - dst = start + _grey_info.width * _GREY_X_ADVANCE; - src = dst - count * _GREY_X_ADVANCE; - - do - { - dst -= _GREY_X_ADVANCE; - src -= _GREY_X_ADVANCE; - *dst = *src; - } - while (src > start); - - do - { - dst -= _GREY_X_ADVANCE; - *dst = blank; - } - while (dst > start); + _grey_rb->memmove(data + count, data, length); + _grey_rb->memset(data, blank, count); + data += _grey_info.width << _GREY_BSHIFT; } + while (data < data_end); } +/* Scroll up */ void grey_ub_scroll_up(int count) { - unsigned char *dst, *dst_end, *src; - int blank, ys, yd, is, id; + unsigned char *dst, *end, *src; + int blank; if ((unsigned)count >= (unsigned)_grey_info.height) return; + dst = _grey_info.values; + end = dst + _GREY_MULUQ(_grey_info.height, _grey_info.width); blank = (_grey_info.drawmode & DRMODE_INVERSEVID) ? _grey_info.fg_val : _grey_info.bg_val; - for (ys = count, yd = 0; ys < _grey_info.height; ys++, yd++) +#if LCD_PIXELFORMAT == VERTICAL_PACKING + if (count & _GREY_BMASK) { -#if LCD_PIXELFORMAT == HORIZONTAL_PACKING - id = _GREY_MULUQ(_grey_info.width, yd); - is = _GREY_MULUQ(_grey_info.width, ys); -#else -#if LCD_DEPTH == 1 - id = _GREY_MULUQ(_grey_info.width, yd & ~7) + (~yd & 7); - is = _GREY_MULUQ(_grey_info.width, ys & ~7) + (~ys & 7); -#elif LCD_DEPTH == 2 - id = _GREY_MULUQ(_grey_info.width, yd & ~3) + (~yd & 3); - is = _GREY_MULUQ(_grey_info.width, ys & ~3) + (~ys & 3); -#endif -#endif /* LCD_PIXELFORMAT */ - dst = _grey_info.values + id; - src = _grey_info.values + is; - dst_end = dst + _grey_info.width * _GREY_X_ADVANCE; + /* Scrolling by fractional blocks - move pixel wise. */ + unsigned char *line_end; + int ys, yd; - do + for (ys = count, yd = 0; ys < _grey_info.height; ys++, yd++) { - *dst = *src; - dst += _GREY_X_ADVANCE; - src += _GREY_X_ADVANCE; + dst = _grey_info.values + + _GREY_MULUQ(_grey_info.width, yd & ~_GREY_BMASK) + + (~yd & _GREY_BMASK); + src = _grey_info.values + + _GREY_MULUQ(_grey_info.width, ys & ~_GREY_BMASK) + + (~ys & _GREY_BMASK); + line_end = dst + _grey_info.width * _GREY_BSIZE; + + do + { + *dst = *src; + dst += _GREY_BSIZE; + src += _GREY_BSIZE; + } + while (dst < line_end); + } + for (; yd & _GREY_BMASK; yd++) /* Fill remainder of current block. */ + { + dst = _grey_info.values + + _GREY_MULUQ(_grey_info.width, yd & ~_GREY_BMASK) + + (~yd & _GREY_BMASK); + line_end = dst + _grey_info.width * _GREY_BSIZE; + + do + { + *dst = blank; + dst += _GREY_BSIZE; + } + while (dst < line_end); } - while (dst < dst_end); } - for (; yd < _grey_info.height; yd++) - { -#if LCD_PIXELFORMAT == HORIZONTAL_PACKING - id = _GREY_MULUQ(_grey_info.width, yd); -#else -#if LCD_DEPTH == 1 - id = _GREY_MULUQ(_grey_info.width, yd & ~7) + (~yd & 7); -#elif LCD_DEPTH == 2 - id = _GREY_MULUQ(_grey_info.width, yd & ~3) + (~yd & 3); + else #endif -#endif /* LCD_PIXELFORMAT */ - dst = _grey_info.values + id; - dst_end = dst + _grey_info.width * _GREY_X_ADVANCE; + { + int blen = _GREY_MULUQ(_grey_info.height - count, _grey_info.width); - do - { - *dst = blank; - dst += _GREY_X_ADVANCE; - } - while (dst < dst_end); + src = dst + _GREY_MULUQ(count, _grey_info.width); + _grey_rb->memmove(dst, src, blen); + dst += blen; } + _grey_rb->memset(dst, blank, end - dst); /* Fill remainder at once. */ } +/* Scroll down */ void grey_ub_scroll_down(int count) { - unsigned char *dst, *dst_end, *src; - int blank, ys, yd, is, id; + unsigned char *start, *dst, *src; + int blank; if ((unsigned)count >= (unsigned)_grey_info.height) return; + start = _grey_info.values; + dst = start + _GREY_MULUQ(_grey_info.height, _grey_info.width); blank = (_grey_info.drawmode & DRMODE_INVERSEVID) ? _grey_info.fg_val : _grey_info.bg_val; - yd = _grey_info.height - 1; - for (ys = yd - count; ys >= 0; ys--, yd--) +#if LCD_PIXELFORMAT == VERTICAL_PACKING + if (count & _GREY_BMASK) { -#if LCD_PIXELFORMAT == HORIZONTAL_PACKING - id = _GREY_MULUQ(_grey_info.width, yd); - is = _GREY_MULUQ(_grey_info.width, ys); -#else -#if LCD_DEPTH == 1 - id = _GREY_MULUQ(_grey_info.width, yd & ~7) + (~yd & 7); - is = _GREY_MULUQ(_grey_info.width, ys & ~7) + (~ys & 7); -#elif LCD_DEPTH == 2 - id = _GREY_MULUQ(_grey_info.width, yd & ~3) + (~yd & 3); - is = _GREY_MULUQ(_grey_info.width, ys & ~3) + (~ys & 3); -#endif -#endif /* LCD_PIXELFORMAT */ - dst = _grey_info.values + id; - src = _grey_info.values + is; - dst_end = dst + _grey_info.width * _GREY_X_ADVANCE; + /* Scrolling by fractional blocks - move pixel wise. */ + unsigned char *line_end; + int ys, yd; - do + yd = _grey_info.height - 1; + for (ys = yd - count; ys >= 0; ys--, yd--) { - *dst = *src; - dst += _GREY_X_ADVANCE; - src += _GREY_X_ADVANCE; + dst = _grey_info.values + + _GREY_MULUQ(_grey_info.width, yd & ~_GREY_BMASK) + + (~yd & _GREY_BMASK); + src = _grey_info.values + + _GREY_MULUQ(_grey_info.width, ys & ~_GREY_BMASK) + + (~ys & _GREY_BMASK); + line_end = dst + _grey_info.width * _GREY_BSIZE; + + do + { + *dst = *src; + dst += _GREY_BSIZE; + src += _GREY_BSIZE; + } + while (dst < line_end); + } + for (; ~yd & _GREY_BMASK; yd--) /* Fill remainder of current block. */ + { + dst = _grey_info.values + + _GREY_MULUQ(_grey_info.width, yd & ~_GREY_BMASK) + + (~yd & _GREY_BMASK); + line_end = dst + _grey_info.width * _GREY_BSIZE; + + do + { + line_end -= _GREY_BSIZE; + *line_end = blank; + } + while (dst < line_end); } - while (dst < dst_end); } - for (; yd >= 0; yd--) - { -#if LCD_PIXELFORMAT == HORIZONTAL_PACKING - id = _GREY_MULUQ(_grey_info.width, yd); -#else -#if LCD_DEPTH == 1 - id = _GREY_MULUQ(_grey_info.width, yd & ~7) + (~yd & 7); -#elif LCD_DEPTH == 2 - id = _GREY_MULUQ(_grey_info.width, yd & ~3) + (~yd & 3); + else #endif -#endif /* LCD_PIXELFORMAT */ - dst = _grey_info.values + id; - dst_end = dst + _grey_info.width * _GREY_X_ADVANCE; + { + int blen = _GREY_MULUQ(_grey_info.height - count, _grey_info.width); - do - { - *dst = blank; - dst += _GREY_X_ADVANCE; - } - while (dst < dst_end); + dst -= blen; + _grey_rb->memmove(dst, start, blen); } + _grey_rb->memset(start, blank, dst - start); /* Fill remainder at once. */ } #endif /* !SIMULATOR */ -- cgit v1.2.3