mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/playback/gstplaybin.c: Fix race condition when rapidly switching visualisations in playbin.

Browse source 
Original commit message from CVS:
Patch by: Ed Catmur <ed at catmur dot co dot uk>
* gst/playback/gstplaybin.c: (gst_play_bin_vis_unblocked),
(gst_play_bin_vis_blocked), (gst_play_bin_set_property):
Fix race condition when rapidly switching visualisations in playbin.
Fixes #401029.
This commit is contained in:
Ed Catmur 2007-02-28 15:17:20 +00:00 committed by Wim Taymans
parent 91e7d53d42
commit 61eaa5eb9b
2 changed files with 44 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2007-02-28 Wim Taymans <wim@fluendo.com>
Patch by: Ed Catmur <ed at catmur dot co dot uk>
* gst/playback/gstplaybin.c: (gst_play_bin_vis_unblocked),
(gst_play_bin_vis_blocked), (gst_play_bin_set_property):
Fix race condition when rapidly switching visualisations in playbin.
Fixes #401029.
2007-02-28 Jan Schmidt <thaytan@mad.scientist.com> 2007-02-28 Jan Schmidt <thaytan@mad.scientist.com>
* tests/check/Makefile.am: * tests/check/Makefile.am:

64
gst/playback/gstplaybin.c
View file

@ -513,7 +513,11 @@ static void
gst_play_bin_vis_unblocked (GstPad * tee_pad, gboolean blocked, gst_play_bin_vis_unblocked (GstPad * tee_pad, gboolean blocked,
gpointer user_data) gpointer user_data)
{ {
/* Unblocked */ GstPlayBin *play_bin = GST_PLAY_BIN (user_data);
if (play_bin->pending_visualisation)
gst_pad_set_blocked_async (tee_pad, FALSE, gst_play_bin_vis_unblocked,
play_bin);
} }
static void static void
@ -524,9 +528,15 @@ gst_play_bin_vis_blocked (GstPad * tee_pad, gboolean blocked,
GstBin *vis_bin = NULL; GstBin *vis_bin = NULL;
GstPad *vis_sink_pad = NULL, *vis_src_pad = NULL, *vqueue_pad = NULL; GstPad *vis_sink_pad = NULL, *vis_src_pad = NULL, *vqueue_pad = NULL;
GstState bin_state; GstState bin_state;
GstElement *pending_visualisation;
GST_OBJECT_LOCK (play_bin);
pending_visualisation = play_bin->pending_visualisation;
play_bin->pending_visualisation = NULL;
GST_OBJECT_UNLOCK (play_bin);
/* We want to disable visualisation */ /* We want to disable visualisation */
if (!GST_IS_ELEMENT (play_bin->pending_visualisation)) { if (!GST_IS_ELEMENT (pending_visualisation)) {
/* Set visualisation element to READY */ /* Set visualisation element to READY */
gst_element_set_state (play_bin->visualisation, GST_STATE_READY); gst_element_set_state (play_bin->visualisation, GST_STATE_READY);
goto beach; goto beach;
@ -575,17 +585,16 @@ gst_play_bin_vis_blocked (GstPad * tee_pad, gboolean blocked,
/* And loose our ref */ /* And loose our ref */
gst_object_unref (play_bin->visualisation); gst_object_unref (play_bin->visualisation);
if (play_bin->pending_visualisation) { if (pending_visualisation) {
/* Ref this new visualisation element before adding to the bin */ /* Ref this new visualisation element before adding to the bin */
gst_object_ref (play_bin->pending_visualisation); gst_object_ref (pending_visualisation);
/* Add the new one */ /* Add the new one */
gst_bin_add (vis_bin, play_bin->pending_visualisation); gst_bin_add (vis_bin, pending_visualisation);
/* Synchronizing state */ /* Synchronizing state */
gst_element_set_state (play_bin->pending_visualisation, bin_state); gst_element_set_state (pending_visualisation, bin_state);
vis_sink_pad = gst_element_get_pad (play_bin->pending_visualisation, vis_sink_pad = gst_element_get_pad (pending_visualisation, "sink");
"sink"); vis_src_pad = gst_element_get_pad (pending_visualisation, "src");
vis_src_pad = gst_element_get_pad (play_bin->pending_visualisation, "src");
if (!GST_IS_PAD (vis_sink_pad) || !GST_IS_PAD (vis_src_pad)) { if (!GST_IS_PAD (vis_sink_pad) || !GST_IS_PAD (vis_src_pad)) {
goto beach; goto beach;
@ -598,8 +607,7 @@ gst_play_bin_vis_blocked (GstPad * tee_pad, gboolean blocked,
/* We are done */ /* We are done */
gst_object_unref (play_bin->visualisation); gst_object_unref (play_bin->visualisation);
play_bin->visualisation = play_bin->pending_visualisation; play_bin->visualisation = pending_visualisation;
play_bin->pending_visualisation = NULL;
beach: beach:
if (vis_sink_pad) { if (vis_sink_pad) {
@ -656,24 +664,23 @@ gst_play_bin_set_property (GObject * object, guint prop_id,
break; break;
case ARG_VIS_PLUGIN: case ARG_VIS_PLUGIN:
{ {
GstElement *pending_visualisation =
GST_ELEMENT_CAST (g_value_get_object (value));
/* Take ownership */
if (pending_visualisation) {
gst_object_ref (pending_visualisation);
gst_object_sink (pending_visualisation);
}
/* Do we already have a visualisation change pending ? */ /* Do we already have a visualisation change pending ? */
GST_OBJECT_LOCK (play_bin);
if (play_bin->pending_visualisation) { if (play_bin->pending_visualisation) {
gst_object_unref (play_bin->pending_visualisation); gst_object_unref (play_bin->pending_visualisation);
play_bin->pending_visualisation = g_value_get_object (value); play_bin->pending_visualisation = pending_visualisation;
/* Take ownership */ GST_OBJECT_UNLOCK (play_bin);
if (play_bin->pending_visualisation) {
gst_object_ref (play_bin->pending_visualisation);
gst_object_sink (GST_OBJECT_CAST (play_bin->pending_visualisation));
}
} else { } else {
play_bin->pending_visualisation = g_value_get_object (value); GST_OBJECT_UNLOCK (play_bin);
/* Take ownership */
if (play_bin->pending_visualisation) {
gst_object_ref (play_bin->pending_visualisation);
gst_object_sink (GST_OBJECT_CAST (play_bin->pending_visualisation));
}
/* Was there a visualisation already set ? */ /* Was there a visualisation already set ? */
if (play_bin->visualisation != NULL) { if (play_bin->visualisation != NULL) {
GstBin *vis_bin = NULL; GstBin *vis_bin = NULL;
@ -697,6 +704,7 @@ gst_play_bin_set_property (GObject * object, guint prop_id,
goto beach; goto beach;
} }
play_bin->pending_visualisation = pending_visualisation;
/* Block with callback */ /* Block with callback */
gst_pad_set_blocked_async (tee_pad, TRUE, gst_play_bin_vis_blocked, gst_pad_set_blocked_async (tee_pad, TRUE, gst_play_bin_vis_blocked,
play_bin); play_bin);
@ -709,12 +717,10 @@ gst_play_bin_set_property (GObject * object, guint prop_id,
} }
gst_object_unref (vis_bin); gst_object_unref (vis_bin);
} else { } else {
play_bin->visualisation = play_bin->pending_visualisation; play_bin->visualisation = pending_visualisation;
play_bin->pending_visualisation = NULL;
} }
} else { } else {
play_bin->visualisation = play_bin->pending_visualisation; play_bin->visualisation = pending_visualisation;
play_bin->pending_visualisation = NULL;
} }
} }
break; break;