Commit fb2fc331 authored by Wim Taymans's avatar Wim Taymans
Browse files

pad: take stream lock on serialized queries

parent cd6693fd
...@@ -3122,7 +3122,7 @@ gboolean ...@@ -3122,7 +3122,7 @@ gboolean
gst_pad_query (GstPad * pad, GstQuery * query) gst_pad_query (GstPad * pad, GstQuery * query)
{ {
GstObject *parent; GstObject *parent;
gboolean res; gboolean res, serialized;
GstPadQueryFunction func; GstPadQueryFunction func;
GstPadProbeType type; GstPadProbeType type;
GstFlowReturn ret; GstFlowReturn ret;
...@@ -3144,6 +3144,10 @@ gst_pad_query (GstPad * pad, GstQuery * query) ...@@ -3144,6 +3144,10 @@ gst_pad_query (GstPad * pad, GstQuery * query)
GST_DEBUG_OBJECT (pad, "doing query %p (%s)", query, GST_DEBUG_OBJECT (pad, "doing query %p (%s)", query,
GST_QUERY_TYPE_NAME (query)); GST_QUERY_TYPE_NAME (query));
serialized = GST_QUERY_IS_SERIALIZED (query);
if (G_UNLIKELY (serialized))
GST_PAD_STREAM_LOCK (pad);
GST_OBJECT_LOCK (pad); GST_OBJECT_LOCK (pad);
PROBE_PUSH (pad, type | GST_PAD_PROBE_TYPE_PUSH | PROBE_PUSH (pad, type | GST_PAD_PROBE_TYPE_PUSH |
GST_PAD_PROBE_TYPE_BLOCK, query, probe_stopped); GST_PAD_PROBE_TYPE_BLOCK, query, probe_stopped);
...@@ -3169,6 +3173,9 @@ gst_pad_query (GstPad * pad, GstQuery * query) ...@@ -3169,6 +3173,9 @@ gst_pad_query (GstPad * pad, GstQuery * query)
PROBE_PUSH (pad, type | GST_PAD_PROBE_TYPE_PULL, query, probe_stopped); PROBE_PUSH (pad, type | GST_PAD_PROBE_TYPE_PULL, query, probe_stopped);
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
if (G_UNLIKELY (serialized))
GST_PAD_STREAM_UNLOCK (pad);
return res; return res;
/* ERRORS */ /* ERRORS */
...@@ -3187,23 +3194,31 @@ no_parent: ...@@ -3187,23 +3194,31 @@ no_parent:
{ {
GST_DEBUG_OBJECT (pad, "had no parent"); GST_DEBUG_OBJECT (pad, "had no parent");
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
if (G_UNLIKELY (serialized))
GST_PAD_STREAM_UNLOCK (pad);
return FALSE; return FALSE;
} }
no_func: no_func:
{ {
GST_DEBUG_OBJECT (pad, "had no query function"); GST_DEBUG_OBJECT (pad, "had no query function");
RELEASE_PARENT (parent); RELEASE_PARENT (parent);
if (G_UNLIKELY (serialized))
GST_PAD_STREAM_UNLOCK (pad);
return FALSE; return FALSE;
} }
query_failed: query_failed:
{ {
GST_DEBUG_OBJECT (pad, "query failed"); GST_DEBUG_OBJECT (pad, "query failed");
if (G_UNLIKELY (serialized))
GST_PAD_STREAM_UNLOCK (pad);
return FALSE; return FALSE;
} }
probe_stopped: probe_stopped:
{ {
GST_DEBUG_OBJECT (pad, "probe stopped: %s", gst_flow_get_name (ret)); GST_DEBUG_OBJECT (pad, "probe stopped: %s", gst_flow_get_name (ret));
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
if (G_UNLIKELY (serialized))
GST_PAD_STREAM_UNLOCK (pad);
return FALSE; return FALSE;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment