dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Add the video stream for AGI function STREAM FILE (issue #5392 reported by areski -- minor mods by me) 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@30547 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2006-05-26 17:43:11 +00:00
parent 328608aece
commit cb0181db21
1 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
res/res_agi.c
View File

@ -537,7 +537,9 @@ static int handle_controlstreamfile(struct ast_channel *chan, AGI *agi, int argc
static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char *argv[]) static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char *argv[])
{ {
int res; int res;
int vres;
struct ast_filestream *fs; struct ast_filestream *fs;
struct ast_filestream *vfs;
long sample_offset = 0; long sample_offset = 0;
long max_length; long max_length;
@ -546,16 +548,26 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char
if ((argc > 4) && (sscanf(argv[4], "%ld", &sample_offset) != 1)) if ((argc > 4) && (sscanf(argv[4], "%ld", &sample_offset) != 1))
return RESULT_SHOWUSAGE; return RESULT_SHOWUSAGE;
fs = ast_openstream(chan, argv[2], chan->language); fs = ast_openstream(chan, argv[2], chan->language);
if (!fs){
if (!fs) {
fdprintf(agi->fd, "200 result=%d endpos=%ld\n", 0, sample_offset); fdprintf(agi->fd, "200 result=%d endpos=%ld\n", 0, sample_offset);
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
vfs = ast_openvstream(chan, argv[2], chan->language);
if (vfs)
ast_log(LOG_DEBUG, "Ooh, found a video stream, too\n");
ast_seekstream(fs, 0, SEEK_END); ast_seekstream(fs, 0, SEEK_END);
max_length = ast_tellstream(fs); max_length = ast_tellstream(fs);
ast_seekstream(fs, sample_offset, SEEK_SET); ast_seekstream(fs, sample_offset, SEEK_SET);
res = ast_applystream(chan, fs); res = ast_applystream(chan, fs);
if (vfs)
vres = ast_applystream(chan, vfs);
res = ast_playstream(fs); res = ast_playstream(fs);
if (vfs)
vres = ast_playstream(vfs);
if (res) { if (res) {
fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset); fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset);
return (res >= 0) ? RESULT_SHOWUSAGE : RESULT_FAILURE; return (res >= 0) ? RESULT_SHOWUSAGE : RESULT_FAILURE;
@ -576,10 +588,12 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char
/* get option - really similar to the handle_streamfile, but with a timeout */ /* get option - really similar to the handle_streamfile, but with a timeout */
static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, char *argv[]) static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, char *argv[])
{ {
int res; int res;
struct ast_filestream *fs; int vres;
long sample_offset = 0; struct ast_filestream *fs;
long max_length; struct ast_filestream *vfs;
long sample_offset = 0;
long max_length;
int timeout = 0; int timeout = 0;
char *edigits = NULL; char *edigits = NULL;
@ -596,43 +610,51 @@ static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, char *
timeout = chan->pbx->dtimeout * 1000; /* in msec */ timeout = chan->pbx->dtimeout * 1000; /* in msec */
} }
fs = ast_openstream(chan, argv[2], chan->language); fs = ast_openstream(chan, argv[2], chan->language);
if (!fs){ if (!fs) {
fdprintf(agi->fd, "200 result=%d endpos=%ld\n", 0, sample_offset); fdprintf(agi->fd, "200 result=%d endpos=%ld\n", 0, sample_offset);
ast_log(LOG_WARNING, "Unable to open %s\n", argv[2]); ast_log(LOG_WARNING, "Unable to open %s\n", argv[2]);
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
vfs = ast_openvstream(chan, argv[2], chan->language);
if (vfs)
ast_log(LOG_DEBUG, "Ooh, found a video stream, too\n");
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Playing '%s' (escape_digits=%s) (timeout %d)\n", argv[2], edigits, timeout); ast_verbose(VERBOSE_PREFIX_3 "Playing '%s' (escape_digits=%s) (timeout %d)\n", argv[2], edigits, timeout);
ast_seekstream(fs, 0, SEEK_END); ast_seekstream(fs, 0, SEEK_END);
max_length = ast_tellstream(fs); max_length = ast_tellstream(fs);
ast_seekstream(fs, sample_offset, SEEK_SET); ast_seekstream(fs, sample_offset, SEEK_SET);
res = ast_applystream(chan, fs); res = ast_applystream(chan, fs);
res = ast_playstream(fs); if (vfs)
if (res) { vres = ast_applystream(chan, vfs);
fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset); res = ast_playstream(fs);
if (res >= 0) if (vfs)
return RESULT_SHOWUSAGE; vres = ast_playstream(vfs);
else if (res) {
return RESULT_FAILURE; fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset);
} if (res >= 0)
res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl); return RESULT_SHOWUSAGE;
/* this is to check for if ast_waitstream closed the stream, we probably are at else
* the end of the stream, return that amount, else check for the amount */ return RESULT_FAILURE;
sample_offset = (chan->stream)?ast_tellstream(fs):max_length; }
ast_stopstream(chan); res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl);
if (res == 1) { /* this is to check for if ast_waitstream closed the stream, we probably are at
/* Stop this command, don't print a result line, as there is a new command */ * the end of the stream, return that amount, else check for the amount */
return RESULT_SUCCESS; sample_offset = (chan->stream)?ast_tellstream(fs):max_length;
} ast_stopstream(chan);
if (res == 1) {
/* Stop this command, don't print a result line, as there is a new command */
return RESULT_SUCCESS;
}
/* If the user didnt press a key, wait for digitTimeout*/ /* If the user didnt press a key, wait for digitTimeout*/
if (res == 0 ) { if (res == 0 ) {
res = ast_waitfordigit_full(chan, timeout, agi->audio, agi->ctrl); res = ast_waitfordigit_full(chan, timeout, agi->audio, agi->ctrl);
/* Make sure the new result is in the escape digits of the GET OPTION */ /* Make sure the new result is in the escape digits of the GET OPTION */
if ( !strchr(edigits,res) ) if ( !strchr(edigits,res) )
res=0; res=0;
} }
fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset); fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset);