mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpbin: Handle switches between RTP-Info and NTP-based stream association better

Browse source 
Instead of switching on the very first stream, require that all streams
have switched before switching to the different synchronization
mechanism.

Without this there will be a noticeable gap during the switch. E.g. when
going from RTP-Info to NTP-based association, first the first stream
only would get an offset, then the first two, ... then all of them.
Depending on the order of streams this will cause a lot of changes in
ts-offset during the transition.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6543>
This commit is contained in:
Sebastian Dröge 2024-04-17 17:12:13 +03:00 committed by GStreamer Marge Bot
parent b30671a8ee
commit 158f12b5da
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1809,6 +1809,30 @@ gst_rtp_bin_associate (GstRtpBin * bin, GstRtpBinStream * stream,
if (client->nstreams <= 1)
return;
/* If this stream was synced before but with a different mode then wait
* until all streams of this client that were synced before are ready for
* the new mode. Otherwise this can cause unnecessary glitches when
* temporarily a different reference stream is selected because the old
* reference stream is not ready yet for the new mode */
for (walk = client->streams; walk; walk = g_slist_next (walk)) {
GstRtpBinStream *ostream = (GstRtpBinStream *) walk->data;
if (rtp_info_sync && ostream->have_sync == GST_RTP_BIN_STREAM_SYNCED_RTCP) {
if (ostream->rtp_delta == G_MININT64) {
GST_DEBUG_OBJECT (bin,
"Switching sync mode, waiting for all streams to be ready");
return;
}
} else if (!rtp_info_sync
&& ostream->have_sync == GST_RTP_BIN_STREAM_SYNCED_RTP_INFO) {
if (ostream->rt_delta == G_MININT64) {
GST_DEBUG_OBJECT (bin,
"Switching sync mode, waiting for all streams to be ready");
return;
}
}
}
GST_DEBUG_OBJECT (bin,
"client %p RTP-Info sync %d, min delta %" G_GINT64_FORMAT
", min RTP delta %" G_GINT64_FORMAT ", all sync %d", client,