diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/file.c | 84 | ||||
| -rw-r--r-- | main/frame.c | 3 |
2 files changed, 38 insertions, 49 deletions
diff --git a/main/file.c b/main/file.c index d110d72f9..57282c316 100644 --- a/main/file.c +++ b/main/file.c @@ -706,17 +706,36 @@ struct ast_filestream *ast_openvstream(struct ast_channel *chan, const char *fil return NULL; } -struct ast_frame *ast_readframe(struct ast_filestream *s) +static struct ast_frame *read_frame(struct ast_filestream *s, int *whennext) { - struct ast_frame *f = NULL; - int whennext = 0; - if (s && s->fmt) - f = s->fmt->read(s, &whennext); - if (f) { - ast_set_flag(f, AST_FRFLAG_FROM_FILESTREAM); - ao2_ref(s, +1); + struct ast_frame *fr, *new_fr; + + if (!s || !s->fmt) { + return NULL; + } + + if (!(fr = s->fmt->read(s, whennext))) { + return NULL; + } + + if (!(new_fr = ast_frisolate(fr))) { + ast_frfree(fr); + return NULL; + } + + if (new_fr != fr) { + ast_frfree(fr); + fr = new_fr; } - return f; + + return fr; +} + +struct ast_frame *ast_readframe(struct ast_filestream *s) +{ + int whennext = 0; + + return read_frame(s, &whennext); } enum fsread_res { @@ -733,15 +752,13 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) while (!whennext) { struct ast_frame *fr; - - if (s->orig_chan_name && strcasecmp(s->owner->name, s->orig_chan_name)) + + if (s->orig_chan_name && strcasecmp(s->owner->name, s->orig_chan_name)) { goto return_failure; - - fr = s->fmt->read(s, &whennext); - if (fr) { - ast_set_flag(fr, AST_FRFLAG_FROM_FILESTREAM); - ao2_ref(s, +1); } + + fr = read_frame(s, &whennext); + if (!fr /* stream complete */ || ast_write(s->owner, fr) /* error writing */) { if (fr) { ast_log(LOG_WARNING, "Failed to write frame\n"); @@ -749,10 +766,12 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) } goto return_failure; } + if (fr) { ast_frfree(fr); } } + if (whennext != s->lasttimeout) { #ifdef HAVE_DAHDI if (s->owner->timingfd > -1) { @@ -803,11 +822,8 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s) int whennext = 0; 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); - } + struct ast_frame *fr = read_frame(s, &whennext); + if (!fr /* stream complete */ || ast_write(s->owner, fr) /* error writing */) { if (fr) { ast_log(LOG_WARNING, "Failed to write frame\n"); @@ -816,6 +832,7 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s) s->owner->vstreamid = -1; return FSREAD_FAILURE; } + if (fr) { ast_frfree(fr); } @@ -907,20 +924,6 @@ int ast_closestream(struct ast_filestream *f) } } - if (ast_test_flag(&f->fr, AST_FRFLAG_FROM_FILESTREAM)) { - /* If this flag is still set, it essentially means that the reference - * count of f is non-zero. We can't destroy this filestream until - * whatever is using the filestream's frame has finished. - * - * Since this was called, however, we need to remove the reference from - * when this filestream was first allocated. That way, when the embedded - * frame is freed, the refcount will reach 0 and we can finish destroying - * this filestream properly. - */ - ao2_ref(f, -1); - return 0; - } - ao2_ref(f, -1); return 0; } @@ -1338,17 +1341,6 @@ int ast_waitstream_exten(struct ast_channel *c, const char *context) -1, -1, context); } -void ast_filestream_frame_freed(struct ast_frame *fr) -{ - struct ast_filestream *fs; - - ast_clear_flag(fr, AST_FRFLAG_FROM_FILESTREAM); - - fs = (struct ast_filestream *) (((char *) fr) - offsetof(struct ast_filestream, fr)); - - ao2_ref(fs, -1); -} - /* * if the file name is non-empty, try to play it. * Return 0 if success, -1 if error, digit if interrupted by a digit. diff --git a/main/frame.c b/main/frame.c index 9de8a700a..6cd886123 100644 --- a/main/frame.c +++ b/main/frame.c @@ -346,8 +346,6 @@ static void __frame_free(struct ast_frame *fr, int cache) ast_translate_frame_freed(fr); } else if (ast_test_flag(fr, AST_FRFLAG_FROM_DSP)) { ast_dsp_frame_freed(fr); - } else if (ast_test_flag(fr, AST_FRFLAG_FROM_FILESTREAM)) { - ast_filestream_frame_freed(fr); } if (!fr->mallocd) @@ -436,7 +434,6 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr) } else { ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR); ast_clear_flag(fr, AST_FRFLAG_FROM_DSP); - ast_clear_flag(fr, AST_FRFLAG_FROM_FILESTREAM); out = fr; } |