From e469483d82e420c801b6de87e421b298e793ab64 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Wed, 20 Jan 2010 21:14:47 +0000 Subject: [PATCH] rtp timestamp to timeval calculation fix The rtp timestamp to timeval calculation was only accurate for 8kHz audio. This patch corrects this. Review: https://reviewboard.asterisk.org/r/468/ SWP-648 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@241714 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_rtp_asterisk.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index ac274e8720..e06daa5752 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -1214,21 +1214,10 @@ 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; + struct timeval tmp; double transit; double current_time; double d; @@ -1242,18 +1231,17 @@ static void calc_rxstamp(struct timeval *tv, struct ast_rtp *rtp, unsigned int t rtp->drxcore = (double) rtp->rxcore.tv_sec + (double) rtp->rxcore.tv_usec / 1000000; /* map timestamp to a real time */ rtp->seedrxts = timestamp; /* Their RTP timestamp started with this */ - rtp->rxcore.tv_sec -= timestamp / rate; - rtp->rxcore.tv_usec -= (timestamp % rate) * 125; + tmp = ast_samp2tv(timestamp, rate); + rtp->rxcore = ast_tvsub(rtp->rxcore, tmp); /* Round to 0.1ms for nice, pretty timestamps */ rtp->rxcore.tv_usec -= rtp->rxcore.tv_usec % 100; - 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; - sanitize_tv(tv); + tmp = ast_samp2tv(timestamp, rate); + *tv = ast_tvadd(rtp->rxcore, tmp); + prog = (double)((timestamp-rtp->seedrxts)/(float)(rate)); dtv = (double)rtp->drxcore + (double)(prog); current_time = (double)now.tv_sec + (double)now.tv_usec/1000000;