-
Notifications
You must be signed in to change notification settings - Fork 0
/
rtcp_time_sync.patch
40 lines (36 loc) · 1.72 KB
/
rtcp_time_sync.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index e75a34cb93..c91f192ab8 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -25,6 +25,7 @@
#include "libavutil/time.h"
#include "avformat.h"
+#include "internal.h"
#include "network.h"
#include "srtp.h"
#include "url.h"
@@ -189,8 +190,7 @@ static int rtcp_parse_packet(RTPDemuxContext *s, const unsigned char *buf,
s->last_rtcp_timestamp = AV_RB32(buf + 16);
if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) {
s->first_rtcp_ntp_time = s->last_rtcp_ntp_time;
- if (!s->base_timestamp)
- s->base_timestamp = s->last_rtcp_timestamp;
+ s->base_timestamp = s->last_rtcp_timestamp;
s->rtcp_ts_offset = (int32_t)(s->last_rtcp_timestamp - s->base_timestamp);
}
@@ -596,14 +596,14 @@ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestam
if (timestamp == RTP_NOTS_VALUE)
return;
- if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE && s->ic->nb_streams > 1) {
+ if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) {
int64_t addend;
int delta_timestamp;
/* compute pts from timestamp with received ntp_time */
delta_timestamp = timestamp - s->last_rtcp_timestamp;
- /* convert to the PTS timebase */
- addend = av_rescale(s->last_rtcp_ntp_time - s->first_rtcp_ntp_time,
+ /* convert to the UNIX Epoch timebase */
+ addend = av_rescale(s->last_rtcp_ntp_time - (NTP_OFFSET << 32),
s->st->time_base.den,
(uint64_t) s->st->time_base.num << 32);
pkt->pts = s->range_start_offset + s->rtcp_ts_offset + addend +