Merged revisions 52265 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 25 Jan 2007 19:20:51 +0000 (19:20 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 25 Jan 2007 19:20:51 +0000 (19:20 +0000)
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

index 5f32529..189be34 100644 (file)
@@ -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)