ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Oct  4 11:58:29 
2019 -0300| [4e4ac2034048271d280235860240c795dabeed99] | committer: James Almer

avformat/utils: make ff_ntp_time() accept a timestamp as input argument

Will be needed by the next patch.

Signed-off-by: James Almer <jamr...@gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e4ac2034048271d280235860240c795dabeed99
---

 libavformat/internal.h | 2 +-
 libavformat/movenc.c   | 2 +-
 libavformat/rtpenc.c   | 8 ++++----
 libavformat/rtpenc.h   | 1 +
 libavformat/utils.c    | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libavformat/internal.h b/libavformat/internal.h
index ec9a29907a..4d04a21871 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -243,7 +243,7 @@ void ff_read_frame_flush(AVFormatContext *s);
 #define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL)
 
 /** Get the current time since NTP epoch in microseconds. */
-uint64_t ff_ntp_time(void);
+uint64_t ff_ntp_time(int64_t timestamp);
 
 /**
  * Get the NTP time stamp formatted as per the RFC-5905.
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 450b3f50f2..4a3a594bc6 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4648,7 +4648,7 @@ static int mov_write_prft_tag(AVIOContext *pb, 
MOVMuxContext *mov, int tracks)
     }
 
     if (mov->write_prft == MOV_PRFT_SRC_WALLCLOCK) {
-        ntp_ts = ff_get_formatted_ntp_time(ff_ntp_time());
+        ntp_ts = ff_get_formatted_ntp_time(ff_ntp_time(av_gettime()));
     } else if (mov->write_prft == MOV_PRFT_SRC_PTS) {
         pts_us = av_rescale_q(first_track->cluster[0].pts,
                               first_track->st->time_base, AV_TIME_BASE_Q);
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 63047beccc..b4f2504123 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -124,7 +124,7 @@ static int rtp_write_header(AVFormatContext *s1)
     if (!s->ssrc)
         s->ssrc = av_get_random_seed();
     s->first_packet = 1;
-    s->first_rtcp_ntp_time = ff_ntp_time();
+    s->first_rtcp_ntp_time = ff_ntp_time(av_gettime());
     if (s1->start_time_realtime != 0  &&  s1->start_time_realtime != 
AV_NOPTS_VALUE)
         /* Round the NTP time to whole milliseconds. */
         s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 +
@@ -526,9 +526,9 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket 
*pkt)
     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) &&
-                            (ff_ntp_time() - s->last_rtcp_ntp_time > 
5000000))) &&
+                            (ff_ntp_time(av_gettime()) - s->last_rtcp_ntp_time 
> 5000000))) &&
         !(s->flags & FF_RTP_FLAG_SKIP_RTCP)) {
-        rtcp_send_sr(s1, ff_ntp_time(), 0);
+        rtcp_send_sr(s1, ff_ntp_time(av_gettime()), 0);
         s->last_octet_count = s->octet_count;
         s->first_packet = 0;
     }
@@ -642,7 +642,7 @@ static int rtp_write_trailer(AVFormatContext *s1)
     /* If the caller closes and recreates ->pb, this might actually
      * be NULL here even if it was successfully allocated at the start. */
     if (s1->pb && (s->flags & FF_RTP_FLAG_SEND_BYE))
-        rtcp_send_sr(s1, ff_ntp_time(), 1);
+        rtcp_send_sr(s1, ff_ntp_time(av_gettime()), 1);
     av_freep(&s->buf);
 
     return 0;
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h
index 62dc9ab10a..e67ce665f1 100644
--- a/libavformat/rtpenc.h
+++ b/libavformat/rtpenc.h
@@ -21,6 +21,7 @@
 #ifndef AVFORMAT_RTPENC_H
 #define AVFORMAT_RTPENC_H
 
+#include "libavutil/time.h"
 #include "avformat.h"
 #include "rtp.h"
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index f3d71642c3..674757a63f 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4684,9 +4684,9 @@ void av_program_add_stream_index(AVFormatContext *ac, int 
progid, unsigned idx)
     }
 }
 
-uint64_t ff_ntp_time(void)
+uint64_t ff_ntp_time(int64_t timestamp)
 {
-    return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
+    return (timestamp / 1000) * 1000 + NTP_OFFSET_US;
 }
 
 uint64_t ff_get_formatted_ntp_time(uint64_t ntp_time_us)

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

Reply via email to