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

adaptivedemux: avoid pushing events with manifest lock

Browse source 
It can be an easy source of deadlocks. Reproducible with very
fast connections (local server).
This commit is contained in:
Thiago Santos 2015-12-08 14:06:21 -03:00
parent c82d702985
commit 2fdd5dca14
1 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -1662,6 +1662,9 @@ gst_adaptive_demux_stream_push_buffer (GstAdaptiveDemuxStream * stream,
GstAdaptiveDemux *demux = stream->demux; GstAdaptiveDemux *demux = stream->demux;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
gboolean discont = FALSE; gboolean discont = FALSE;
/* Pending events */
GstEvent *pending_caps = NULL, *pending_segment = NULL, *pending_tags = NULL;
GList *pending_events = NULL;
if (stream->first_fragment_buffer) { if (stream->first_fragment_buffer) {
GstClockTime offset = GstClockTime offset =
@ -1711,18 +1714,13 @@ gst_adaptive_demux_stream_push_buffer (GstAdaptiveDemuxStream * stream,
GST_BUFFER_DURATION (buffer) = GST_CLOCK_TIME_NONE; GST_BUFFER_DURATION (buffer) = GST_CLOCK_TIME_NONE;
GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE; GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
if (G_UNLIKELY (stream->pending_caps)) { if (G_UNLIKELY (stream->pending_caps)) {
GST_DEBUG_OBJECT (stream->pad, "Setting pending caps: %" GST_PTR_FORMAT, pending_caps = gst_event_new_caps (stream->pending_caps);
stream->pending_caps);
gst_pad_set_caps (stream->pad, stream->pending_caps);
gst_caps_unref (stream->pending_caps); gst_caps_unref (stream->pending_caps);
stream->pending_caps = NULL; stream->pending_caps = NULL;
} }
if (G_UNLIKELY (stream->pending_segment)) { if (G_UNLIKELY (stream->pending_segment)) {
GST_DEBUG_OBJECT (stream->pad, "Sending pending seg: %" GST_PTR_FORMAT, pending_segment = stream->pending_segment;
stream->pending_segment);
gst_pad_push_event (stream->pad, stream->pending_segment);
stream->pending_segment = NULL; stream->pending_segment = NULL;
} }
if (G_UNLIKELY (stream->pending_tags || stream->bitrate_changed)) { if (G_UNLIKELY (stream->pending_tags || stream->bitrate_changed)) {
@ -1740,22 +1738,40 @@ gst_adaptive_demux_stream_push_buffer (GstAdaptiveDemuxStream * stream,
gst_tag_list_add (tags, GST_TAG_MERGE_KEEP, gst_tag_list_add (tags, GST_TAG_MERGE_KEEP,
GST_TAG_NOMINAL_BITRATE, stream->fragment.bitrate, NULL); GST_TAG_NOMINAL_BITRATE, stream->fragment.bitrate, NULL);
} }
GST_DEBUG_OBJECT (stream->pad, "Sending pending tags: %" GST_PTR_FORMAT, pending_tags = gst_event_new_tag (tags);
stream->pending_tags);
gst_pad_push_event (stream->pad, gst_event_new_tag (tags));
} }
while (stream->pending_events != NULL) { if (G_UNLIKELY (stream->pending_events)) {
GstEvent *event = stream->pending_events->data; pending_events = stream->pending_events;
stream->pending_events = NULL;
}
GST_MANIFEST_UNLOCK (demux);
/* Do not push events or buffers holding the manifest lock */
if (G_UNLIKELY (pending_caps)) {
GST_DEBUG_OBJECT (stream->pad, "Setting pending caps: %" GST_PTR_FORMAT,
pending_caps);
gst_pad_push_event (stream->pad, pending_caps);
}
if (G_UNLIKELY (pending_segment)) {
GST_DEBUG_OBJECT (stream->pad, "Sending pending seg: %" GST_PTR_FORMAT,
pending_segment);
gst_pad_push_event (stream->pad, pending_segment);
}
if (G_UNLIKELY (pending_tags)) {
GST_DEBUG_OBJECT (stream->pad, "Sending pending tags: %" GST_PTR_FORMAT,
pending_tags);
gst_pad_push_event (stream->pad, pending_tags);
}
while (pending_events != NULL) {
GstEvent *event = pending_events->data;
if (!gst_pad_push_event (stream->pad, event)) if (!gst_pad_push_event (stream->pad, event))
GST_ERROR_OBJECT (stream->pad, "Failed to send pending event"); GST_ERROR_OBJECT (stream->pad, "Failed to send pending event");
stream->pending_events = pending_events = g_list_delete_link (pending_events, pending_events);
g_list_delete_link (stream->pending_events, stream->pending_events);
} }
GST_MANIFEST_UNLOCK (demux);
ret = gst_pad_push (stream->pad, buffer); ret = gst_pad_push (stream->pad, buffer);
GST_MANIFEST_LOCK (demux); GST_MANIFEST_LOCK (demux);