MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Will be needed by the next patch.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-10-04 11:58:29 -03:00
parent 56c8856966
commit 4e4ac20340
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/internal.h
View File

@ -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.

2
libavformat/movenc.c
View File

@ -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);

8
libavformat/rtpenc.c
View File

@ -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;

1
libavformat/rtpenc.h
View File

@ -21,6 +21,7 @@
#ifndef AVFORMAT_RTPENC_H
#define AVFORMAT_RTPENC_H
#include "libavutil/time.h"
#include "avformat.h"
#include "rtp.h"

4
libavformat/utils.c
View File

@ -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)