mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:36:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstbin.c: Do a less CPU demanding EOS check because we can.

Browse source 
Original commit message from CVS:
* gst/gstbin.c: (is_eos), (bin_bus_handler):
Do a less CPU demanding EOS check because we can.
This commit is contained in:
Wim Taymans 2005-10-08 17:30:29 +00:00
parent 075142af6e
commit 3988477b17
2 changed files with 24 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-10-08 Wim Taymans <wim@fluendo.com>
* gst/gstbin.c: (is_eos), (bin_bus_handler):
Do a less CPU demanding EOS check because we can.
2005-10-08 Wim Taymans <wim@fluendo.com> 2005-10-08 Wim Taymans <wim@fluendo.com>
* libs/gst/dataprotocol/dataprotocol.c: * libs/gst/dataprotocol/dataprotocol.c:

56
gst/gstbin.c
View file

@ -386,50 +386,31 @@ gst_bin_provide_clock_func (GstElement * element)
return result; return result;
} }
/* Check if the bin is EOS. We do this by scanning all sinks and
* checking if they posted EOS.
*
* call with bin LOCK */
static gboolean static gboolean
is_eos (GstBin * bin) is_eos (GstBin * bin)
{ {
GstIterator *sinks; gboolean result;
gboolean result = TRUE; GList *walk;
gboolean done = FALSE;
sinks = gst_bin_iterate_sinks (bin); result = TRUE;
while (!done) { for (walk = bin->children; walk; walk = g_list_next (walk)) {
gpointer data; GstElement *element;
switch (gst_iterator_next (sinks, &data)) { element = GST_ELEMENT_CAST (walk->data);
case GST_ITERATOR_OK: if (bin_element_is_sink (element, bin) == 0) {
{ if (!g_list_find (bin->eosed, element)) {
GstElement *element = GST_ELEMENT (data); GST_DEBUG ("element did not post EOS yet");
GList *eosed; result = FALSE;
gchar *name;
name = gst_element_get_name (element);
eosed = g_list_find (bin->eosed, element);
if (!eosed) {
GST_DEBUG ("element %s did not post EOS yet", name);
result = FALSE;
done = TRUE;
} else {
GST_DEBUG ("element %s posted EOS", name);
}
g_free (name);
gst_object_unref (element);
break; break;
} else {
GST_DEBUG ("element posted EOS");
} }
case GST_ITERATOR_RESYNC:
result = TRUE;
gst_iterator_resync (sinks);
break;
case GST_ITERATOR_DONE:
done = TRUE;
break;
default:
g_assert_not_reached ();
break;
} }
} }
gst_iterator_free (sinks);
return result; return result;
} }
@ -1559,6 +1540,7 @@ bin_bus_handler (GstBus * bus, GstMessage * message, GstBin * bin)
if (src) { if (src) {
gchar *name; gchar *name;
gboolean eos;
name = gst_object_get_name (src); name = gst_object_get_name (src);
GST_DEBUG_OBJECT (bin, "got EOS message from %s", name); GST_DEBUG_OBJECT (bin, "got EOS message from %s", name);
@ -1567,10 +1549,11 @@ bin_bus_handler (GstBus * bus, GstMessage * message, GstBin * bin)
/* collect all eos messages from the children */ /* collect all eos messages from the children */
GST_LOCK (bin->child_bus); GST_LOCK (bin->child_bus);
bin->eosed = g_list_prepend (bin->eosed, src); bin->eosed = g_list_prepend (bin->eosed, src);
eos = is_eos (bin);
GST_UNLOCK (bin->child_bus); GST_UNLOCK (bin->child_bus);
/* if we are completely EOS, we forward an EOS message */ /* if we are completely EOS, we forward an EOS message */
if (is_eos (bin)) { if (eos) {
GST_DEBUG_OBJECT (bin, "all sinks posted EOS"); GST_DEBUG_OBJECT (bin, "all sinks posted EOS");
gst_element_post_message (GST_ELEMENT (bin), gst_element_post_message (GST_ELEMENT (bin),
gst_message_new_eos (GST_OBJECT (bin))); gst_message_new_eos (GST_OBJECT (bin)));
@ -1578,7 +1561,6 @@ bin_bus_handler (GstBus * bus, GstMessage * message, GstBin * bin)
} else { } else {
GST_DEBUG_OBJECT (bin, "got EOS message from (NULL), not processing"); GST_DEBUG_OBJECT (bin, "got EOS message from (NULL), not processing");
} }
/* we drop all EOS messages */ /* we drop all EOS messages */
gst_message_unref (message); gst_message_unref (message);
break; break;