kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make indications work more efficiently and without heavy floating point (bug #5360)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6796 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-10-16 03:07:15 +00:00
parent a5dd6a1a14
commit 90cfc9e3bc
1 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
indications.c
View File

@@ -61,10 +61,14 @@ static int midi_tohz[128] = {
}; };
struct playtones_item { struct playtones_item {
int freq1; int fac1;
int freq2; int init_v2_1;
int duration; int init_v3_1;
int fac2;
int init_v2_2;
int init_v3_2;
int modulate; int modulate;
int duration;
}; };
struct playtones_def { struct playtones_def {
@@ -77,10 +81,17 @@ struct playtones_def {
struct playtones_state { struct playtones_state {
int vol; int vol;
int v1_1;
int v2_1;
int v3_1;
int v1_2;
int v2_2;
int v3_2;
int reppos; int reppos;
int nitems; int nitems;
struct playtones_item *items; struct playtones_item *items;
int npos; int npos;
int oldnpos;
int pos; int pos;
int origwfmt; int origwfmt;
struct ast_frame f; struct ast_frame f;
@@ -115,6 +126,7 @@ static void * playtones_alloc(struct ast_channel *chan, void *params)
ps->reppos = pd->reppos; ps->reppos = pd->reppos;
ps->nitems = pd->nitems; ps->nitems = pd->nitems;
ps->items = pd->items; ps->items = pd->items;
ps->oldnpos = -1;
} }
/* Let interrupts interrupt :) */ /* Let interrupts interrupt :) */
if (pd->interruptible) if (pd->interruptible)
@@ -140,20 +152,34 @@ static int playtones_generator(struct ast_channel *chan, void *data, int len, in
memset(&ps->f, 0, sizeof(ps->f)); memset(&ps->f, 0, sizeof(ps->f));
pi = &ps->items[ps->npos]; pi = &ps->items[ps->npos];
for (x=0;x<len/2;x++) { if (ps->oldnpos != ps->npos) {
if (pi->modulate) /* Load new parameters */
/* Modulate 1st tone with 2nd, to 90% modulation depth */ ps->v1_1 = 0;
ps->data[x] = ps->vol * 2 * ( ps->v2_1 = pi->init_v2_1;
sin((pi->freq1 * 2.0 * M_PI / 8000.0) * (ps->pos + x)) * ps->v3_1 = pi->init_v3_1;
(0.9 * fabs(sin((pi->freq2 * 2.0 * M_PI / 8000.0) * (ps->pos + x))) + 0.1) ps->v1_2 = 0;
); ps->v2_2 = pi->init_v2_2;
else ps->v3_2 = pi->init_v3_2;
/* Add 2 tones together */ ps->oldnpos = ps->npos;
ps->data[x] = ps->vol * (
sin((pi->freq1 * 2.0 * M_PI / 8000.0) * (ps->pos + x)) +
sin((pi->freq2 * 2.0 * M_PI / 8000.0) * (ps->pos + x))
);
} }
for (x=0;x<len/2;x++) {
ps->v1_1 = ps->v2_1;
ps->v2_1 = ps->v3_1;
ps->v3_1 = (pi->fac1 * ps->v2_1 >> 15) - ps->v1_1;
ps->v1_2 = ps->v2_2;
ps->v2_2 = ps->v3_2;
ps->v3_2 = (pi->fac2 * ps->v2_2 >> 15) - ps->v1_2;
if (pi->modulate) {
int p;
p = ps->v3_2 - 32768;
if (p < 0) p = -p;
p = ((p * 9) / 10) + 1;
ps->data[x] = (ps->v3_1 * p) >> 15;
} else
ps->data[x] = ps->v3_1 + ps->v3_2;
}
ps->f.frametype = AST_FRAME_VOICE; ps->f.frametype = AST_FRAME_VOICE;
ps->f.subclass = AST_FORMAT_SLINEAR; ps->f.subclass = AST_FORMAT_SLINEAR;
ps->f.datalen = len; ps->f.datalen = len;
@@ -192,7 +218,7 @@ int ast_playtones_start(struct ast_channel *chan, int vol, const char *playlst,
if (!data) if (!data)
return -1; return -1;
if (vol < 1) if (vol < 1)
d.vol = 8192; d.vol = 7219; /* Default to -8db */
d.interruptible = interruptible; d.interruptible = interruptible;
@@ -278,8 +304,13 @@ int ast_playtones_start(struct ast_channel *chan, int vol, const char *playlst,
ast_log(LOG_WARNING, "Realloc failed!\n"); ast_log(LOG_WARNING, "Realloc failed!\n");
return -1; return -1;
} }
d.items[d.nitems].freq1 = freq1; d.items[d.nitems].fac1 = 2.0 * cos(2.0 * M_PI * (freq1 / 8000.0)) * 32768.0;
d.items[d.nitems].freq2 = freq2; d.items[d.nitems].init_v2_1 = sin(-4.0 * M_PI * (freq1 / 8000.0)) * d.vol;
d.items[d.nitems].init_v3_1 = sin(-2.0 * M_PI * (freq1 / 8000.0)) * d.vol;
d.items[d.nitems].fac2 = 2.0 * cos(2.0 * M_PI * (freq2 / 8000.0)) * 32768.0;
d.items[d.nitems].init_v2_2 = sin(-4.0 * M_PI * (freq2 / 8000.0)) * d.vol;
d.items[d.nitems].init_v3_2 = sin(-2.0 * M_PI * (freq2 / 8000.0)) * d.vol;
d.items[d.nitems].duration = time; d.items[d.nitems].duration = time;
d.items[d.nitems].modulate = modulate; d.items[d.nitems].modulate = modulate;
d.nitems++; d.nitems++;