diff options
| -rw-r--r-- | funcs/func_timeout.c | 15 | ||||
| -rw-r--r-- | main/file.c | 8 |
2 files changed, 18 insertions, 5 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index a035a0563..2b3a000b4 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -119,11 +119,12 @@ static int timeout_read(struct ast_channel *chan, const char *cmd, char *data, static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, const char *value) { - double x; - long sec; + double x = 0.0; + long sec = 0L; char timestr[64]; struct ast_tm myt; - struct timeval when; + struct timeval when = {0,}; + int res; if (!chan) return -1; @@ -136,9 +137,13 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, if (!value) return -1; - if ((sscanf(value, "%ld%lf", &sec, &x) == 0) || sec < 0) + res = sscanf(value, "%ld%lf", &sec, &x); + if (res == 0 || sec < 0) { when.tv_sec = 0; - else { + when.tv_usec = 0; + } else if (res == 1) { + when.tv_sec = sec; + } else if (res == 2) { when.tv_sec = sec; when.tv_usec = x * 1000000; } diff --git a/main/file.c b/main/file.c index 5e920cc3b..aee964649 100644 --- a/main/file.c +++ b/main/file.c @@ -714,6 +714,10 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) goto return_failure; fr = s->fmt->read(s, &whennext); + if (fr) { + ast_set_flag(fr, AST_FRFLAG_FROM_FILESTREAM); + ao2_ref(s, +1); + } if (!fr /* stream complete */ || ast_write(s->owner, fr) /* error writing */) { if (fr) ast_log(LOG_WARNING, "Failed to write frame\n"); @@ -764,6 +768,10 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s) while (!whennext) { struct ast_frame *fr = s->fmt->read(s, &whennext); + if (fr) { + ast_set_flag(fr, AST_FRFLAG_FROM_FILESTREAM); + ao2_ref(s, +1); + } if (!fr || ast_write(s->owner, fr)) { /* no stream or error, as above */ if (fr) ast_log(LOG_WARNING, "Failed to write frame\n"); |