RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-07 01:53:06 +00:00
Code Issues Releases Wiki Activity

using precalculated src*om[][] table -> 25% faster.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7023 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-08-16 16:35:43 +00:00
parent 7eaba4c13d
commit 7bd9c5f32b
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
TOOLS/subfont-c/subfont.c
View File

@ -503,9 +503,10 @@ void outline(
unsigned char *t, unsigned char *t,
int width, int width,
int height, int height,
int *m, unsigned char *m,
int r, int r,
int mwidth) { int mwidth,
int msize) {
int x, y; int x, y;
#if 1 #if 1
@ -525,7 +526,8 @@ void outline(
const int x2=(x+r>=width ) ? r+width -x : 2*r+1; const int x2=(x+r>=width ) ? r+width -x : 2*r+1;
const int y2=(y+r>=height) ? r+height-y : 2*r+1; const int y2=(y+r>=height) ? r+height-y : 2*r+1;
register unsigned char *dstp= t + (y1+y-r)* width + x-r; register unsigned char *dstp= t + (y1+y-r)* width + x-r;
register int *mp = m + y1 *mwidth; //register int *mp = m + y1 *mwidth;
register unsigned char *mp= m + msize*src + y1*mwidth;
int my; int my;
for(my= y1; my<y2; my++){ for(my= y1; my<y2; my++){
@ -533,8 +535,9 @@ void outline(
// int *mp = m + my *mwidth; // int *mp = m + my *mwidth;
register int mx; register int mx;
for(mx= x1; mx<x2; mx++){ for(mx= x1; mx<x2; mx++){
const int tmp= (src*mp[mx] + 128)>>8; // const int tmp= (src*mp[mx] + 128)>>8;
if(dstp[mx] < tmp) dstp[mx]= tmp; // if(dstp[mx] < tmp) dstp[mx]= tmp;
if(dstp[mx] < mp[mx]) dstp[mx]= mp[mx];
} }
dstp+=width; dstp+=width;
mp+=mwidth; mp+=mwidth;
@ -681,6 +684,7 @@ void alpha() {
int const o_r = ceil(thickness); int const o_r = ceil(thickness);
int const g_w = 2*g_r+1; // matrix size int const g_w = 2*g_r+1; // matrix size
int const o_w = 2*o_r+1; // matrix size int const o_w = 2*o_r+1; // matrix size
int const o_size = o_w * o_w;
double const A = log(1.0/base)/(radius*radius*2); double const A = log(1.0/base)/(radius*radius*2);
int mx, my, i; int mx, my, i;
@ -688,7 +692,10 @@ void alpha() {
unsigned *g = (unsigned*)malloc(g_w * sizeof(unsigned)); unsigned *g = (unsigned*)malloc(g_w * sizeof(unsigned));
unsigned *om = (unsigned*)malloc(o_w*o_w * sizeof(unsigned)); unsigned *om = (unsigned*)malloc(o_w*o_w * sizeof(unsigned));
if (g==NULL || om==NULL) ERROR("malloc failed."); unsigned char *omt = malloc(o_size*256);
unsigned char *omtp = omt;
if (g==NULL || om==NULL || omt==NULL) ERROR("malloc failed.");
// gaussian curve // gaussian curve
for (i = 0; i<g_w; ++i) { for (i = 0; i<g_w; ++i) {
@ -711,12 +718,16 @@ void alpha() {
} }
if (DEBUG) eprintf("\n"); if (DEBUG) eprintf("\n");
// outline table:
for(i=0;i<256;i++){
for(mx=0;mx<o_size;mx++) *(omtp++) = (i*om[mx] + (base/2))/base;
}
ttime=GetTimer(); ttime=GetTimer();
if(thickness==1.0) if(thickness==1.0)
outline1(bbuffer, abuffer, width, height); // FAST solid 1 pixel outline outline1(bbuffer, abuffer, width, height); // FAST solid 1 pixel outline
else else
outline(bbuffer, abuffer, width, height, om, o_r, o_w); // solid outline outline(bbuffer, abuffer, width, height, omt, o_r, o_w, o_size); // solid outline
//outline(bbuffer, abuffer, width, height, gm, g_r, g_w); // Gaussian outline //outline(bbuffer, abuffer, width, height, gm, g_r, g_w); // Gaussian outline
ttime=GetTimer()-ttime; ttime=GetTimer()-ttime;
printf("outline: %7d us\n",ttime); printf("outline: %7d us\n",ttime);