devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Pictureflow optimisations: (1) No need to restore the drawmode, the core takes care of that. (2) Making the angle positive before masking is redundant. (3) Slide rendering: * Precalculate a faded reflection table for alpha < 256, saving a multiply in the inner loop. * Group the inner loops so that less variables are precalculated, helping to keep stuff in registers. * Combine loop conditions so that a single check is sufficient.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20456 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2009-03-22 14:45:14 +00:00
parent 005caba3fb
commit 1d8679e7ec
1 changed files with 50 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

114
apps/plugins/pictureflow.c
View file

@ -294,8 +294,6 @@ void reset_track_list(void);
void * buf; void * buf;
size_t buf_size; size_t buf_size;
static int old_drawmode;
static bool thread_is_running; static bool thread_is_running;
static int cover_animation_keyframe; static int cover_animation_keyframe;
@ -502,8 +500,6 @@ static const short sin_tab[] = {
static inline PFreal fsin(int iangle) static inline PFreal fsin(int iangle)
{ {
while(iangle < 0)
iangle += IANGLE_MAX;
iangle &= IANGLE_MASK; iangle &= IANGLE_MASK;
int i = (iangle >> 4); int i = (iangle >> 4);
@ -1460,10 +1456,19 @@ void render_slide(struct slide_data *slide, const int alpha)
const int sw = bmp->width; const int sw = bmp->width;
const int sh = bmp->height; const int sh = bmp->height;
const PFreal slide_left = -sw * PFREAL_HALF + PFREAL_HALF; const PFreal slide_left = -sw * PFREAL_HALF + PFREAL_HALF;
const int h = LCD_HEIGHT;
const int w = LCD_WIDTH; const int w = LCD_WIDTH;
uint8_t reftab[REFLECT_HEIGHT]; /* on stack, which is in IRAM on several targets */
if (alpha == 256) { /* opaque -> copy table */
rb->memcpy(reftab, reflect_table, sizeof(reftab));
} else { /* precalculate faded table */
int i, lalpha;
for (i = 0; i < REFLECT_HEIGHT; i++) {
lalpha = reflect_table[i];
reftab[i] = (MULUQ(lalpha, alpha) + 129) >> 8;
}
}
PFreal cosr = fcos(slide->angle); PFreal cosr = fcos(slide->angle);
PFreal sinr = fsin(slide->angle); PFreal sinr = fsin(slide->angle);
@ -1496,71 +1501,54 @@ void render_slide(struct slide_data *slide, const int alpha)
break; break;
if (zo || slide->angle) if (zo || slide->angle)
dy = (CAM_DIST_R + zo + fmul(xs, sinr)) / CAM_DIST; dy = (CAM_DIST_R + zo + fmul(xs, sinr)) / CAM_DIST;
int y1 = (LCD_HEIGHT / 2) - 1;
int y2 = y1 + 1; const pix_t *ptr = &src[column * bmp->height];
pix_t *pixel1 = &buffer[y1 * BUFFER_WIDTH + x];
pix_t *pixel2 = pixel1 + BUFFER_WIDTH;
const int pixelstep = BUFFER_WIDTH; const int pixelstep = BUFFER_WIDTH;
int p1 = (bmp->height - 1 - (DISPLAY_OFFS)) * PFREAL_ONE; int p = (bmp->height-1-DISPLAY_OFFS) * PFREAL_ONE;
int p2 = p1 + dy; int plim = MAX(0, p - (LCD_HEIGHT/2-1) * dy);
const pix_t *ptr = &src[column * bmp->height]; pix_t *pixel = &buffer[((LCD_HEIGHT/2)-1)*BUFFER_WIDTH + x];
if (alpha == 256) if (alpha == 256) {
{ while (p >= plim) {
while ((y1 >= 0) && (p1 >= 0)) *pixel = ptr[((unsigned)p) >> PFREAL_SHIFT];
{ p -= dy;
*pixel1 = ptr[((unsigned)p1) >> PFREAL_SHIFT]; pixel -= pixelstep;
p1 -= dy;
y1--;
pixel1 -= pixelstep;
} }
while ((p2 < sh * PFREAL_ONE) && (y2 < h)) } else {
{ while (p >= plim) {
*pixel2 = ptr[((unsigned)p2) >> PFREAL_SHIFT]; *pixel = fade_color(ptr[((unsigned)p) >> PFREAL_SHIFT], alpha);
p2 += dy; p -= dy;
y2++; pixel -= pixelstep;
pixel2 += pixelstep;
}
while ((p2 < MIN(sh + REFLECT_HEIGHT, sh * 2) * PFREAL_ONE) &&
(y2 < h))
{
int ty = (((unsigned)p2) >> PFREAL_SHIFT) - sh;
int lalpha = reflect_table[ty];
*pixel2 = fade_color(ptr[sh - 1 - ty],lalpha);
p2 += dy;
y2++;
pixel2 += pixelstep;
} }
} }
else p = (bmp->height-DISPLAY_OFFS) * PFREAL_ONE;
{ plim = MIN(sh * PFREAL_ONE, p + (LCD_HEIGHT/2) * dy);
while ((y1 >= 0) && (p1 >= 0)) int plim2 = MIN(MIN(sh + REFLECT_HEIGHT, sh * 2) * PFREAL_ONE,
{ p + (LCD_HEIGHT/2) * dy);
*pixel1 = fade_color(ptr[((unsigned)p1) >> PFREAL_SHIFT],alpha); pixel = &buffer[(LCD_HEIGHT/2)*BUFFER_WIDTH + x];
p1 -= dy;
y1--; if (alpha == 256) {
pixel1 -= pixelstep; while (p < plim) {
*pixel = ptr[((unsigned)p) >> PFREAL_SHIFT];
p += dy;
pixel += pixelstep;
} }
while ((p2 < sh * PFREAL_ONE) && (y2 < h)) } else {
{ while (p < plim) {
*pixel2 = fade_color(ptr[((unsigned)p2) >> PFREAL_SHIFT],alpha); *pixel = fade_color(ptr[((unsigned)p) >> PFREAL_SHIFT], alpha);
p2 += dy; p += dy;
y2++; pixel += pixelstep;
pixel2 += pixelstep;
}
while ((p2 < MIN(sh + REFLECT_HEIGHT, sh * 2) * PFREAL_ONE) &&
(y2 < h))
{
int ty = (((unsigned)p2) >> PFREAL_SHIFT) - sh;
int lalpha = reflect_table[ty];
lalpha = (MULUQ(lalpha, alpha) + 128) >> 8;
*pixel2 = fade_color(ptr[sh - 1 - ty],lalpha);
p2 += dy;
y2++;
pixel2 += pixelstep;
} }
} }
while (p < plim2) {
int ty = (((unsigned)p) >> PFREAL_SHIFT) - sh;
int lalpha = reftab[ty];
*pixel = fade_color(ptr[sh - 1 - ty], lalpha);
p += dy;
pixel += pixelstep;
}
if (zo || slide->angle) if (zo || slide->angle)
{ {
xsnum += xsnumi; xsnum += xsnumi;
@ -1805,7 +1793,6 @@ void cleanup(void *parameter)
#ifdef USEGSLIB #ifdef USEGSLIB
grey_release(); grey_release();
#endif #endif
rb->lcd_set_drawmode(old_drawmode);
} }
/** /**
@ -2300,7 +2287,6 @@ int main(void)
int fpstxt_y; int fpstxt_y;
bool instant_update; bool instant_update;
old_drawmode = rb->lcd_get_drawmode();
#ifdef USEGSLIB #ifdef USEGSLIB
grey_show(true); grey_show(true);
grey_set_drawmode(DRMODE_FG); grey_set_drawmode(DRMODE_FG);