mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

resindvd: Remove racy glib warning.

Browse source 
Sometimes, the pad probes can be called twice - for OOB events
travelling downstream. Clear out the pad block id, so it only
gets removed once.
This commit is contained in:
Jan Schmidt 2013-12-06 00:45:50 +11:00
parent 621bf0d22e
commit d56d00cccd
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ext/resindvd/resindvdbin.c
View file

@ -881,6 +881,7 @@ dvdbin_pad_blocked_cb (GstPad * opad,
GstPad *pad; GstPad *pad;
gboolean added_last_pad = FALSE; gboolean added_last_pad = FALSE;
gboolean added = FALSE; gboolean added = FALSE;
guint pad_block_id = 0;
dvdbin = ctx->dvdbin; dvdbin = ctx->dvdbin;
pad = ctx->pad; pad = ctx->pad;
@ -896,10 +897,12 @@ dvdbin_pad_blocked_cb (GstPad * opad,
added_last_pad = ((dvdbin->audio_broken || dvdbin->audio_added) added_last_pad = ((dvdbin->audio_broken || dvdbin->audio_added)
&& dvdbin->video_added); && dvdbin->video_added);
} }
pad_block_id = ctx->pad_block_id;
ctx->pad_block_id = 0;
DVDBIN_PREROLL_UNLOCK (dvdbin); DVDBIN_PREROLL_UNLOCK (dvdbin);
if (ctx->pad_block_id) if (pad_block_id)
gst_pad_remove_probe (opad, ctx->pad_block_id); gst_pad_remove_probe (opad, pad_block_id);
} else if (pad == dvdbin->audio_pad) { } else if (pad == dvdbin->audio_pad) {
GST_DEBUG_OBJECT (opad, "Pad block -> audio pad"); GST_DEBUG_OBJECT (opad, "Pad block -> audio pad");
DVDBIN_PREROLL_LOCK (dvdbin); DVDBIN_PREROLL_LOCK (dvdbin);
@ -910,10 +913,12 @@ dvdbin_pad_blocked_cb (GstPad * opad,
gst_element_add_pad (GST_ELEMENT (dvdbin), dvdbin->audio_pad); gst_element_add_pad (GST_ELEMENT (dvdbin), dvdbin->audio_pad);
added_last_pad = (dvdbin->subpicture_added && dvdbin->video_added); added_last_pad = (dvdbin->subpicture_added && dvdbin->video_added);
} }
pad_block_id = ctx->pad_block_id;
ctx->pad_block_id = 0;
DVDBIN_PREROLL_UNLOCK (dvdbin); DVDBIN_PREROLL_UNLOCK (dvdbin);
if (ctx->pad_block_id) if (pad_block_id)
gst_pad_remove_probe (opad, ctx->pad_block_id); gst_pad_remove_probe (opad, pad_block_id);
} else if (pad == dvdbin->video_pad) { } else if (pad == dvdbin->video_pad) {
GST_DEBUG_OBJECT (opad, "Pad block -> video pad"); GST_DEBUG_OBJECT (opad, "Pad block -> video pad");
@ -926,10 +931,12 @@ dvdbin_pad_blocked_cb (GstPad * opad,
added_last_pad = (dvdbin->subpicture_added && (dvdbin->audio_added added_last_pad = (dvdbin->subpicture_added && (dvdbin->audio_added
|| dvdbin->audio_broken)); || dvdbin->audio_broken));
} }
pad_block_id = ctx->pad_block_id;
ctx->pad_block_id = 0;
DVDBIN_PREROLL_UNLOCK (dvdbin); DVDBIN_PREROLL_UNLOCK (dvdbin);
if (ctx->pad_block_id) if (pad_block_id)
gst_pad_remove_probe (opad, ctx->pad_block_id); gst_pad_remove_probe (opad, pad_block_id);
} }
if (added_last_pad) { if (added_last_pad) {