diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-01 17:53:39 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-01 17:53:39 +0000 |
| commit | d280a37ed6a00dcb959e8b23c2520db8bf21896e (patch) | |
| tree | 2bd1d124d4171b18f5695623f0868d528ea20f95 | |
| parent | 19a36bcf931c949bd91c93d4b87605fcd3f35c15 (diff) | |
Merged revisions 244070 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r244070 | tilghman | 2010-02-01 11:46:31 -0600 (Mon, 01 Feb 2010) | 16 lines
Revert previous chan_local fix (r236981) and fix instead by destroying expired frames in the queue.
(closes issue #16525)
Reported by: kobaz
Patches:
20100126__issue16525.diff.txt uploaded by tilghman (license 14)
20100129__issue16525__1.6.0.diff.txt uploaded by tilghman (license 14)
Tested by: kobaz, atis
(closes issue #16581)
Reported by: ZX81
(closes issue #16681)
Reported by: alexr1
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@244071 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_local.c | 4 | ||||
| -rw-r--r-- | main/channel.c | 30 |
2 files changed, 16 insertions, 18 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index c1eaf92f2..00c058da1 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -257,9 +257,7 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra } if (other) { - if (other->pbx || other->_bridge || !ast_strlen_zero(other->appl)) { - ast_queue_frame(other, f); - } /* else the frame won't go anywhere */ + ast_queue_frame(other, f); ast_channel_unlock(other); } diff --git a/main/channel.c b/main/channel.c index e698709aa..1ba4f1a24 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1104,22 +1104,22 @@ static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, in } } - if ((queued_frames + new_frames) > 128) { - ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name); - while ((f = AST_LIST_REMOVE_HEAD(&frames, frame_list))) { - ast_frfree(f); - } - ast_channel_unlock(chan); - return 0; - } - - if ((queued_voice_frames + new_voice_frames) > 96) { - ast_log(LOG_WARNING, "Exceptionally long voice queue length queuing to %s\n", chan->name); - while ((f = AST_LIST_REMOVE_HEAD(&frames, frame_list))) { - ast_frfree(f); + if ((queued_frames + new_frames > 128 || queued_voice_frames + new_voice_frames > 96)) { + int count = 0; + ast_log(LOG_WARNING, "Exceptionally long %squeue length queuing to %s\n", queued_frames + new_frames > 128 ? "" : "voice ", chan->name); + AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->readq, cur, frame_list) { + /* Save the most recent frame */ + if (!AST_LIST_NEXT(cur, frame_list)) { + break; + } else if (cur->frametype == AST_FRAME_VOICE || cur->frametype == AST_FRAME_VIDEO || cur->frametype == AST_FRAME_NULL) { + if (++count > 64) { + break; + } + AST_LIST_REMOVE_CURRENT(frame_list); + ast_frfree(cur); + } } - ast_channel_unlock(chan); - return 0; + AST_LIST_TRAVERSE_SAFE_END; } if (after) { |