mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

flvmux: Support rollover in timestamp

Browse source 
For live streams, if we keep the stream for a long time, the timestamp
will be larger than max_uint32. In that case, timestamp should be handled
as a rollover timestamp rather than a backward timestamp.
This commit is contained in:
Yeongjin Jeong 2020-02-18 14:58:00 +09:00
parent 63ae338c24
commit e836640bd5
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/flv/gstflvmux.c
View file

@ -833,7 +833,7 @@ gst_flv_mux_create_metadata (GstFlvMux * mux)
const GstTagList *tags;
GstBuffer *script_tag, *tmp;
GstMapInfo map;
guint32 dts;
guint64 dts;
guint8 *data;
gint i, n_tags, tags_written = 0;
@ -846,9 +846,16 @@ gst_flv_mux_create_metadata (GstFlvMux * mux)
dts -= mux->first_timestamp / GST_MSECOND;
}
GST_DEBUG_OBJECT (mux, "Creating metadata, dts %i, tags = %" GST_PTR_FORMAT,
GST_DEBUG_OBJECT (mux,
"Creating metadata, dts %" G_GUINT64_FORMAT ", tags = %" GST_PTR_FORMAT,
dts, tags);
if (dts > G_MAXUINT32) {
GST_LOG_OBJECT (mux,
"Detected rollover, timestamp will be truncated (previous:%"
G_GUINT64_FORMAT ", new:%u)", dts, (guint32) dts);
}
/* FIXME perhaps some bytewriter'ing here ... */
_gst_buffer_new_and_alloc (11, &script_tag, &data);
@ -1158,7 +1165,7 @@ gst_flv_mux_buffer_to_tag_internal (GstFlvMux * mux, GstBuffer * buffer,
GstBuffer *tag;
GstMapInfo map;
guint size;
guint32 pts, dts, cts;
guint64 pts, dts, cts;
guint8 *data, *bdata = NULL;
gsize bsize = 0;
@ -1194,7 +1201,15 @@ gst_flv_mux_buffer_to_tag_internal (GstFlvMux * mux, GstBuffer * buffer,
pts = dts + cts;
}
GST_LOG_OBJECT (mux, "got pts %i dts %i cts %i", pts, dts, cts);
GST_LOG_OBJECT (mux,
"got pts %" G_GUINT64_FORMAT " dts %" G_GUINT64_FORMAT " cts %"
G_GUINT64_FORMAT, pts, dts, cts);
if (dts > G_MAXUINT32) {
GST_LOG_OBJECT (mux,
"Detected rollover, timestamp will be truncated (previous:%"
G_GUINT64_FORMAT ", new:%u)", dts, (guint32) dts);
}
if (buffer != NULL) {
gst_buffer_map (buffer, &map, GST_MAP_READ);