mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 17:52:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

typefind: fix race in pad mode change

Browse source 
Fixes #668909 and presumably also #669483
This commit is contained in:
Wim Taymans 2012-02-08 14:32:01 +01:00
parent bcf3daebd4
commit 27d639ec09
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/elements/gsttypefindelement.c
View file

@ -972,6 +972,9 @@ gst_type_find_element_activate_src_mode (GstPad * pad, GstObject * parent,
switch (mode) {
case GST_PAD_MODE_PULL:
/* make sure our task stops pushing, we can't call _stop here because this
* activation might happen from the streaming thread. */
gst_pad_pause_task (typefind->sink);
res = gst_pad_activate_mode (typefind->sink, mode, active);
if (typefind->caps) {
GstCaps *caps;
@ -1139,8 +1142,6 @@ gst_type_find_element_activate_sink_mode (GstPad * pad, GstObject * parent,
gst_segment_init (&typefind->segment, GST_FORMAT_BYTES);
typefind->need_segment = TRUE;
typefind->offset = 0;
gst_pad_start_task (pad, (GstTaskFunction) gst_type_find_element_loop,
pad);
} else {
gst_pad_stop_task (pad);
}
@ -1201,6 +1202,9 @@ gst_type_find_element_activate_sink (GstPad * pad, GstObject * parent)
if (!gst_pad_activate_mode (pad, GST_PAD_MODE_PULL, TRUE))
goto typefind_push;
/* only start our task if we ourselves decide to start in pull mode */
gst_pad_start_task (pad, (GstTaskFunction) gst_type_find_element_loop, pad);
return TRUE;
typefind_push: