aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-25 19:15:29 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-25 19:15:29 +0000
commit6fb60a304de08e30cc3e15228634d5120299ddf4 (patch)
tree04a1f783e2e7978ed4afb863e6a180902e854dff
parent0d4b5312de4c0efa3471473c528e2450c349338c (diff)
Allow dequeueing of frames with negative timestamp by moving jitterbuffer frames check to jb_next. (issue #8546 reported by harmen)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@52264 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--jitterbuf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/jitterbuf.c b/jitterbuf.c
index c952b9c62..7e494a994 100644
--- a/jitterbuf.c
+++ b/jitterbuf.c
@@ -761,8 +761,8 @@ static int _jb_get(jitterbuf *jb, jb_frame *frameout, long now, long interpl)
long jb_next(jitterbuf *jb)
{
if (jb->info.silence_begin_ts) {
- long next = queue_next(jb);
- if (next > 0) {
+ if (jb->frames) {
+ long next = queue_next(jb);
history_get(jb);
/* shrink during silence */
if (jb->info.target - jb->info.current < -JB_TARGET_EXTRA)