mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-05 14:02:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-media: make sure streams are blocked when sending seek

Browse source 
The recent ONVIF work exposed a race condition when dealing with
multiple streams: one of the sinks may preroll before other streams
have started flushing. This led to the pipeline posting async-done
prematurely, when some streams were actually still in the middle
of performing a flushing seek. The newly-added code looks up a
sticky segment event on the first stream in order to respond to
the PLAY request with accurate Scale and Speed headers. In the
failure condition, the first stream was flushing, and thus had
no sticky segment event, leading to the PLAY request failing,
and in turn the test.
This commit is contained in:
Mathieu Duponchelle 2019-06-12 22:19:27 +02:00
parent b545c10e8f
commit ab37286300
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/rtsp-server/rtsp-media.c
View file

@ -2797,6 +2797,7 @@ gst_rtsp_media_seek_trickmode (GstRTSPMedia * media,
res = TRUE;
} else {
GstEvent *seek_event;
gboolean unblock = FALSE;
gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_PREPARING);
@ -2815,8 +2816,21 @@ gst_rtsp_media_seek_trickmode (GstRTSPMedia * media,
gst_event_set_seek_trickmode_interval (seek_event, trickmode_interval);
if (!media->priv->blocked) {
/* Prevent a race condition with multiple streams,
* where one stream may have time to preroll before others
* have even started flushing, causing async-done to be
* posted too early.
*/
media_streams_set_blocked (media, TRUE);
unblock = TRUE;
}
res = gst_element_send_event (priv->pipeline, seek_event);
if (unblock)
media_streams_set_blocked (media, FALSE);
/* and block for the seek to complete */
GST_INFO ("done seeking %d", res);
if (!res)