From cbbb8371fec50c066f665eb6fab0e4af0aa268c9 Mon Sep 17 00:00:00 2001 From: Erik Walthinsen Date: Mon, 20 Jan 2003 22:02:46 +0000 Subject: [PATCH] moved recursive exit to the front of the call, to make it easier to add prevchain removal Original commit message from CVS: moved recursive exit to the front of the call, to make it easier to add prevchain removal --- gst/schedulers/gstbasicscheduler.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gst/schedulers/gstbasicscheduler.c b/gst/schedulers/gstbasicscheduler.c index 33a1b0bc08..25b2e85521 100644 --- a/gst/schedulers/gstbasicscheduler.c +++ b/gst/schedulers/gstbasicscheduler.c @@ -941,8 +941,15 @@ gst_basic_scheduler_chain_recursive_add (GstSchedulerChain * chain, GstElement * GList *pads; GstPad *pad; GstElement *peerelement; + GstSchedulerChain *prevchain; - /* add the element to the chain */ + /* check to see if it's in a chain already */ + prevchain = gst_basic_scheduler_find_chain (chain->sched, element); + /* if it's already in another chain, we're done */ + if (prevchain != NULL) + return; + + /* add it to this one */ gst_basic_scheduler_chain_add_element (chain, element); GST_DEBUG (GST_CAT_SCHEDULING, "recursing on element \"%s\"", GST_ELEMENT_NAME (element)); @@ -959,12 +966,9 @@ gst_basic_scheduler_chain_recursive_add (GstSchedulerChain * chain, GstElement * GST_DEBUG (GST_CAT_SCHEDULING, "has peer %s:%s", GST_DEBUG_PAD_NAME (GST_PAD_PEER (pad))); peerelement = GST_PAD_PARENT (GST_PAD_PEER (pad)); if (GST_ELEMENT_SCHED (GST_PAD_PARENT (pad)) == GST_ELEMENT_SCHED (peerelement)) { - GST_DEBUG (GST_CAT_SCHEDULING, "peer \"%s\" is valid for same chain", + GST_DEBUG (GST_CAT_SCHEDULING, "peer \"%s\" is valid for same chain", GST_ELEMENT_NAME (peerelement)); - /* if it's not already in a chain, add it to this one */ - if (gst_basic_scheduler_find_chain (chain->sched, peerelement) == NULL) { - gst_basic_scheduler_chain_recursive_add (chain, peerelement); - } + gst_basic_scheduler_chain_recursive_add (chain, peerelement); } } }