mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/schedulers/gstoptimalscheduler.c: Don't try to follow the pad connections with other groups when a loop based ele...

Browse source 
Original commit message from CVS:
* gst/schedulers/gstoptimalscheduler.c: (remove_from_chain),
(chain_group_set_enabled), (create_group), (add_to_group),
(merge_groups), (setup_group_scheduler), (group_elements),
(gst_opt_scheduler_iterate), (gst_opt_scheduler_show):
Don't try to follow the pad connections with other groups
when a loop based element is added to the scheduler because
the bin will inform the scheduler about the pad links a little
later.
This commit is contained in:
Wim Taymans 2004-05-27 15:38:49 +00:00
parent d738f23c6a
commit b8ff3d3d63
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2004-05-27 Wim Taymans <wim@fluendo.com>
* gst/schedulers/gstoptimalscheduler.c: (remove_from_chain),
(chain_group_set_enabled), (create_group), (add_to_group),
(merge_groups), (setup_group_scheduler), (group_elements),
(gst_opt_scheduler_iterate), (gst_opt_scheduler_show):
Don't try to follow the pad connections with other groups
when a loop based element is added to the scheduler because
the bin will inform the scheduler about the pad links a little
later.
2004-05-27 Wim Taymans <wim@fluendo.com> 2004-05-27 Wim Taymans <wim@fluendo.com>
* gst/schedulers/gstoptimalscheduler.c: (add_to_chain), * gst/schedulers/gstoptimalscheduler.c: (add_to_chain),

18
gst/schedulers/gstoptimalscheduler.c
View file

@ -213,7 +213,7 @@ static GstOptSchedulerGroup *create_group (GstOptSchedulerChain * chain,
GstElement * element, GstOptSchedulerGroupType type); GstElement * element, GstOptSchedulerGroupType type);
static void destroy_group (GstOptSchedulerGroup * group); static void destroy_group (GstOptSchedulerGroup * group);
static GstOptSchedulerGroup *add_to_group (GstOptSchedulerGroup * group, static GstOptSchedulerGroup *add_to_group (GstOptSchedulerGroup * group,
GstElement * element); GstElement * element, gboolean with_links);
static GstOptSchedulerGroup *remove_from_group (GstOptSchedulerGroup * group, static GstOptSchedulerGroup *remove_from_group (GstOptSchedulerGroup * group,
GstElement * element); GstElement * element);
static void group_dec_links_for_element (GstOptSchedulerGroup * group, static void group_dec_links_for_element (GstOptSchedulerGroup * group,
@ -823,7 +823,7 @@ create_group (GstOptSchedulerChain * chain, GstElement * element,
group->flags = GST_OPT_SCHEDULER_GROUP_DISABLED; group->flags = GST_OPT_SCHEDULER_GROUP_DISABLED;
group->type = type; group->type = type;
add_to_group (group, element); add_to_group (group, element, FALSE);
add_to_chain (chain, group); add_to_chain (chain, group);
group = unref_group (group); /* ...and sink. */ group = unref_group (group); /* ...and sink. */
@ -849,7 +849,8 @@ destroy_group (GstOptSchedulerGroup * group)
} }
static GstOptSchedulerGroup * static GstOptSchedulerGroup *
add_to_group (GstOptSchedulerGroup * group, GstElement * element) add_to_group (GstOptSchedulerGroup * group, GstElement * element,
gboolean with_links)
{ {
g_assert (group != NULL); g_assert (group != NULL);
g_assert (element != NULL); g_assert (element != NULL);
@ -867,6 +868,7 @@ add_to_group (GstOptSchedulerGroup * group, GstElement * element)
/* first increment the links that this group has with other groups through /* first increment the links that this group has with other groups through
* this element */ * this element */
if (with_links)
group_inc_links_for_element (group, element); group_inc_links_for_element (group, element);
/* Ref the group... */ /* Ref the group... */
@ -883,8 +885,6 @@ add_to_group (GstOptSchedulerGroup * group, GstElement * element)
return group; return group;
} }
/* if the element is linked to elements from other groups, you must decrement
the link count prior to calling this function */
static GstOptSchedulerGroup * static GstOptSchedulerGroup *
remove_from_group (GstOptSchedulerGroup * group, GstElement * element) remove_from_group (GstOptSchedulerGroup * group, GstElement * element)
{ {
@ -946,7 +946,7 @@ merge_groups (GstOptSchedulerGroup * group1, GstOptSchedulerGroup * group2)
GstElement *element = (GstElement *) group2->elements->data; GstElement *element = (GstElement *) group2->elements->data;
group2 = remove_from_group (group2, element); group2 = remove_from_group (group2, element);
add_to_group (group1, element); add_to_group (group1, element, TRUE);
} }
return group1; return group1;
@ -1591,7 +1591,7 @@ group_elements (GstOptScheduler * osched, GstElement * element1,
chain = create_chain (osched); chain = create_chain (osched);
group = create_group (chain, element1, type); group = create_group (chain, element1, type);
add_to_group (group, element2); add_to_group (group, element2, TRUE);
} }
/* the first element has a group */ /* the first element has a group */
else if (group1) { else if (group1) {
@ -1604,7 +1604,7 @@ group_elements (GstOptScheduler * osched, GstElement * element1,
/* the second element has no group, add it to the group /* the second element has no group, add it to the group
* of the first element */ * of the first element */
else else
add_to_group (group1, element2); add_to_group (group1, element2, TRUE);
group = group1; group = group1;
} }
@ -1613,7 +1613,7 @@ group_elements (GstOptScheduler * osched, GstElement * element1,
else { else {
GST_DEBUG ("adding \"%s\" to \"%s\"'s group", GST_DEBUG ("adding \"%s\" to \"%s\"'s group",
GST_ELEMENT_NAME (element1), GST_ELEMENT_NAME (element2)); GST_ELEMENT_NAME (element1), GST_ELEMENT_NAME (element2));
add_to_group (group2, element1); add_to_group (group2, element1, TRUE);
group = group2; group = group2;
} }
return group; return group;