[svn-commits] file: trunk r52266 - in /trunk: ./ main/jitterbuf.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Jan 25 13:20:51 2007
New Revision: 52266

URL: http://svn.digium.com/view/asterisk?view=rev&rev=52266
Log:
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)

........

................

Modified:
    trunk/   (props changed)
    trunk/main/jitterbuf.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/jitterbuf.c
URL: http://svn.digium.com/view/asterisk/trunk/main/jitterbuf.c?view=diff&rev=52266&r1=52265&r2=52266
==============================================================================
--- trunk/main/jitterbuf.c (original)
+++ trunk/main/jitterbuf.c Thu Jan 25 13:20:51 2007
@@ -756,8 +756,8 @@
 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)