[Asterisk-cvs] asterisk/channels chan_iax2.c,1.292,1.293

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv9036/channels

Modified Files:
	chan_iax2.c 
Log Message:
Yet another set of jitter buffer changes (this time some scheduling improvements) (bug #4319)


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- chan_iax2.c	19 May 2005 00:34:28 -0000	1.292
+++ chan_iax2.c	19 May 2005 01:24:09 -0000	1.293
@@ -2222,6 +2222,7 @@
 {
 #ifdef NEWJB
 	int type, len;
+	int ret;
 #else
 	int x;
 	int ms;
@@ -2387,10 +2388,11 @@
 
 	/* insert into jitterbuffer */
 	/* TODO: Perhaps we could act immediately if it's not droppable and late */
-	if(jb_put(iaxs[fr->callno]->jb, fr, type, len, fr->ts,
-	     calc_rxstamp(iaxs[fr->callno],fr->ts)) == JB_DROP) {
+	ret = jb_put(iaxs[fr->callno]->jb, fr, type, len, fr->ts,
+			calc_rxstamp(iaxs[fr->callno],fr->ts));
+	if (ret == JB_DROP) {
 		iax2_frame_free(fr);
-	} else {
+	} else if (ret == JB_SCHED) {
 		update_jbsched(iaxs[fr->callno]);
 	}
 #else