kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Round offset timestamps to nearest 20ms to clean up numbers.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2486 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-03-20 05:19:45 +00:00
parent be59053650
commit 7192fbfae7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_iax2.c
View File

@@ -2562,6 +2562,8 @@ static unsigned int fix_peerts(struct iax2_peer *peer, int callno, unsigned int
if (!iaxs[callno]->rxcore.tv_sec && !iaxs[callno]->rxcore.tv_usec) { if (!iaxs[callno]->rxcore.tv_sec && !iaxs[callno]->rxcore.tv_usec) {
/* Initialize rxcore time if appropriate */ /* Initialize rxcore time if appropriate */
gettimeofday(&iaxs[callno]->rxcore, NULL); gettimeofday(&iaxs[callno]->rxcore, NULL);
/* Round to nearest 20ms */
iaxs[callno]->rxcore.tv_usec -= iaxs[callno]->rxcore.tv_usec % 20000;
} }
/* Calculate difference between trunk and channel */ /* Calculate difference between trunk and channel */
ms = (peer->rxtrunktime.tv_sec - iaxs[callno]->rxcore.tv_sec) * 1000 + ms = (peer->rxtrunktime.tv_sec - iaxs[callno]->rxcore.tv_sec) * 1000 +
@@ -2574,8 +2576,11 @@ static unsigned int calc_timestamp(struct chan_iax2_pvt *p, unsigned int ts, str
{ {
struct timeval tv; struct timeval tv;
unsigned int ms; unsigned int ms;
if (!p->offset.tv_sec && !p->offset.tv_usec) if (!p->offset.tv_sec && !p->offset.tv_usec) {
gettimeofday(&p->offset, NULL); gettimeofday(&p->offset, NULL);
/* Round to nearest 20ms */
p->offset.tv_usec -= p->offset.tv_usec % 20000;
}
/* If the timestamp is specified, just send it as is */ /* If the timestamp is specified, just send it as is */
if (ts) if (ts)
return ts; return ts;
@@ -2586,8 +2591,9 @@ static unsigned int calc_timestamp(struct chan_iax2_pvt *p, unsigned int ts, str
ms = (tv.tv_sec - p->offset.tv_sec) * 1000 + (tv.tv_usec - p->offset.tv_usec) / 1000; ms = (tv.tv_sec - p->offset.tv_sec) * 1000 + (tv.tv_usec - p->offset.tv_usec) / 1000;
} }
/* We never send the same timestamp twice, so fudge a little if we must */ /* We never send the same timestamp twice, so fudge a little if we must */
if (ms <= p->lastsent) if (ms <= p->lastsent) {
ms = p->lastsent + 1; ms = p->lastsent + 1;
}
p->lastsent = ms; p->lastsent = ms;
return ms; return ms;
} }

1
rtp.c
View File

@@ -366,6 +366,7 @@ static void calc_rxstamp(struct timeval *tv, struct ast_rtp *rtp, unsigned int t
gettimeofday(&rtp->rxcore, NULL); gettimeofday(&rtp->rxcore, NULL);
rtp->rxcore.tv_sec -= timestamp / 8000; rtp->rxcore.tv_sec -= timestamp / 8000;
rtp->rxcore.tv_usec -= (timestamp % 8000) * 125; rtp->rxcore.tv_usec -= (timestamp % 8000) * 125;
rtp->rxcore.tv_usec -= rtp->rxcore.tv_usec % 20000;
if (rtp->rxcore.tv_usec < 0) { if (rtp->rxcore.tv_usec < 0) {
/* Adjust appropriately if necessary */ /* Adjust appropriately if necessary */
rtp->rxcore.tv_usec += 1000000; rtp->rxcore.tv_usec += 1000000;