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

run pre_run_func and post_run_func when working without a cothread -- fixes threadsafe element props

Browse source 
Original commit message from CVS:
run pre_run_func and post_run_func when working without a cothread -- fixes threadsafe element props
This commit is contained in:
Andy Wingo 2003-07-16 15:39:46 +00:00
parent e35f52f958
commit ff57e00592
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 74856703c922315f64b9314547966bd4963db968 Subproject commit 063ebfd201ca87f316bf478d19440a585ce0af2c

31
gst/schedulers/gstoptimalscheduler.c
View file

@ -818,12 +818,30 @@ schedule_group (GstOptSchedulerGroup *group)
g_warning ("(internal error): trying to schedule group without cothread"); g_warning ("(internal error): trying to schedule group without cothread");
return TRUE; return TRUE;
#else #else
/* cothreads automatically call the pre- and post-run functions for us;
* without cothreads we need to call them manually */
if (group->schedulefunc == NULL) { if (group->schedulefunc == NULL) {
GST_INFO ( "not scheduling group %p without schedulefunc", GST_INFO ( "not scheduling group %p without schedulefunc",
group); group);
return FALSE; return FALSE;
} else {
GSList *l;
for (l=group->elements; l; l=l->next) {
GstElement *e = (GstElement*)l->data;
if (e->pre_run_func)
e->pre_run_func (e);
}
group->schedulefunc (group->argc, group->argv);
for (l=group->elements; l; l=l->next) {
GstElement *e = (GstElement*)l->data;
if (e->post_run_func)
e->post_run_func (e);
}
} }
group->schedulefunc (group->argc, group->argv);
return TRUE; return TRUE;
#endif #endif
} }
@ -916,7 +934,8 @@ static int
get_group_schedule_function (int argc, char *argv[]) get_group_schedule_function (int argc, char *argv[])
{ {
GstOptSchedulerGroup *group = (GstOptSchedulerGroup *) argv; GstOptSchedulerGroup *group = (GstOptSchedulerGroup *) argv;
const GList *pads = gst_element_get_pad_list (group->entry); GstElement *entry = group->entry;
const GList *pads = gst_element_get_pad_list (entry);
GST_LOG ("get wrapper of group %p", group); GST_LOG ("get wrapper of group %p", group);
@ -977,13 +996,13 @@ loop_group_schedule_function (int argc, char *argv[])
} }
/* the function to schedule an unkown group, which just gives an error */ /* the function to schedule an unknown group, which just gives an error */
static int static int
unkown_group_schedule_function (int argc, char *argv[]) unknown_group_schedule_function (int argc, char *argv[])
{ {
GstOptSchedulerGroup *group = (GstOptSchedulerGroup *) argv; GstOptSchedulerGroup *group = (GstOptSchedulerGroup *) argv;
g_warning ("(internal error) unkown group type %d, disabling\n", group->type); g_warning ("(internal error) unknown group type %d, disabling\n", group->type);
group_error_handler (group); group_error_handler (group);
return 0; return 0;
@ -1181,7 +1200,7 @@ setup_group_scheduler (GstOptScheduler *osched, GstOptSchedulerGroup *group)
{ {
GroupScheduleFunction wrapper; GroupScheduleFunction wrapper;
wrapper = unkown_group_schedule_function; wrapper = unknown_group_schedule_function;
/* figure out the wrapper function for this group */ /* figure out the wrapper function for this group */
if (group->type == GST_OPT_SCHEDULER_GROUP_GET) if (group->type == GST_OPT_SCHEDULER_GROUP_GET)