mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 05:31:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspclientsink: fix possible shutdown deadlock collect_streams()

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1696>
This commit is contained in:
Pierre Bourré 2022-02-15 13:39:43 +00:00 committed by GStreamer Marge Bot
parent 4ef3b1ad8f
commit 4ac544d5aa
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.c
View file

@ -3601,6 +3601,18 @@ request_fec_encoder (GstElement * rtpbin, guint sessid,
return ret; return ret;
} }
static gboolean
gst_rtsp_client_sink_is_stopping (GstRTSPClientSink * sink)
{
gboolean is_stopping;
GST_OBJECT_LOCK (sink);
is_stopping = sink->task == NULL;
GST_OBJECT_UNLOCK (sink);
return is_stopping;
}
static gboolean static gboolean
gst_rtsp_client_sink_collect_streams (GstRTSPClientSink * sink) gst_rtsp_client_sink_collect_streams (GstRTSPClientSink * sink)
{ {
@ -3640,7 +3652,8 @@ gst_rtsp_client_sink_collect_streams (GstRTSPClientSink * sink)
continue; continue;
g_mutex_lock (&sink->preroll_lock); g_mutex_lock (&sink->preroll_lock);
while (!context->prerolled && !sink->conninfo.flushing) { while (!context->prerolled && !sink->conninfo.flushing
&& !gst_rtsp_client_sink_is_stopping (sink)) {
GST_DEBUG_OBJECT (sink, "Waiting for caps on stream %d", context->index); GST_DEBUG_OBJECT (sink, "Waiting for caps on stream %d", context->index);
g_cond_wait (&sink->preroll_cond, &sink->preroll_lock); g_cond_wait (&sink->preroll_cond, &sink->preroll_lock);
} }
@ -4374,18 +4387,6 @@ done:
return res; return res;
} }
static gboolean
gst_rtsp_client_sink_is_stopping (GstRTSPClientSink * sink)
{
gboolean is_stopping;
GST_OBJECT_LOCK (sink);
is_stopping = sink->task == NULL;
GST_OBJECT_UNLOCK (sink);
return is_stopping;
}
static GstRTSPResult static GstRTSPResult
gst_rtsp_client_sink_record (GstRTSPClientSink * sink, gboolean async) gst_rtsp_client_sink_record (GstRTSPClientSink * sink, gboolean async)
{ {
@ -4989,6 +4990,10 @@ gst_rtsp_client_sink_stop (GstRTSPClientSink * sink)
g_cond_broadcast (&sink->block_streams_cond); g_cond_broadcast (&sink->block_streams_cond);
g_mutex_unlock (&sink->block_streams_lock); g_mutex_unlock (&sink->block_streams_lock);
g_mutex_lock (&sink->preroll_lock);
g_cond_broadcast (&sink->preroll_cond);
g_mutex_unlock (&sink->preroll_lock);
/* make sure it is not running */ /* make sure it is not running */
GST_RTSP_STREAM_LOCK (sink); GST_RTSP_STREAM_LOCK (sink);
GST_RTSP_STREAM_UNLOCK (sink); GST_RTSP_STREAM_UNLOCK (sink);