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

Update ast_readvideo_callback to match ast_readaudio_callback.

Browse Source 
This fixes potential refcount errors that may occur on ast_filestreams.

AST-208



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@188582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2009-04-15 20:04:20 +00:00
parent f967bdc670
commit 730f2882d3
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/file.c
View File

@@ -798,12 +798,21 @@ 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_write(s->owner, fr)) { /* no stream or error, as above */
if (fr)
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");
ast_frfree(fr);
}
s->owner->vstreamid = -1;
return FSREAD_FAILURE;
}
if (fr) {
ast_frfree(fr);
}
}
if (whennext != s->lasttimeout) {