mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

basesrc: fix race in startup

Browse source 
Mark renegotiate before starting the pushing thread.
Do also check if we are starting in the get_range function.
This commit is contained in:
Wim Taymans 2012-01-31 17:41:13 +01:00
parent 76a60c4c42
commit 18118218b1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2250,7 +2250,8 @@ again:
}
}
if (G_UNLIKELY (!GST_BASE_SRC_IS_STARTED (src)))
if (G_UNLIKELY (!GST_BASE_SRC_IS_STARTED (src)
&& !GST_BASE_SRC_IS_STARTING (src)))
goto not_started;
if (G_UNLIKELY (!bclass->create))
@ -3051,6 +3052,8 @@ gst_base_src_start_complete (GstBaseSrc * basesrc, GstFlowReturn ret)
* we are not yet PLAYING */
gst_base_src_set_flushing (basesrc, FALSE, FALSE, FALSE, NULL);
gst_pad_mark_reconfigure (GST_BASE_SRC_PAD (basesrc));
GST_OBJECT_LOCK (basesrc->srcpad);
mode = GST_PAD_MODE (basesrc->srcpad);
GST_OBJECT_UNLOCK (basesrc->srcpad);
@ -3076,8 +3079,6 @@ gst_base_src_start_complete (GstBaseSrc * basesrc, GstFlowReturn ret)
goto no_get_range;
}
gst_pad_mark_reconfigure (GST_BASE_SRC_PAD (basesrc));
GST_LIVE_LOCK (basesrc);
GST_OBJECT_FLAG_SET (basesrc, GST_BASE_SRC_FLAG_STARTED);
GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_FLAG_STARTING);
@ -3115,7 +3116,7 @@ error:
}
/**
* gst_base_src_start_complete:
* gst_base_src_start_wait:
* @src: base source instance
* @ret: a #GstFlowReturn
*