Mercurial > libavformat.hg

changeset 3057:b2853b499660 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix computation of the "NTP time" field in RTCP SR packets, and do not export times with microsecond precision
author lucabe
date Wed, 20 Feb 2008 10:19:35 +0000
parents 4ce8908f4593
children 33ecae58665a
files rtpenc.c
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rtpenc.c	Wed Feb 20 03:40:07 2008 +0000
+++ b/rtpenc.c	Wed Feb 20 10:19:35 2008 +0000
@@ -33,6 +33,13 @@
 //#define DEBUG
 
 #define RTCP_SR_SIZE 28
+#define NTP_OFFSET 2208988800ULL
+#define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL)
+
+static uint64_t ntp_time(void)
+{
+  return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
+}
 
 static int rtp_write_header(AVFormatContext *s1)
 {
@@ -301,8 +308,8 @@
     rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) /
         RTCP_TX_RATIO_DEN;
     if (s->first_packet || ((rtcp_bytes >= RTCP_SR_SIZE) &&
-                           (av_gettime() - s->last_rtcp_ntp_time > 5000000))) {
-        rtcp_send_sr(s1, av_gettime());
+                           (ntp_time() - s->last_rtcp_ntp_time > 5000000))) {
+        rtcp_send_sr(s1, ntp_time());
         s->last_octet_count = s->octet_count;
         s->first_packet = 0;
     }