[Asterisk-cvs] asterisk rtp.c,1.52,1.53

[markster at lists.digium.com]

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

Modified Files:
	rtp.c 
Log Message:
Cleanups of RX/TX calculations


Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- rtp.c	13 Mar 2004 03:52:14 -0000	1.52
+++ rtp.c	14 Mar 2004 05:31:47 -0000	1.53
@@ -353,7 +353,7 @@
 {
 	if (!rtp->rxcore.tv_sec && !rtp->rxcore.tv_usec) {
 		gettimeofday(&rtp->rxcore, NULL);
-		rtp->rxcore.tv_usec -= timestamp / 8000;
+		rtp->rxcore.tv_sec -= timestamp / 8000;
 		rtp->rxcore.tv_usec -= (timestamp % 8000) * 125;
 		if (rtp->rxcore.tv_usec < 0) {
 			/* Adjust appropriately if necessary */
@@ -847,7 +847,7 @@
 	}
 	if (delivery && (delivery->tv_sec || delivery->tv_usec)) {
 		/* Use previous txcore */
-		ms = (delivery->tv_sec - rtp->txcore.tv_usec) * 1000;
+		ms = (delivery->tv_sec - rtp->txcore.tv_sec) * 1000;
 		ms += (delivery->tv_usec - rtp->txcore.tv_usec) / 1000;
 		rtp->txcore.tv_sec = delivery->tv_sec;
 		rtp->txcore.tv_usec = delivery->tv_usec;
@@ -969,14 +969,16 @@
 		default:
 			ast_log(LOG_WARNING, "Not sure about timestamp format for codec format %s\n", ast_getformatname(f->subclass));
 		}
-
 		/* Re-calculate last TS */
 		rtp->lastts = rtp->lastts + ms * 8;
-		/* If it's close to our prediction, go for it */
-		if (abs(rtp->lastts - pred) < 640)
-			rtp->lastts = pred;
-		else
-			ast_log(LOG_DEBUG, "Difference is %d, ms is %d\n", abs(rtp->lastts - pred), ms);
+		if (!f->delivery.tv_sec && f->delivery.tv_usec) {
+			/* If this isn't an absolute delivery time, Check if it is close to our prediction, 
+			   and if so, go with our prediction */
+			if (abs(rtp->lastts - pred) < 640)
+				rtp->lastts = pred;
+			else
+				ast_log(LOG_DEBUG, "Difference is %d, ms is %d\n", abs(rtp->lastts - pred), ms);
+		}
 	} else {
 		mark = f->subclass & 0x1;
 		pred = rtp->lastovidtimestamp + f->samples;