From 7b561b95bd62282b159b8230aba3cc5760cf99a2 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Thu, 25 Jan 2007 19:20:51 +0000
Subject: [PATCH] Merged revisions 52265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r52265 | file | 2007-01-25 14:18:33 -0500 (Thu, 25 Jan 2007) | 10 lines
Merged revisions 52264 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r52264 | file | 2007-01-25 14:15:29 -0500 (Thu, 25 Jan 2007) | 2 lines
Allow dequeueing of frames with negative timestamp by moving jitterbuffer frames check to jb_next. (issue #8546 reported by harmen)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/jitterbuf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/jitterbuf.c b/main/jitterbuf.c
index 5f32529f2a..189be34514 100644
--- a/main/jitterbuf.c
+++ b/main/jitterbuf.c
@@ -756,8 +756,8 @@ static enum jb_return_code _jb_get(jitterbuf *jb, jb_frame *frameout, long now,
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->info.conf.target_extra)
--
GitLab