mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-media: Correct logic on GstRTSPStreamBlocking message reception

Browse source 
We must take into account the receiving streams as well when calculating
the expected number of the received GstRTSPStreamBlocking messages.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2429>
This commit is contained in:
Patricia Muscalu 2022-05-16 18:06:16 +02:00 committed by GStreamer Marge Bot
parent 556ee45bfa
commit 6c3445a83f
1 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media.c
View file

@ -3164,7 +3164,27 @@ set_target_state (GstRTSPMedia * media, GstState state, gboolean do_state)
} }
static void static void
stream_collect_active_sender (GstRTSPStream * stream, guint * active_streams) stream_collect_receiver_streams (GstRTSPStream * stream,
guint * receiver_streams)
{
if (!gst_rtsp_stream_is_sender (stream))
(*receiver_streams)++;
}
static guint
get_num_receiver_streams (GstRTSPMedia * media)
{
guint ret = 0;
g_ptr_array_foreach (media->priv->streams,
(GFunc) stream_collect_receiver_streams, &ret);
return ret;
}
static void
stream_collect_complete_sender (GstRTSPStream * stream, guint * active_streams)
{ {
if (gst_rtsp_stream_is_complete (stream) if (gst_rtsp_stream_is_complete (stream)
&& gst_rtsp_stream_is_sender (stream)) && gst_rtsp_stream_is_sender (stream))
@ -3172,12 +3192,12 @@ stream_collect_active_sender (GstRTSPStream * stream, guint * active_streams)
} }
static guint static guint
nbr_active_sender_streams (GstRTSPMedia * media) get_num_complete_sender_streams (GstRTSPMedia * media)
{ {
guint ret = 0; guint ret = 0;
g_ptr_array_foreach (media->priv->streams, g_ptr_array_foreach (media->priv->streams,
(GFunc) stream_collect_active_sender, &ret); (GFunc) stream_collect_complete_sender, &ret);
return ret; return ret;
} }
@ -3290,29 +3310,30 @@ default_handle_message (GstRTSPMedia * media, GstMessage * message)
s = gst_message_get_structure (message); s = gst_message_get_structure (message);
if (gst_structure_has_name (s, "GstRTSPStreamBlocking")) { if (gst_structure_has_name (s, "GstRTSPStreamBlocking")) {
gboolean is_complete = FALSE; gboolean is_complete = FALSE;
guint n_active_sender_streams; guint num_complete_sender_streams =
guint expected_nbr_blocking_msg; get_num_complete_sender_streams (media);
guint num_recv_streams = get_num_receiver_streams (media);
guint expected_num_blocking_msg;
/* to prevent problems when some streams are complete, some are not, /* to prevent problems when some streams are complete, some are not,
* we will ignore incomplete streams. When there are no complete * we will ignore incomplete streams. When there are no complete
* streams (during DESCRIBE), we will listen to all streams. */ * streams (during DESCRIBE), we will listen to all streams. */
gst_structure_get_boolean (s, "is_complete", &is_complete); gst_structure_get_boolean (s, "is_complete", &is_complete);
n_active_sender_streams = nbr_active_sender_streams (media); expected_num_blocking_msg = num_complete_sender_streams;
expected_nbr_blocking_msg = n_active_sender_streams;
GST_DEBUG_OBJECT (media, "media received blocking message," GST_DEBUG_OBJECT (media, "media received blocking message,"
" n_active_sender_streams = %d, is_complete = %d", " num_complete_sender_streams = %d, is_complete = %d",
n_active_sender_streams, is_complete); num_complete_sender_streams, is_complete);
if (n_active_sender_streams == 0 || is_complete) if (num_complete_sender_streams == 0 || is_complete)
priv->blocking_msg_received++; priv->blocking_msg_received++;
if (n_active_sender_streams == 0) if (num_complete_sender_streams == 0)
expected_nbr_blocking_msg = priv->streams->len; expected_num_blocking_msg = priv->streams->len - num_recv_streams;
if (priv->blocked && media_streams_blocking (media) && if (priv->blocked && media_streams_blocking (media) &&
priv->no_more_pads_pending == 0 && priv->no_more_pads_pending == 0 &&
priv->blocking_msg_received == expected_nbr_blocking_msg) { priv->blocking_msg_received == expected_num_blocking_msg) {
GST_DEBUG_OBJECT (GST_MESSAGE_SRC (message), "media is blocking"); GST_DEBUG_OBJECT (GST_MESSAGE_SRC (message), "media is blocking");
g_mutex_lock (&priv->lock); g_mutex_lock (&priv->lock);
collect_media_stats (media); collect_media_stats (media);