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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@188415 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/rtp.c b/main/rtp.c
index b6dd019135d4ca64e80c82ae087d6ca06e8c6985..94eab9e9f69bf42a3bbb0a049338eaf5ac4eea10 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -3550,14 +3550,14 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
        } 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;
                        }
                }