element: don't mess with pad caps in activate

When deactivating a pad, let the pad decide what fields to clear.
This commit is contained in:
Wim Taymans 2011-05-06 15:55:31 +02:00
parent 3122f429cd
commit 3d949e988b

View file

@ -2696,17 +2696,6 @@ activate_pads (const GValue * vpad, GValue * ret, gboolean * active)
return cont; return cont;
} }
/* set the caps on the pad to NULL */
static gboolean
clear_caps (const GValue * vpad, GValue * ret, gboolean * active)
{
GstPad *pad = g_value_get_object (vpad);
gst_pad_set_caps (pad, NULL);
return TRUE;
}
/* returns false on error or early cutout of the fold, true if all /* returns false on error or early cutout of the fold, true if all
* pads in @iter were (de)activated successfully. */ * pads in @iter were (de)activated successfully. */
static gboolean static gboolean
@ -2772,17 +2761,6 @@ gst_element_pads_activate (GstElement * element, gboolean active)
if (G_UNLIKELY (!res)) if (G_UNLIKELY (!res))
goto sink_failed; goto sink_failed;
if (!active) {
/* clear the caps on all pads, this should never fail */
iter = gst_element_iterate_pads (element);
res =
iterator_activate_fold_with_resync (iter,
(GstIteratorFoldFunction) clear_caps, &active);
gst_iterator_free (iter);
if (G_UNLIKELY (!res))
goto caps_failed;
}
GST_CAT_DEBUG_OBJECT (GST_CAT_ELEMENT_PADS, element, GST_CAT_DEBUG_OBJECT (GST_CAT_ELEMENT_PADS, element,
"pads_activate successful"); "pads_activate successful");
@ -2801,12 +2779,6 @@ sink_failed:
"sink pads_activate failed"); "sink pads_activate failed");
return FALSE; return FALSE;
} }
caps_failed:
{
GST_CAT_DEBUG_OBJECT (GST_CAT_ELEMENT_PADS, element,
"failed to clear caps on pads");
return FALSE;
}
} }
/* is called with STATE_LOCK */ /* is called with STATE_LOCK */