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

pad: enforce correct query direction

Browse source
This commit is contained in:
Wim Taymans 2012-03-14 15:16:56 +01:00
parent 5a21eb36c7
commit cd6693fdc9
1 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gst/gstpad.c
View file

@ -3130,13 +3130,19 @@ gst_pad_query (GstPad * pad, GstQuery * query)
g_return_val_if_fail (GST_IS_PAD (pad), FALSE); g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
g_return_val_if_fail (GST_IS_QUERY (query), FALSE); g_return_val_if_fail (GST_IS_QUERY (query), FALSE);
GST_DEBUG_OBJECT (pad, "sending query %p (%s)", query, if (GST_PAD_IS_SRC (pad)) {
GST_QUERY_TYPE_NAME (query)); if (G_UNLIKELY (!GST_QUERY_IS_UPSTREAM (query)))
goto wrong_direction;
if (GST_PAD_IS_SRC (pad))
type = GST_PAD_PROBE_TYPE_QUERY_UPSTREAM; type = GST_PAD_PROBE_TYPE_QUERY_UPSTREAM;
else } else if (GST_PAD_IS_SINK (pad)) {
if (G_UNLIKELY (!GST_QUERY_IS_DOWNSTREAM (query)))
goto wrong_direction;
type = GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM; type = GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM;
} else
goto unknown_direction;
GST_DEBUG_OBJECT (pad, "doing query %p (%s)", query,
GST_QUERY_TYPE_NAME (query));
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 |
@ -3166,6 +3172,17 @@ gst_pad_query (GstPad * pad, GstQuery * query)
return res; return res;
/* ERRORS */ /* ERRORS */
wrong_direction:
{
g_warning ("pad %s:%s query %s in wrong direction",
GST_DEBUG_PAD_NAME (pad), GST_QUERY_TYPE_NAME (query));
return FALSE;
}
unknown_direction:
{
g_warning ("pad %s:%s has invalid direction", GST_DEBUG_PAD_NAME (pad));
return FALSE;
}
no_parent: no_parent:
{ {
GST_DEBUG_OBJECT (pad, "had no parent"); GST_DEBUG_OBJECT (pad, "had no parent");
@ -3217,10 +3234,16 @@ gst_pad_peer_query (GstPad * pad, GstQuery * query)
g_return_val_if_fail (GST_IS_PAD (pad), FALSE); g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
g_return_val_if_fail (GST_IS_QUERY (query), FALSE); g_return_val_if_fail (GST_IS_QUERY (query), FALSE);
if (GST_PAD_IS_SRC (pad)) if (GST_PAD_IS_SRC (pad)) {
if (G_UNLIKELY (!GST_QUERY_IS_DOWNSTREAM (query)))
goto wrong_direction;
type = GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM; type = GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM;
else } else if (GST_PAD_IS_SINK (pad)) {
if (G_UNLIKELY (!GST_QUERY_IS_UPSTREAM (query)))
goto wrong_direction;
type = GST_PAD_PROBE_TYPE_QUERY_UPSTREAM; type = GST_PAD_PROBE_TYPE_QUERY_UPSTREAM;
} else
goto unknown_direction;
GST_DEBUG_OBJECT (pad, "peer query %p (%s)", query, GST_DEBUG_OBJECT (pad, "peer query %p (%s)", query,
GST_QUERY_TYPE_NAME (query)); GST_QUERY_TYPE_NAME (query));
@ -3251,6 +3274,17 @@ gst_pad_peer_query (GstPad * pad, GstQuery * query)
return res; return res;
/* ERRORS */ /* ERRORS */
wrong_direction:
{
g_warning ("pad %s:%s query %s in wrong direction",
GST_DEBUG_PAD_NAME (pad), GST_QUERY_TYPE_NAME (query));
return FALSE;
}
unknown_direction:
{
g_warning ("pad %s:%s has invalid direction", GST_DEBUG_PAD_NAME (pad));
return FALSE;
}
no_peer: no_peer:
{ {
GST_WARNING_OBJECT (pad, "pad has no peer"); GST_WARNING_OBJECT (pad, "pad has no peer");
@ -4204,7 +4238,6 @@ gst_pad_push_event (GstPad * pad, GstEvent * event)
gboolean sticky, serialized; gboolean sticky, serialized;
g_return_val_if_fail (GST_IS_PAD (pad), FALSE); g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
g_return_val_if_fail (GST_IS_EVENT (event), FALSE); g_return_val_if_fail (GST_IS_EVENT (event), FALSE);
if (GST_PAD_IS_SRC (pad)) { if (GST_PAD_IS_SRC (pad)) {