[asterisk-commits] file: branch 1.6.0 r188414 - in /branches/1.6.0: ./ main/rtp.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Apr 14 12:42:11 2009
New Revision: 188414

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=188414
Log:
Merged revisions 188413 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r188413 | file | 2009-04-14 14:40:50 -0300 (Tue, 14 Apr 2009) | 5 lines
  
  Fix an incorrect clock rate when sending T140 text.
  
  (closes issue #14029)
  Reported by: epicac
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/rtp.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/rtp.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/rtp.c?view=diff&rev=188414&r1=188413&r2=188414
==============================================================================
--- branches/1.6.0/main/rtp.c (original)
+++ branches/1.6.0/main/rtp.c Tue Apr 14 12:42:11 2009
@@ -3056,14 +3056,14 @@
 	} else {
 		pred = rtp->lastotexttimestamp + f->samples;
 		/* Re-calculate last TS */
-		rtp->lastts = rtp->lastts + ms * 90;
+		rtp->lastts = rtp->lastts + ms;
 		/* If it's close to our prediction, go for it */
 		if (ast_tvzero(f->delivery)) {
 			if (abs(rtp->lastts - pred) < 7200) {
 				rtp->lastts = pred;
 				rtp->lastotexttimestamp += f->samples;
 			} else {
-				ast_debug(3, "Difference is %d, ms is %d (%d), pred/ts/samples %d/%d/%d\n", abs(rtp->lastts - pred), ms, ms * 90, rtp->lastts, pred, f->samples);
+				ast_debug(3, "Difference is %d, ms is %d, pred/ts/samples %d/%d/%d\n", abs(rtp->lastts - pred), ms, rtp->lastts, pred, f->samples);
 				rtp->lastotexttimestamp = rtp->lastts;
 			}
 		}