mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

code cleanup

Browse source 
Original commit message from CVS:
code cleanup
This commit is contained in:
Thomas Vander Stichele 2002-09-12 18:54:16 +00:00
parent 01c9750b48
commit dd9d93d295
1 changed files with 66 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
gst/schedulers/gstbasicscheduler.c
View file

@ -542,7 +542,7 @@ gst_basic_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain)
element = GST_ELEMENT_CAST (elements->data); element = GST_ELEMENT_CAST (elements->data);
elements = g_list_next (elements); elements = g_list_next (elements);
decoupled = (GST_FLAG_IS_SET (element, GST_ELEMENT_DECOUPLED) ? TRUE : FALSE); decoupled = GST_FLAG_IS_SET (element, GST_ELEMENT_DECOUPLED);
/* start out without a wrapper function, we select it later */ /* start out without a wrapper function, we select it later */
wrapper_function = NULL; wrapper_function = NULL;
@ -550,21 +550,25 @@ gst_basic_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain)
/* if the element has a loopfunc... */ /* if the element has a loopfunc... */
if (element->loopfunc != NULL) { if (element->loopfunc != NULL) {
wrapper_function = GST_DEBUG_FUNCPTR (gst_basic_scheduler_loopfunc_wrapper); wrapper_function = GST_DEBUG_FUNCPTR (gst_basic_scheduler_loopfunc_wrapper);
GST_DEBUG (GST_CAT_SCHEDULING, "element '%s' is a loop-based", GST_ELEMENT_NAME (element)); GST_DEBUG (GST_CAT_SCHEDULING, "element '%s' is a loop-based",
GST_ELEMENT_NAME (element));
} }
else { else {
/* otherwise we need to decide what kind of cothread */ /* otherwise we need to decide what kind of cothread
/* if it's not DECOUPLED, we decide based on whether it's a source or not */ * if it's not DECOUPLED, we decide based on
* whether it's a source or not */
if (!decoupled) { if (!decoupled) {
/* if it doesn't have any sinks, it must be a source (duh) */ /* if it doesn't have any sinks, it must be a source (duh) */
if (element->numsinkpads == 0) { if (element->numsinkpads == 0) {
wrapper_function = GST_DEBUG_FUNCPTR (gst_basic_scheduler_src_wrapper); wrapper_function = GST_DEBUG_FUNCPTR (gst_basic_scheduler_src_wrapper);
GST_DEBUG (GST_CAT_SCHEDULING, "element '%s' is a source, using _src_wrapper", GST_DEBUG (GST_CAT_SCHEDULING,
"element '%s' is a source, using _src_wrapper",
GST_ELEMENT_NAME (element)); GST_ELEMENT_NAME (element));
} }
else { else {
wrapper_function = GST_DEBUG_FUNCPTR (gst_basic_scheduler_chain_wrapper); wrapper_function = GST_DEBUG_FUNCPTR (gst_basic_scheduler_chain_wrapper);
GST_DEBUG (GST_CAT_SCHEDULING, "element '%s' is a filter, using _chain_wrapper", GST_DEBUG (GST_CAT_SCHEDULING,
"element '%s' is a filter, using _chain_wrapper",
GST_ELEMENT_NAME (element)); GST_ELEMENT_NAME (element));
} }
} }
@ -587,29 +591,36 @@ gst_basic_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain)
gboolean different_sched = (peerelement->sched != GST_SCHEDULER (chain->sched)); gboolean different_sched = (peerelement->sched != GST_SCHEDULER (chain->sched));
gboolean peer_decoupled = GST_FLAG_IS_SET (peerelement, GST_ELEMENT_DECOUPLED); gboolean peer_decoupled = GST_FLAG_IS_SET (peerelement, GST_ELEMENT_DECOUPLED);
GST_DEBUG (GST_CAT_SCHEDULING, "inspecting pad %s:%s", GST_DEBUG_PAD_NAME (peerpad)); GST_DEBUG (GST_CAT_SCHEDULING,
"inspecting pad %s:%s", GST_DEBUG_PAD_NAME (peerpad));
/* we don't need to check this for decoupled elements */ /* we don't need to check this for decoupled elements */
if (!decoupled) { if (!decoupled) {
/* if the peer element is in another schedule, it's not decoupled and we are not decoupled /* if the peer element is in another schedule,
* it's not decoupled and we are not decoupled
* either, we have an error */ * either, we have an error */
if (different_sched && !peer_decoupled) if (different_sched && !peer_decoupled)
{ {
gst_element_error (element, "element \"%s\" is not decoupled but has pads in different schedulers", gst_element_error (element,
GST_ELEMENT_NAME (element), NULL); "element \"%s\" is not decoupled but has pads "
"in different schedulers",
GST_ELEMENT_NAME (element), NULL);
return FALSE; return FALSE;
} }
/* ok, the peer is in a different scheduler and is decoupled, we need to set the /* ok, the peer is in a different scheduler and is decoupled,
* we need to set the
* handlers so we can talk with it */ * handlers so we can talk with it */
else if (different_sched) { else if (different_sched) {
if (GST_RPAD_DIRECTION (peerpad) == GST_PAD_SINK) { if (GST_RPAD_DIRECTION (peerpad) == GST_PAD_SINK) {
GST_DEBUG (GST_CAT_SCHEDULING, "copying chain function into push proxy for peer %s:%s", GST_DEBUG (GST_CAT_SCHEDULING,
GST_DEBUG_PAD_NAME (peerpad)); "copying chain func into push proxy for peer %s:%s",
GST_DEBUG_PAD_NAME (peerpad));
GST_RPAD_CHAINHANDLER (peerpad) = GST_RPAD_CHAINFUNC (peerpad); GST_RPAD_CHAINHANDLER (peerpad) = GST_RPAD_CHAINFUNC (peerpad);
} }
else { else {
GST_DEBUG (GST_CAT_SCHEDULING, "copying get function into pull proxy for peer %s:%s", GST_DEBUG (GST_CAT_SCHEDULING,
GST_DEBUG_PAD_NAME (peerpad)); "copying get func into pull proxy for peer %s:%s",
GST_DEBUG_PAD_NAME (peerpad));
GST_RPAD_GETHANDLER (peerpad) = GST_RPAD_GETFUNC (peerpad); GST_RPAD_GETHANDLER (peerpad) = GST_RPAD_GETFUNC (peerpad);
} }
gst_pad_set_scheduler (peerpad, GST_SCHEDULER (chain->sched)); gst_pad_set_scheduler (peerpad, GST_SCHEDULER (chain->sched));
@ -621,12 +632,14 @@ gst_basic_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain)
if (decoupled) { if (decoupled) {
/* set the chain proxies */ /* set the chain proxies */
if (GST_RPAD_DIRECTION (pad) == GST_PAD_SINK) { if (GST_RPAD_DIRECTION (pad) == GST_PAD_SINK) {
GST_DEBUG (GST_CAT_SCHEDULING, "copying chain function into push proxy for %s:%s", GST_DEBUG (GST_CAT_SCHEDULING,
"copying chain function into push proxy for %s:%s",
GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_PAD_NAME (pad));
GST_RPAD_CHAINHANDLER (pad) = GST_RPAD_CHAINFUNC (pad); GST_RPAD_CHAINHANDLER (pad) = GST_RPAD_CHAINFUNC (pad);
} }
else { else {
GST_DEBUG (GST_CAT_SCHEDULING, "copying get function into pull proxy for %s:%s", GST_DEBUG (GST_CAT_SCHEDULING,
"copying get function into pull proxy for %s:%s",
GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_PAD_NAME (pad));
GST_RPAD_GETHANDLER (pad) = GST_RPAD_GETFUNC (pad); GST_RPAD_GETHANDLER (pad) = GST_RPAD_GETFUNC (pad);
} }
@ -634,12 +647,14 @@ gst_basic_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain)
/* otherwise we really are a cothread */ /* otherwise we really are a cothread */
else { else {
if (GST_RPAD_DIRECTION (pad) == GST_PAD_SINK) { if (GST_RPAD_DIRECTION (pad) == GST_PAD_SINK) {
GST_DEBUG (GST_CAT_SCHEDULING, "setting cothreaded push proxy for sinkpad %s:%s", GST_DEBUG (GST_CAT_SCHEDULING,
"setting cothreaded push proxy for sinkpad %s:%s",
GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_PAD_NAME (pad));
GST_RPAD_CHAINHANDLER (pad) = GST_DEBUG_FUNCPTR (gst_basic_scheduler_chainhandler_proxy); GST_RPAD_CHAINHANDLER (pad) = GST_DEBUG_FUNCPTR (gst_basic_scheduler_chainhandler_proxy);
} }
else { else {
GST_DEBUG (GST_CAT_SCHEDULING, "setting cothreaded pull proxy for srcpad %s:%s", GST_DEBUG (GST_CAT_SCHEDULING,
"setting cothreaded pull proxy for srcpad %s:%s",
GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_PAD_NAME (pad));
GST_RPAD_GETHANDLER (pad) = GST_DEBUG_FUNCPTR (gst_basic_scheduler_gethandler_proxy); GST_RPAD_GETHANDLER (pad) = GST_DEBUG_FUNCPTR (gst_basic_scheduler_gethandler_proxy);
} }
@ -649,9 +664,12 @@ gst_basic_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain)
/* need to set up the cothread now */ /* need to set up the cothread now */
if (wrapper_function != NULL) { if (wrapper_function != NULL) {
if (GST_ELEMENT_THREADSTATE (element) == NULL) { if (GST_ELEMENT_THREADSTATE (element) == NULL) {
GST_DEBUG (GST_CAT_SCHEDULING, "about to create a cothread, wrapper function for '%s' is &%s", GST_DEBUG (GST_CAT_SCHEDULING,
GST_ELEMENT_NAME (element), GST_DEBUG_FUNCPTR_NAME (wrapper_function)); "about to create a cothread, wrapper for '%s' is &%s",
do_cothread_create (GST_ELEMENT_THREADSTATE (element), chain->sched->context, GST_ELEMENT_NAME (element),
GST_DEBUG_FUNCPTR_NAME (wrapper_function));
do_cothread_create (GST_ELEMENT_THREADSTATE (element),
chain->sched->context,
wrapper_function, 0, (char **) element); wrapper_function, 0, (char **) element);
if (GST_ELEMENT_THREADSTATE (element) == NULL) { if (GST_ELEMENT_THREADSTATE (element) == NULL) {
gst_element_error (element, "could not create cothread for \"%s\"", gst_element_error (element, "could not create cothread for \"%s\"",
@ -663,12 +681,16 @@ gst_basic_scheduler_cothreaded_chain (GstBin * bin, GstSchedulerChain * chain)
GST_ELEMENT_NAME (element)); GST_ELEMENT_NAME (element));
} else { } else {
/* set the cothread wrapper function */ /* set the cothread wrapper function */
GST_DEBUG (GST_CAT_SCHEDULING, "about to set the wrapper function for '%s' to &%s", GST_DEBUG (GST_CAT_SCHEDULING,
GST_ELEMENT_NAME (element), GST_DEBUG_FUNCPTR_NAME (wrapper_function)); "about to set the wrapper function for '%s' to &%s",
do_cothread_setfunc (GST_ELEMENT_THREADSTATE (element), chain->sched->context, GST_ELEMENT_NAME (element),
GST_DEBUG_FUNCPTR_NAME (wrapper_function));
do_cothread_setfunc (GST_ELEMENT_THREADSTATE (element),
chain->sched->context,
wrapper_function, 0, (char **) element); wrapper_function, 0, (char **) element);
GST_DEBUG (GST_CAT_SCHEDULING, "set wrapper function for '%s' to &%s", GST_DEBUG (GST_CAT_SCHEDULING, "set wrapper function for '%s' to &%s",
GST_ELEMENT_NAME (element), GST_DEBUG_FUNCPTR_NAME (wrapper_function)); GST_ELEMENT_NAME (element),
GST_DEBUG_FUNCPTR_NAME (wrapper_function));
} }
} }
} }
@ -743,10 +765,11 @@ gst_basic_scheduler_chain_add_element (GstSchedulerChain * chain, GstElement * e
} }
static gboolean static gboolean
gst_basic_scheduler_chain_enable_element (GstSchedulerChain * chain, GstElement * element) gst_basic_scheduler_chain_enable_element (GstSchedulerChain * chain,
GstElement * element)
{ {
GST_INFO (GST_CAT_SCHEDULING, "enabling element \"%s\" in chain %p", GST_ELEMENT_NAME (element), GST_INFO (GST_CAT_SCHEDULING, "enabling element \"%s\" in chain %p",
chain); GST_ELEMENT_NAME (element), chain);
/* remove from disabled list */ /* remove from disabled list */
chain->disabled = g_list_remove (chain->disabled, element); chain->disabled = g_list_remove (chain->disabled, element);
@ -763,10 +786,11 @@ gst_basic_scheduler_chain_enable_element (GstSchedulerChain * chain, GstElement
} }
static void static void
gst_basic_scheduler_chain_disable_element (GstSchedulerChain * chain, GstElement * element) gst_basic_scheduler_chain_disable_element (GstSchedulerChain * chain,
GstElement * element)
{ {
GST_INFO (GST_CAT_SCHEDULING, "disabling element \"%s\" in chain %p", GST_ELEMENT_NAME (element), GST_INFO (GST_CAT_SCHEDULING, "disabling element \"%s\" in chain %p",
chain); GST_ELEMENT_NAME (element), chain);
/* remove from elements list */ /* remove from elements list */
chain->elements = g_list_remove (chain->elements, element); chain->elements = g_list_remove (chain->elements, element);
@ -956,10 +980,12 @@ gst_basic_scheduler_setup (GstScheduler *sched)
} }
static gboolean static gboolean
gst_basic_scheduler_get_preferred_stack (GstScheduler *sched, gpointer *stack, gulong *size) gst_basic_scheduler_get_preferred_stack (GstScheduler *sched,
gpointer *stack, gulong *size)
{ {
if (do_cothreads_stackquery (stack, size)) { if (do_cothreads_stackquery (stack, size)) {
GST_DEBUG (GST_CAT_SCHEDULING, "getting preferred stack size as %p and %lu", *stack, *size); GST_DEBUG (GST_CAT_SCHEDULING,
"getting preferred stack size as %p and %lu", *stack, *size);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -1112,13 +1138,17 @@ gst_basic_scheduler_state_transition (GstScheduler *sched, GstElement *element,
} }
else if (transition == GST_STATE_PAUSED_TO_PLAYING) { else if (transition == GST_STATE_PAUSED_TO_PLAYING) {
if (!gst_basic_scheduler_chain_enable_element (chain, element)) { if (!gst_basic_scheduler_chain_enable_element (chain, element)) {
GST_INFO (GST_CAT_SCHEDULING, "could not enable element \"%s\"", GST_ELEMENT_NAME (element)); GST_INFO (GST_CAT_SCHEDULING,
"could not enable element \"%s\"",
GST_ELEMENT_NAME (element));
return GST_STATE_FAILURE; return GST_STATE_FAILURE;
} }
} }
} }
else { else {
GST_INFO (GST_CAT_SCHEDULING, "element \"%s\" not found in any chain, no state change", GST_ELEMENT_NAME (element)); GST_INFO (GST_CAT_SCHEDULING,
"element \"%s\" not found in any chain, no state change",
GST_ELEMENT_NAME (element));
} }
} }