From 38e6e8ed8f44669c51f58ac46f14f43c243bf887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 3 Jun 2008 14:35:59 +0000 Subject: gst/interleave/interleave.c: Stop GstCollectPads before calling the parent's state change function when going from PA... Original commit message from CVS: * gst/interleave/interleave.c: (gst_interleave_pad_get_type), (gst_interleave_change_state): Stop GstCollectPads before calling the parent's state change function when going from PAUSED to READY as we otherwise deadlock. Fixes bug #536258. --- ChangeLog | 8 ++++++++ gst/interleave/interleave.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 004bf1bc..96d2bfb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-03 Sebastian Dröge + + * gst/interleave/interleave.c: (gst_interleave_pad_get_type), + (gst_interleave_change_state): + Stop GstCollectPads before calling the parent's state change function + when going from PAUSED to READY as we otherwise deadlock. + Fixes bug #536258. + 2008-06-03 Wim Taymans * gst/h264parse/gsth264parse.c: (gst_nal_bs_init), diff --git a/gst/interleave/interleave.c b/gst/interleave/interleave.c index d693da82..bda27be1 100644 --- a/gst/interleave/interleave.c +++ b/gst/interleave/interleave.c @@ -153,7 +153,7 @@ gst_interleave_pad_get_type (void) { static GType type = 0; - if (!type) { + if (G_UNLIKELY (type == 0)) { static const GTypeInfo info = { sizeof (GstPadClass), NULL, @@ -171,7 +171,6 @@ gst_interleave_pad_get_type (void) return type; } - GST_BOILERPLATE (GstInterleave, gst_interleave, GstElement, GST_TYPE_ELEMENT); enum @@ -614,13 +613,19 @@ gst_interleave_change_state (GstElement * element, GstStateChange transition) break; } + /* Stop before calling the parent's state change function as + * GstCollectPads might take locks and we would deadlock in that + * case + */ + if (transition == GST_STATE_CHANGE_PAUSED_TO_READY) + gst_collect_pads_stop (self->collect); + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); switch (transition) { case GST_STATE_CHANGE_PLAYING_TO_PAUSED: break; case GST_STATE_CHANGE_PAUSED_TO_READY: - gst_collect_pads_stop (self->collect); gst_pad_set_caps (self->src, NULL); gst_caps_replace (&self->sinkcaps, NULL); break; -- cgit v1.2.1