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

Revert "pad: Don't consider flushing pads as needing reconfiguration"

Browse source 
This reverts commit 948a9d2f2b.

This is racy and trying to reconfigure and fail is still better
than not trying to reconfigure at all.

https://bugzilla.gnome.org/show_bug.cgi?id=704100
This commit is contained in:
Sebastian Dröge 2013-07-15 11:32:54 +02:00
parent d60c2c2864
commit 942d905e19
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/gstpad.c
View file

@ -1400,13 +1400,8 @@ gst_pad_needs_reconfigure (GstPad * pad)
g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
GST_OBJECT_LOCK (pad);
if (GST_PAD_IS_FLUSHING (pad)) {
GST_DEBUG_OBJECT (pad, "pad is flushing");
reconfigure = FALSE;
} else {
reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad);
GST_DEBUG_OBJECT (pad, "peeking RECONFIGURE flag %d", reconfigure);
}
reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad);
GST_DEBUG_OBJECT (pad, "peeking RECONFIGURE flag %d", reconfigure);
GST_OBJECT_UNLOCK (pad);
return reconfigure;
@ -1429,15 +1424,10 @@ gst_pad_check_reconfigure (GstPad * pad)
g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
GST_OBJECT_LOCK (pad);
if (GST_PAD_IS_FLUSHING (pad)) {
GST_DEBUG_OBJECT (pad, "pad is flushing");
reconfigure = FALSE;
} else {
reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad);
if (reconfigure) {
GST_DEBUG_OBJECT (pad, "remove RECONFIGURE flag");
GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_RECONFIGURE);
}
reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad);
if (reconfigure) {
GST_DEBUG_OBJECT (pad, "remove RECONFIGURE flag");
GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_RECONFIGURE);
}
GST_OBJECT_UNLOCK (pad);