mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-stream: Have one copy of the transports cache for RTP and RTCP each

Browse source 
Fixes crash when two threads access handle_new_sample() at the same
time, one for RTP, one for RTCP.

Otherwise, when iterating over the transports cache, it might be modified by
another thread at the same time if the transports cookie has changed.

https://bugzilla.gnome.org/show_bug.cgi?id=742954
This commit is contained in:
Göran Jönsson 2015-01-16 11:10:20 +01:00 committed by Sebastian Dröge
parent fe8e877dd9
commit 0d2de69db9
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -139,7 +139,8 @@ struct _GstRTSPStreamPrivate
guint n_active; guint n_active;
GList *transports; GList *transports;
guint transports_cookie; guint transports_cookie;
GList *tr_cache; GList *tr_cache_rtp;
GList *tr_cache_rtcp;
guint tr_cache_cookie; guint tr_cache_cookie;
/* UDP sources for UDP multicast transports */ /* UDP sources for UDP multicast transports */
@ -1575,11 +1576,17 @@ on_timeout (GObject * session, GObject * source, GstRTSPStream * stream)
} }
static void static void
clear_tr_cache (GstRTSPStreamPrivate * priv) clear_tr_cache (GstRTSPStreamPrivate * priv, gboolean is_rtp)
{ {
g_list_foreach (priv->tr_cache, (GFunc) g_object_unref, NULL); if (is_rtp) {
g_list_free (priv->tr_cache); g_list_foreach (priv->tr_cache_rtp, (GFunc) g_object_unref, NULL);
priv->tr_cache = NULL; g_list_free (priv->tr_cache_rtp);
priv->tr_cache_rtp = NULL;
} else {
g_list_foreach (priv->tr_cache_rtcp, (GFunc) g_object_unref, NULL);
g_list_free (priv->tr_cache_rtcp);
priv->tr_cache_rtcp = NULL;
}
} }
static GstFlowReturn static GstFlowReturn
@ -1604,21 +1611,29 @@ handle_new_sample (GstAppSink * sink, gpointer user_data)
g_mutex_lock (&priv->lock); g_mutex_lock (&priv->lock);
if (priv->tr_cache_cookie != priv->transports_cookie) { if (priv->tr_cache_cookie != priv->transports_cookie) {
clear_tr_cache (priv); clear_tr_cache (priv, is_rtp);
for (walk = priv->transports; walk; walk = g_list_next (walk)) { for (walk = priv->transports; walk; walk = g_list_next (walk)) {
GstRTSPStreamTransport *tr = (GstRTSPStreamTransport *) walk->data; GstRTSPStreamTransport *tr = (GstRTSPStreamTransport *) walk->data;
priv->tr_cache = g_list_prepend (priv->tr_cache, g_object_ref (tr)); if (is_rtp) {
priv->tr_cache_rtp =
g_list_prepend (priv->tr_cache_rtp, g_object_ref (tr));
} else {
priv->tr_cache_rtcp =
g_list_prepend (priv->tr_cache_rtcp, g_object_ref (tr));
}
} }
priv->tr_cache_cookie = priv->transports_cookie; priv->tr_cache_cookie = priv->transports_cookie;
} }
g_mutex_unlock (&priv->lock); g_mutex_unlock (&priv->lock);
for (walk = priv->tr_cache; walk; walk = g_list_next (walk)) {
GstRTSPStreamTransport *tr = (GstRTSPStreamTransport *) walk->data;
if (is_rtp) { if (is_rtp) {
for (walk = priv->tr_cache_rtp; walk; walk = g_list_next (walk)) {
GstRTSPStreamTransport *tr = (GstRTSPStreamTransport *) walk->data;
gst_rtsp_stream_transport_send_rtp (tr, buffer); gst_rtsp_stream_transport_send_rtp (tr, buffer);
}
} else { } else {
for (walk = priv->tr_cache_rtcp; walk; walk = g_list_next (walk)) {
GstRTSPStreamTransport *tr = (GstRTSPStreamTransport *) walk->data;
gst_rtsp_stream_transport_send_rtcp (tr, buffer); gst_rtsp_stream_transport_send_rtcp (tr, buffer);
} }
} }
@ -2099,7 +2114,8 @@ gst_rtsp_stream_leave_bin (GstRTSPStream * stream, GstBin * bin,
if (priv->transports != NULL) if (priv->transports != NULL)
goto transports_not_removed; goto transports_not_removed;
clear_tr_cache (priv); clear_tr_cache (priv, TRUE);
clear_tr_cache (priv, FALSE);
GST_INFO ("stream %p leaving bin", stream); GST_INFO ("stream %p leaving bin", stream);