aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-20 18:21:15 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-20 18:21:15 +0000
commitff670f9a61196a6b1773d239d7de3195d23f4db0 (patch)
treeea6db15acf0d4fabe074de2325d3c33f1813a66d
parent0d8b1b60ac35de8319c240f58c10f934d5c9b262 (diff)
Merged revisions 219654 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r219654 | tilghman | 2009-09-20 12:55:49 -0500 (Sun, 20 Sep 2009) | 15 lines Merged revisions 219653 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r219653 | tilghman | 2009-09-20 12:52:05 -0500 (Sun, 20 Sep 2009) | 8 lines Really stop the stream, when ast_closestream() is called. (closes issue #15129) Reported by: bmh Patches: 20090918__issue15129.diff.txt uploaded by tilghman (license 14) Review: https://reviewboard.asterisk.org/r/372/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@219669 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/file.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c
index 4eb217f4b..26c6b0be6 100644
--- a/main/file.c
+++ b/main/file.c
@@ -869,6 +869,23 @@ int ast_stream_rewind(struct ast_filestream *fs, off_t ms)
int ast_closestream(struct ast_filestream *f)
{
+ /* This used to destroy the filestream, but it now just decrements a refcount.
+ * We need to force the stream to quit queuing frames now, because we might
+ * change the writeformat, which could result in a subsequent write error, if
+ * the format is different. */
+
+ /* Stop a running stream if there is one */
+ if (f->owner) {
+ if (f->fmt->format < AST_FORMAT_AUDIO_MASK) {
+ f->owner->stream = NULL;
+ AST_SCHED_DEL(f->owner->sched, f->owner->streamid);
+ ast_settimeout(f->owner, 0, NULL, NULL);
+ } else {
+ f->owner->vstream = NULL;
+ AST_SCHED_DEL(f->owner->sched, f->owner->vstreamid);
+ }
+ }
+
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