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

libs/gst/base/gstcollectpads.c: Handle the case where a pad is removed from the collection that could cause the other...

Browse source 
Original commit message from CVS:
* libs/gst/base/gstcollectpads.c: (gst_collect_pads_remove_pad),
(gst_collect_pads_chain):
Handle the case where a pad is removed from the collection
that could cause the other pads to become collectable.
This commit is contained in:
Wim Taymans 2006-05-30 15:55:19 +00:00
parent 2a51528a41
commit cbc70ba654
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-05-30 Wim Taymans <wim@fluendo.com>
* libs/gst/base/gstcollectpads.c: (gst_collect_pads_remove_pad),
(gst_collect_pads_chain):
Handle the case where a pad is removed from the collection
that could cause the other pads to become collectable.
2006-05-30 Wim Taymans <wim@fluendo.com> 2006-05-30 Wim Taymans <wim@fluendo.com>
* gst/gstelement.c: * gst/gstelement.c:

30
libs/gst/base/gstcollectpads.c
View file

@ -197,7 +197,9 @@ gst_collect_pads_set_function (GstCollectPads * pads,
* @size: the size of the returned GstCollectData structure * @size: the size of the returned GstCollectData structure
* *
* Add a pad to the collection of collect pads. The pad has to be * Add a pad to the collection of collect pads. The pad has to be
* a sinkpad. * a sinkpad. The refcount of the pad is incremented. Use
* gst_collect_pads_remove_pad() to remove the pad from the collection
* again.
* *
* You specify a size for the returned #GstCollectData structure * You specify a size for the returned #GstCollectData structure
* so that you can use it to store additional information. * so that you can use it to store additional information.
@ -302,6 +304,8 @@ gst_collect_pads_remove_pad (GstCollectPads * pads, GstPad * pad)
pads->abidata.ABI.pad_list = pads->abidata.ABI.pad_list =
g_slist_delete_link (pads->abidata.ABI.pad_list, list); g_slist_delete_link (pads->abidata.ABI.pad_list, list);
pads->abidata.ABI.pad_cookie++; pads->abidata.ABI.pad_cookie++;
/* signal waiters because something changed */
GST_COLLECT_PADS_BROADCAST (pads);
GST_COLLECT_PADS_PAD_UNLOCK (pads); GST_COLLECT_PADS_PAD_UNLOCK (pads);
return TRUE; return TRUE;
@ -1043,16 +1047,20 @@ gst_collect_pads_chain (GstPad * pad, GstBuffer * buffer)
gst_segment_set_last_stop (&data->segment, GST_FORMAT_TIME, timestamp); gst_segment_set_last_stop (&data->segment, GST_FORMAT_TIME, timestamp);
} }
/* Check if our collected condition is matched and call the collected function /* While we have data queued on this pad try to collect stuff */
* if it is */ do {
ret = gst_collect_pads_check_collected (pads); /* Check if our collected condition is matched and call the collected function
/* when an error occurs, we want to report this back to the caller ASAP * if it is */
* without having to block if the buffer was not popped */ ret = gst_collect_pads_check_collected (pads);
if (G_UNLIKELY (ret != GST_FLOW_OK)) /* when an error occurs, we want to report this back to the caller ASAP
goto error; * without having to block if the buffer was not popped */
if (G_UNLIKELY (ret != GST_FLOW_OK))
goto error;
/* data was consumed, we can exit and accept new data */
if (data->buffer == NULL)
break;
/* We still have data queued on this pad, wait for something to happen */
while (data->buffer != NULL) {
GST_DEBUG ("Pad %s:%s has a buffer queued, waiting", GST_DEBUG ("Pad %s:%s has a buffer queued, waiting",
GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_PAD_NAME (pad));
@ -1071,6 +1079,8 @@ gst_collect_pads_chain (GstPad * pad, GstBuffer * buffer)
if (G_UNLIKELY (data->abidata.ABI.flushing)) if (G_UNLIKELY (data->abidata.ABI.flushing))
goto flushing; goto flushing;
} }
while (data->buffer != NULL);
GST_OBJECT_UNLOCK (pads); GST_OBJECT_UNLOCK (pads);
return ret; return ret;