mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 15:18:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

Remove groups from chains and elements from groups when they are destroyed.

Browse source 
Original commit message from CVS:
Remove groups from chains and elements from groups when they are destroyed.
This commit is contained in:
Wim Taymans 2002-11-07 18:50:06 +00:00
parent f51f5d0f75
commit 9955ea95b9
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/schedulers/gstoptimalscheduler.c
View file

@ -313,12 +313,23 @@ GstPluginDesc plugin_desc = {
static void static void
delete_chain (GstOptScheduler *osched, GstOptSchedulerChain *chain) delete_chain (GstOptScheduler *osched, GstOptSchedulerChain *chain)
{ {
GSList *groups;
GST_INFO (GST_CAT_SCHEDULING, "delete chain %p", chain); GST_INFO (GST_CAT_SCHEDULING, "delete chain %p", chain);
g_assert (chain->sched == osched); g_assert (chain->sched == osched);
osched->chains = g_slist_remove (osched->chains, chain); osched->chains = g_slist_remove (osched->chains, chain);
groups = chain->groups;
while (groups) {
GstOptSchedulerGroup *group = (GstOptSchedulerGroup *) groups->data;
group->chain = NULL;
groups = g_slist_next (groups);
}
g_slist_free (chain->groups); g_slist_free (chain->groups);
g_free (chain); g_free (chain);
} }
@ -460,6 +471,8 @@ destroy_group_scheduler (GstOptSchedulerGroup *group)
static void static void
delete_group (GstOptSchedulerGroup *group) delete_group (GstOptSchedulerGroup *group)
{ {
GSList *elements;
GST_INFO (GST_CAT_SCHEDULING, "delete group %p", group); GST_INFO (GST_CAT_SCHEDULING, "delete group %p", group);
g_assert (group->chain == NULL); g_assert (group->chain == NULL);
@ -467,6 +480,16 @@ delete_group (GstOptSchedulerGroup *group)
if (group->flags & GST_OPT_SCHEDULER_GROUP_SCHEDULABLE) if (group->flags & GST_OPT_SCHEDULER_GROUP_SCHEDULABLE)
destroy_group_scheduler (group); destroy_group_scheduler (group);
/* remove all elements from the group */
elements = group->elements;
while (elements) {
GstElement *element = GST_ELEMENT (elements->data);
GST_ELEMENT_SCHED_GROUP (element) = NULL;
elements = g_slist_next (elements);
}
g_slist_free (group->elements); g_slist_free (group->elements);
g_free (group); g_free (group);
} }
@ -1030,9 +1053,14 @@ gst_opt_scheduler_remove_element (GstScheduler *sched, GstElement *element)
/* the element is guaranteed to live in it's own group/chain now */ /* the element is guaranteed to live in it's own group/chain now */
get_group (element, &group); get_group (element, &group);
if (group) { if (group) {
if (group->chain) { if (group->chain) {
remove_from_chain (group->chain, group); GstOptSchedulerChain *chain;
delete_chain (osched, group->chain);
chain = group->chain;
remove_from_chain (chain, group);
delete_chain (osched, chain);
} }
delete_group (group); delete_group (group);