mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 01:32:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-media: Ignore GstRTSPStreamBlocking from incomplete streams

Browse source 
To prevent cases with prerolling when the inactive stream prerolls first
and the server proceeds without waiting for the active stream, we will
ignore GstRTSPStreamBlocking messages from incomplete streams. When
there are no complete streams (during DESCRIBE), we will listen to all
streams.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/167>
This commit is contained in:
David Phung 2020-11-03 16:56:28 +01:00
parent 1c8a6af13c
commit 4f673af4b5
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3288,12 +3288,30 @@ default_handle_message (GstRTSPMedia * media, GstMessage * message)
s = gst_message_get_structure (message);
if (gst_structure_has_name (s, "GstRTSPStreamBlocking")) {
GST_DEBUG ("media received blocking message");
priv->blocking_msg_received++;
gboolean is_complete = FALSE;
guint n_active_streams;
guint expected_nbr_blocking_msg;
/* to prevent problems when some streams are complete, some are not,
* we will ignore incomplete streams. When there are no complete
* streams (during DESCRIBE), we will listen to all streams. */
gst_structure_get_boolean (s, "is_complete", &is_complete);
n_active_streams = nbr_active_streams (media);
expected_nbr_blocking_msg = n_active_streams;
GST_DEBUG_OBJECT (media, "media received blocking message,"
" n_active_streams = %d, is_complete = %d",
n_active_streams, is_complete);
if (n_active_streams == 0 || is_complete)
priv->blocking_msg_received++;
if (n_active_streams == 0)
expected_nbr_blocking_msg = priv->streams->len;
if (priv->blocked && media_streams_blocking (media) &&
priv->no_more_pads_pending == 0 &&
(priv->blocking_msg_received == nbr_active_streams (media) ||
priv->blocking_msg_received == priv->streams->len)) {
priv->blocking_msg_received == expected_nbr_blocking_msg) {
GST_DEBUG_OBJECT (GST_MESSAGE_SRC (message), "media is blocking");
g_mutex_lock (&priv->lock);
collect_media_stats (media);

3
gst/rtsp-server/rtsp-stream.c
View file

@ -5317,7 +5317,8 @@ pad_blocking (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
gst_element_post_message (priv->payloader,
gst_message_new_element (GST_OBJECT_CAST (priv->payloader),
gst_structure_new_empty ("GstRTSPStreamBlocking")));
gst_structure_new ("GstRTSPStreamBlocking", "is_complete",
G_TYPE_BOOLEAN, priv->is_complete, NULL)));
done:
return ret;