FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Revert "discoverer: Avoid race of adding elements while stopping"

Browse Source 
This reverts commit 9a8cb299702c6e8c01b5f4a366f7cffc6b13f97a.

The problem is deeper down the stack
This commit is contained in:
Edward Hervey 2017-11-04 19:08:40 +01:00
parent ae865ec1d1
commit fcf09c18f2
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gst-libs/gst/pbutils/gstdiscoverer.c
View File

@ -613,14 +613,6 @@ uridecodebin_pad_added_cb (GstElement * uridecodebin, GstPad * pad,
GST_DEBUG_OBJECT (dc, "pad %s:%s", GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_OBJECT (dc, "pad %s:%s", GST_DEBUG_PAD_NAME (pad));
DISCO_LOCK (dc);
if (dc->priv->running == FALSE) {
GST_DEBUG_OBJECT (dc, "We are stopping");
DISCO_UNLOCK (dc);
return;
}
ps = g_slice_new0 (PrivateStream); ps = g_slice_new0 (PrivateStream);
ps->dc = dc; ps->dc = dc;
@ -652,7 +644,9 @@ uridecodebin_pad_added_cb (GstElement * uridecodebin, GstPad * pad,
gst_pad_add_probe (sinkpad, GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM, gst_pad_add_probe (sinkpad, GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM,
(GstPadProbeCallback) got_subtitle_data, dc, NULL); (GstPadProbeCallback) got_subtitle_data, dc, NULL);
g_object_set (ps->sink, "async", FALSE, NULL); g_object_set (ps->sink, "async", FALSE, NULL);
DISCO_LOCK (dc);
dc->priv->pending_subtitle_pads++; dc->priv->pending_subtitle_pads++;
DISCO_UNLOCK (dc);
} }
gst_caps_unref (caps); gst_caps_unref (caps);
@ -676,6 +670,7 @@ uridecodebin_pad_added_cb (GstElement * uridecodebin, GstPad * pad,
gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
(GstPadProbeCallback) _event_probe, ps, NULL); (GstPadProbeCallback) _event_probe, ps, NULL);
DISCO_LOCK (dc);
dc->priv->streams = g_list_append (dc->priv->streams, ps); dc->priv->streams = g_list_append (dc->priv->streams, ps);
DISCO_UNLOCK (dc); DISCO_UNLOCK (dc);
@ -692,7 +687,6 @@ error:
if (ps->sink) if (ps->sink)
gst_object_unref (ps->sink); gst_object_unref (ps->sink);
g_slice_free (PrivateStream, ps); g_slice_free (PrivateStream, ps);
DISCO_UNLOCK (dc);
return; return;
} }