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

pad: not only describe conditions in the docs, also check them in the code

Browse source 
When blocking pads, check if the pad is in the rigt direction. Log some info
for the developer and return FALSE, instead of just locking up.
This commit is contained in:
Stefan Sauer 2011-10-20 08:57:57 +02:00
parent 3ab02d8fdc
commit ad438461a6
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/gstpad.c
View file

@ -1038,7 +1038,7 @@ gst_pad_is_active (GstPad * pad)
* and sink pads in pull mode.
* </note>
*
* Returns: TRUE if the pad could be blocked. This function can fail if the
* Returns: %TRUE if the pad could be blocked. This function can fail if the
* wrong parameters were passed or the pad was already in the requested state.
*
* MT safe.
@ -1061,6 +1061,15 @@ gst_pad_set_blocked_async_full (GstPad * pad, gboolean blocked,
if (G_UNLIKELY (was_blocked == blocked))
goto had_right_state;
if (G_UNLIKELY (
(GST_PAD_ACTIVATE_MODE (pad) == GST_ACTIVATE_PUSH) &&
(GST_PAD_DIRECTION (pad) != GST_PAD_SRC)))
goto wrong_direction;
if (G_UNLIKELY (
(GST_PAD_ACTIVATE_MODE (pad) == GST_ACTIVATE_PULL) &&
(GST_PAD_DIRECTION (pad) != GST_PAD_SINK)))
goto wrong_direction;
if (blocked) {
GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad, "blocking pad");
@ -1104,12 +1113,22 @@ gst_pad_set_blocked_async_full (GstPad * pad, gboolean blocked,
return TRUE;
/* Errors */
had_right_state:
{
GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
"pad was in right state (%d)", was_blocked);
GST_OBJECT_UNLOCK (pad);
return FALSE;
}
wrong_direction:
{
GST_CAT_INFO_OBJECT (GST_CAT_SCHEDULING, pad, "pad block on the wrong pad, "
"block src pads in push mode and sink pads in pull mode.");
GST_OBJECT_UNLOCK (pad);
return FALSE;
}
}