len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16050 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2008-01-10 22:51:33 +00:00
parent 12cc3cc47c
commit df5c3e15e8
4 changed files with 169 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/plugins/lib/grey.h
View file

@ -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
{

60
apps/plugins/lib/grey_core.c
View file

@ -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 */
@ -528,25 +531,30 @@ void grey_update_rect(int x, int y, int width, int height)
src = _grey_info.buffer + _GREY_MULUQ(_grey_info.width, y) + x;
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) + x;
do
{
*dst_row = *src_row++;
dst_row += _GREY_X_ADVANCE;
_grey_rb->memcpy(dst, src, width);
dst += _grey_info.width;
src += _grey_info.width;
}
while (--height > 0);
#else /* LCD_PIXELFORMAT == VRTICAL_PACKING */
do
{
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 = *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

9
apps/plugins/lib/grey_draw.c
View file

@ -641,11 +641,8 @@ void grey_ub_gray_bitmap_part(const unsigned char *src, int src_x, int src_y,
#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);

237
apps/plugins/lib/grey_scroll.c
View file

@ -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++)
{
#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++)
{
#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;
#if LCD_PIXELFORMAT == VERTICAL_PACKING
if (count & _GREY_BMASK)
{
/* Scrolling by fractional blocks - move pixel wise. */
unsigned char *line_end;
int ys, yd;
for (ys = count, yd = 0; ys < _grey_info.height; ys++, yd++)
{
#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;
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_X_ADVANCE;
src += _GREY_X_ADVANCE;
dst += _GREY_BSIZE;
src += _GREY_BSIZE;
}
while (dst < dst_end);
while (dst < line_end);
}
for (; yd < _grey_info.height; yd++)
for (; yd & _GREY_BMASK; yd++) /* Fill remainder of current block. */
{
#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);
#endif
#endif /* LCD_PIXELFORMAT */
dst = _grey_info.values + id;
dst_end = dst + _grey_info.width * _GREY_X_ADVANCE;
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_X_ADVANCE;
dst += _GREY_BSIZE;
}
while (dst < dst_end);
while (dst < line_end);
}
}
else
#endif
{
int blen = _GREY_MULUQ(_grey_info.height - count, _grey_info.width);
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;
#if LCD_PIXELFORMAT == VERTICAL_PACKING
if (count & _GREY_BMASK)
{
/* Scrolling by fractional blocks - move pixel wise. */
unsigned char *line_end;
int ys, yd;
yd = _grey_info.height - 1;
for (ys = yd - count; ys >= 0; ys--, yd--)
{
#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;
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_X_ADVANCE;
src += _GREY_X_ADVANCE;
dst += _GREY_BSIZE;
src += _GREY_BSIZE;
}
while (dst < dst_end);
while (dst < line_end);
}
for (; yd >= 0; yd--)
for (; ~yd & _GREY_BMASK; yd--) /* Fill remainder of current block. */
{
#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);
#endif
#endif /* LCD_PIXELFORMAT */
dst = _grey_info.values + id;
dst_end = dst + _grey_info.width * _GREY_X_ADVANCE;
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_X_ADVANCE;
line_end -= _GREY_BSIZE;
*line_end = blank;
}
while (dst < dst_end);
while (dst < line_end);
}
}
else
#endif
{
int blen = _GREY_MULUQ(_grey_info.height - count, _grey_info.width);
dst -= blen;
_grey_rb->memmove(dst, start, blen);
}
_grey_rb->memset(start, blank, dst - start); /* Fill remainder at once. */
}
#endif /* !SIMULATOR */