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

Back these changes out for now. The initial refcounting

Browse Source 
for filestreams didn't get merged into 1.6.0. I'll have
to get that in first and then put this change in



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-12-22 16:12:34 +00:00
parent 3eb9bd8e4e
commit c01f7c0af8
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/file.c
View File

@@ -659,10 +659,6 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s)
goto return_failure; goto return_failure;
fr = s->fmt->read(s, &whennext); 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 /* stream complete */ || ast_write(s->owner, fr) /* error writing */) {
if (fr) if (fr)
ast_log(LOG_WARNING, "Failed to write frame\n"); ast_log(LOG_WARNING, "Failed to write frame\n");
@@ -719,10 +715,6 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s)
while (!whennext) { while (!whennext) {
struct ast_frame *fr = s->fmt->read(s, &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_write(s->owner, fr)) { /* no stream or error, as above */
if (fr) if (fr)
ast_log(LOG_WARNING, "Failed to write frame\n"); ast_log(LOG_WARNING, "Failed to write frame\n");