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

rtspsrc: manage race between connection closing and flushing

Browse source 
... where the former can happen in task thread and the latter in mainloop
upon downward state change.
This commit is contained in:
Mark Nauwelaerts 2012-08-03 14:10:32 +02:00
parent 94ab6e17f5
commit a549b0bf2c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/rtsp/gstrtspsrc.c
View file

@ -3332,6 +3332,7 @@ static GstRTSPResult
gst_rtsp_conninfo_close (GstRTSPSrc * src, GstRTSPConnInfo * info, gst_rtsp_conninfo_close (GstRTSPSrc * src, GstRTSPConnInfo * info,
gboolean free) gboolean free)
{ {
GST_RTSP_STATE_LOCK (src);
if (info->connected) { if (info->connected) {
GST_DEBUG_OBJECT (src, "closing connection..."); GST_DEBUG_OBJECT (src, "closing connection...");
gst_rtsp_connection_close (info->connection); gst_rtsp_connection_close (info->connection);
@ -3343,6 +3344,7 @@ gst_rtsp_conninfo_close (GstRTSPSrc * src, GstRTSPConnInfo * info,
gst_rtsp_connection_free (info->connection); gst_rtsp_connection_free (info->connection);
info->connection = NULL; info->connection = NULL;
} }
GST_RTSP_STATE_UNLOCK (src);
return GST_RTSP_OK; return GST_RTSP_OK;
} }
@ -3365,6 +3367,7 @@ gst_rtspsrc_connection_flush (GstRTSPSrc * src, gboolean flush)
GList *walk; GList *walk;
GST_DEBUG_OBJECT (src, "set flushing %d", flush); GST_DEBUG_OBJECT (src, "set flushing %d", flush);
GST_RTSP_STATE_LOCK (src);
if (src->conninfo.connection) { if (src->conninfo.connection) {
GST_DEBUG_OBJECT (src, "connection flush"); GST_DEBUG_OBJECT (src, "connection flush");
gst_rtsp_connection_flush (src->conninfo.connection, flush); gst_rtsp_connection_flush (src->conninfo.connection, flush);
@ -3375,6 +3378,7 @@ gst_rtspsrc_connection_flush (GstRTSPSrc * src, gboolean flush)
if (stream->conninfo.connection) if (stream->conninfo.connection)
gst_rtsp_connection_flush (stream->conninfo.connection, flush); gst_rtsp_connection_flush (stream->conninfo.connection, flush);
} }
GST_RTSP_STATE_UNLOCK (src);
} }
/* FIXME, handle server request, reply with OK, for now */ /* FIXME, handle server request, reply with OK, for now */