aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-14 17:43:19 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-14 17:43:19 +0000
commit96bee03247e11a83e20c5a531f14f881c8fcf06b (patch)
treeec629c33a7382e491916ed4f70cb5bcfa62b8e1d /main
parentb91c0f4bb74db01ecb2df45382c8724e05761563 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@188415 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/rtp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/rtp.c b/main/rtp.c
index b6dd01913..94eab9e9f 100644
--- 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;
}
}