mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-03 15:06:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpbin: applied smoothing to jittery sender time-stamps

Browse source 
Applying a moving average filter to the timestamp offsets
for smoothing jittery and preventing aggressive skew handling.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1409>
This commit is contained in:
Danny Smith 2019-02-26 16:39:55 +01:00 committed by GStreamer Marge Bot
parent d5e257afd1
commit bc964141c8
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
subprojects/gst-plugins-good/gst/rtpmanager/gstrtpbin.c
View file

@ -471,6 +471,8 @@ struct _GstRtpBinStream
/* mapping to local RTP and NTP time */ /* mapping to local RTP and NTP time */
gint64 rt_delta; gint64 rt_delta;
gint64 rtp_delta; gint64 rtp_delta;
gint64 avg_ts_offset;
gboolean is_initialized;
/* base rtptime in gst time */ /* base rtptime in gst time */
gint64 clock_base; gint64 clock_base;
}; };
@ -1032,6 +1034,8 @@ gst_rtp_bin_reset_sync (GstRtpBin * rtpbin)
* lip-sync */ * lip-sync */
stream->have_sync = FALSE; stream->have_sync = FALSE;
stream->rt_delta = 0; stream->rt_delta = 0;
stream->avg_ts_offset = 0;
stream->is_initialized = FALSE;
stream->rtp_delta = 0; stream->rtp_delta = 0;
stream->clock_base = -100 * GST_SECOND; stream->clock_base = -100 * GST_SECOND;
} }
@ -1343,17 +1347,25 @@ stream_set_ts_offset (GstRtpBin * bin, GstRtpBinStream * stream,
return; return;
} }
if (!stream->is_initialized) {
stream->avg_ts_offset = ts_offset;
stream->is_initialized = TRUE;
} else {
stream->avg_ts_offset = (9 * stream->avg_ts_offset + ts_offset) / 10;
}
g_object_get (stream->buffer, "ts-offset", &prev_ts_offset, NULL); g_object_get (stream->buffer, "ts-offset", &prev_ts_offset, NULL);
/* delta changed, see how much */ /* delta changed, see how much */
if (prev_ts_offset != ts_offset) { if (prev_ts_offset != stream->avg_ts_offset) {
gint64 diff; gint64 diff;
diff = prev_ts_offset - ts_offset; diff = prev_ts_offset - stream->avg_ts_offset;
GST_DEBUG_OBJECT (bin, GST_DEBUG_OBJECT (bin,
"ts-offset %" G_GINT64_FORMAT ", prev %" G_GINT64_FORMAT "ts-offset %" G_GINT64_FORMAT ", prev %" G_GINT64_FORMAT
", diff: %" G_GINT64_FORMAT, ts_offset, prev_ts_offset, diff); ", diff: %" G_GINT64_FORMAT, stream->avg_ts_offset, prev_ts_offset,
diff);
/* ignore minor offsets */ /* ignore minor offsets */
if (ABS (diff) < min_ts_offset) { if (ABS (diff) < min_ts_offset) {
@ -1363,21 +1375,21 @@ stream_set_ts_offset (GstRtpBin * bin, GstRtpBinStream * stream,
/* sanity check offset */ /* sanity check offset */
if (max_ts_offset > 0) { if (max_ts_offset > 0) {
if (ts_offset > 0 && !allow_positive_ts_offset) { if (stream->avg_ts_offset > 0 && !allow_positive_ts_offset) {
GST_DEBUG_OBJECT (bin, GST_DEBUG_OBJECT (bin,
"offset is positive (clocks are out of sync), ignoring"); "offset is positive (clocks are out of sync), ignoring");
return; return;
} }
if (ABS (ts_offset) > max_ts_offset) { if (ABS (stream->avg_ts_offset) > max_ts_offset) {
GST_DEBUG_OBJECT (bin, "offset too large, ignoring"); GST_DEBUG_OBJECT (bin, "offset too large, ignoring");
return; return;
} }
} }
g_object_set (stream->buffer, "ts-offset", ts_offset, NULL); g_object_set (stream->buffer, "ts-offset", stream->avg_ts_offset, NULL);
} }
GST_DEBUG_OBJECT (bin, "stream SSRC %08x, delta %" G_GINT64_FORMAT, GST_DEBUG_OBJECT (bin, "stream SSRC %08x, delta %" G_GINT64_FORMAT,
stream->ssrc, ts_offset); stream->ssrc, stream->avg_ts_offset);
} }
static void static void
@ -1825,6 +1837,8 @@ create_stream (GstRtpBinSession * session, guint32 ssrc)
stream->have_sync = FALSE; stream->have_sync = FALSE;
stream->rt_delta = 0; stream->rt_delta = 0;
stream->avg_ts_offset = 0;
stream->is_initialized = FALSE;
stream->rtp_delta = 0; stream->rtp_delta = 0;
stream->percent = 100; stream->percent = 100;
stream->clock_base = -100 * GST_SECOND; stream->clock_base = -100 * GST_SECOND;