From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Mon, 17 Sep 2007 18:34:37 +0000 (+0100)
Subject: don't backtrack rtp_time.  still not good l-(
X-Git-Tag: debian-1_5_99dev8~243^2~53
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/01ddd9093a265f08ba3848a3c5c9b84f347b6e21

don't backtrack rtp_time.  still not good l-(
---

diff --git a/server/speaker.c b/server/speaker.c
index f7e2f59..4c4f421 100644
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -651,8 +651,11 @@ static void play(size_t frames) {
       const long offset =  (((now.tv_sec + now.tv_usec /1000000.0)
                              - (rtp_time_real.tv_sec + rtp_time_real.tv_usec / 1000000.0)) 
                             * playing->format.rate * playing->format.channels);
-      info("offset RTP timestamp by %ld", offset);
-      rtp_time += offset;
+      if(offset >= 0) {
+        info("offset RTP timestamp by %ld", offset);
+        rtp_time += offset;
+      } else
+        xgettimeofday(&rtp_time_real, 0);
     }
     header.vpxcc = 2 << 6;              /* V=2, P=0, X=0, CC=0 */
     header.seq = htons(rtp_seq++);
@@ -715,6 +718,7 @@ static void play(size_t frames) {
       ++rtp_time_real.tv_sec;
       rtp_time_real.tv_usec -= 1000000;
     }
+    assert(rtp_time_real.tv_usec < 1000000);
     break;
   default:
     assert(!"reached");