mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

basesrc: Shut down the pad task when the initial seek fails.

Browse source 
Set the pad flushing and stop the pad task when the initial seek fails
during activation. Avoids racy calls into the _create() function when
BaseSrc::stop() has already run.

Fixes: #603059

Also, fix some misspelled comments.
This commit is contained in:
Jan Schmidt 2009-11-27 20:16:15 +01:00
parent 103bd930fc
commit f490508490
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libs/gst/base/gstbasesrc.c
View file

@ -1376,7 +1376,7 @@ gst_base_src_perform_seek (GstBaseSrc * src, GstEvent * event, gboolean unlock)
res = FALSE; res = FALSE;
} }
/* if successfull seek, we update our real segment and push /* if the seek was successful, we update our real segment and push
* out the new segment. */ * out the new segment. */
if (res) { if (res) {
memcpy (&src->segment, &seeksegment, sizeof (GstSegment)); memcpy (&src->segment, &seeksegment, sizeof (GstSegment));
@ -1421,7 +1421,7 @@ gst_base_src_perform_seek (GstBaseSrc * src, GstEvent * event, gboolean unlock)
src->priv->discont = TRUE; src->priv->discont = TRUE;
src->data.ABI.running = TRUE; src->data.ABI.running = TRUE;
/* and restart the task in case it got paused explicitely or by /* and restart the task in case it got paused explicitly or by
* the FLUSH_START event we pushed out. */ * the FLUSH_START event we pushed out. */
tres = gst_pad_start_task (src->srcpad, (GstTaskFunction) gst_base_src_loop, tres = gst_pad_start_task (src->srcpad, (GstTaskFunction) gst_base_src_loop,
src->srcpad); src->srcpad);
@ -2863,6 +2863,11 @@ error_start:
seek_failed: seek_failed:
{ {
GST_ERROR_OBJECT (basesrc, "Failed to perform initial seek"); GST_ERROR_OBJECT (basesrc, "Failed to perform initial seek");
/* flush all */
gst_base_src_set_flushing (basesrc, TRUE, FALSE, TRUE, NULL);
/* stop the task */
gst_pad_stop_task (pad);
/* Stop the basesrc */
gst_base_src_stop (basesrc); gst_base_src_stop (basesrc);
if (event) if (event)
gst_event_unref (event); gst_event_unref (event);