diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-10-19 23:47:39 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-10-19 23:47:39 +0000 |
| commit | 092a118d8906e6df8dc355cb39160f6de316df92 (patch) | |
| tree | 2936c0e0dbc344430126b9fa4a57d6c5faad4eb7 | |
| parent | 26638d3a550219159766dc4eab65354bd4c2c3d7 (diff) | |
Merged revisions 224670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r224670 | kpfleming | 2009-10-19 18:44:07 -0500 (Mon, 19 Oct 2009) | 7 lines
Correct timestamp calculations when RTP sample rates over 8kHz are used.
While testing some endpoints that support 16kHz and 32kHz sample rates, some
log messages were generated due to calc_rxstamp() computing timestamps in a way
that produced odd results, so this patch sanitizes the result of the
computations.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@224671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | res/res_rtp_asterisk.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 711c4900e..2fde7a419 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -1212,6 +1212,18 @@ static int ast_rtp_write(struct ast_rtp_instance *instance, struct ast_frame *fr return 0; } +static void sanitize_tv(struct timeval *tv) +{ + while (tv->tv_usec < 0) { + tv->tv_usec += 1000000; + tv->tv_sec -= 1; + } + while (tv->tv_usec >= 1000000) { + tv->tv_usec -= 1000000; + tv->tv_sec += 1; + } +} + static void calc_rxstamp(struct timeval *tv, struct ast_rtp *rtp, unsigned int timestamp, int mark) { struct timeval now; @@ -1232,21 +1244,14 @@ static void calc_rxstamp(struct timeval *tv, struct ast_rtp *rtp, unsigned int t rtp->rxcore.tv_usec -= (timestamp % rate) * 125; /* Round to 0.1ms for nice, pretty timestamps */ rtp->rxcore.tv_usec -= rtp->rxcore.tv_usec % 100; - if (rtp->rxcore.tv_usec < 0) { - /* Adjust appropriately if necessary */ - rtp->rxcore.tv_usec += 1000000; - rtp->rxcore.tv_sec -= 1; - } + sanitize_tv(&rtp->rxcore); } gettimeofday(&now,NULL); /* rxcore is the mapping between the RTP timestamp and _our_ real time from gettimeofday() */ tv->tv_sec = rtp->rxcore.tv_sec + timestamp / rate; tv->tv_usec = rtp->rxcore.tv_usec + (timestamp % rate) * 125; - if (tv->tv_usec >= 1000000) { - tv->tv_usec -= 1000000; - tv->tv_sec += 1; - } + sanitize_tv(tv); prog = (double)((timestamp-rtp->seedrxts)/(float)(rate)); dtv = (double)rtp->drxcore + (double)(prog); current_time = (double)now.tv_sec + (double)now.tv_usec/1000000; |