Merged revisions 224671 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r224671 | kpfleming | 2009-10-19 18:47:39 -0500 (Mon, 19 Oct 2009) | 14 lines

  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/branches/1.6.0@224672 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/rtp.c b/main/rtp.c
index 94736ebf650d7b24b3e209851f5a9a2c09d0f4a1..1d66a507904ea9bd9a2c7189269dc7f294c303b6 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -1320,6 +1320,18 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp)
        return f;
 }
 
+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;
@@ -1339,21 +1351,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;