kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve app_mp3

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-03-27 15:11:03 +00:00
parent ca8a788993
commit f4c5c7a8f1
1 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
apps/app_mp3.c
View File

@@ -73,20 +73,15 @@ static int mp3_exec(struct ast_channel *chan, void *data)
int res=0; int res=0;
struct localuser *u; struct localuser *u;
int fds[2]; int fds[2];
int rfds[1 + AST_MAX_FDS];
int ms = -1; int ms = -1;
int pid = -1; int pid = -1;
int us;
int exception;
int owriteformat; int owriteformat;
struct timeval tv;
struct timeval last; struct timeval last;
struct ast_frame *f; struct ast_frame *f;
int x;
struct myframe { struct myframe {
struct ast_frame f; struct ast_frame f;
char offset[AST_FRIENDLY_OFFSET]; char offset[AST_FRIENDLY_OFFSET];
char frdata[160]; short frdata[160];
} myf; } myf;
last.tv_usec = 0; last.tv_usec = 0;
last.tv_sec = 0; last.tv_sec = 0;
@@ -109,29 +104,20 @@ static int mp3_exec(struct ast_channel *chan, void *data)
} }
res = mp3play((char *)data, fds[1]); res = mp3play((char *)data, fds[1]);
/* Wait 1000 ms first */
ms = 1000;
if (res >= 0) { if (res >= 0) {
pid = res; pid = res;
/* Order is important -- there's almost always going to be mp3... we want to prioritize the /* Order is important -- there's almost always going to be mp3... we want to prioritize the
user */ user */
rfds[AST_MAX_FDS] = fds[0];
for (;;) { for (;;) {
CHECK_BLOCKING(chan); ms = ast_waitfor(chan, ms);
for (x=0;x<AST_MAX_FDS;x++) if (ms < 0) {
rfds[x] = chan->fds[x];
res = ast_waitfor_n_fd(rfds, AST_MAX_FDS+1, &ms, &exception);
chan->blocking = 0;
if (res < 1) {
ast_log(LOG_DEBUG, "Hangup detected\n"); ast_log(LOG_DEBUG, "Hangup detected\n");
res = -1; res = -1;
break; break;
} }
for(x=0;x<AST_MAX_FDS;x++) if (ms) {
if (res == chan->fds[x])
break;
if (x < AST_MAX_FDS) {
if (exception)
chan->exception = 1;
f = ast_read(chan); f = ast_read(chan);
if (!f) { if (!f) {
ast_log(LOG_DEBUG, "Null frame == hangup() detected\n"); ast_log(LOG_DEBUG, "Null frame == hangup() detected\n");
@@ -145,20 +131,7 @@ static int mp3_exec(struct ast_channel *chan, void *data)
break; break;
} }
ast_frfree(f); ast_frfree(f);
} else if (res == fds[0]) { } else {
gettimeofday(&tv, NULL);
if (last.tv_sec || last.tv_usec) {
/* We should wait at least a frame length */
us = sizeof(myf.frdata) / 16 * 1000;
/* Subtract 1,000,000 us for each second late we've passed */
us -= (tv.tv_sec - last.tv_sec) * 1000000;
/* And one for each us late we've passed */
us -= (tv.tv_usec - last.tv_usec);
/* Sleep that long if needed */
if (us > 0)
usleep(us);
}
last = tv;
res = read(fds[0], myf.frdata, sizeof(myf.frdata)); res = read(fds[0], myf.frdata, sizeof(myf.frdata));
if (res > 0) { if (res > 0) {
myf.f.frametype = AST_FRAME_VOICE; myf.f.frametype = AST_FRAME_VOICE;
@@ -176,11 +149,9 @@ static int mp3_exec(struct ast_channel *chan, void *data)
} else { } else {
ast_log(LOG_DEBUG, "No more mp3\n"); ast_log(LOG_DEBUG, "No more mp3\n");
res = 0; res = 0;
break;
} }
} else { ms = res / 16;
ast_log(LOG_DEBUG, "HuhHHH?\n");
res = -1;
break;
} }
} }
} }