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

Some fixes to the non-chained case, it works in a very basic way. More use cases will hopefully provide some sanity.

Browse source 
Original commit message from CVS:
Some fixes to the non-chained case, it works in a very basic way.  More use
cases will hopefully provide some sanity.
This commit is contained in:
Erik Walthinsen 2000-12-21 07:10:28 +00:00
parent e8bb90705f
commit 0c88b21a79
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gst/gstbin.c
View file

@ -612,7 +612,7 @@ gst_bin_pushfunc_proxy (GstPad *pad, GstBuffer *buf)
{ {
cothread_state *threadstate = GST_ELEMENT(pad->parent)->threadstate; cothread_state *threadstate = GST_ELEMENT(pad->parent)->threadstate;
DEBUG_ENTER("(%s:%s)",GST_DEBUG_PAD_NAME(pad)); DEBUG_ENTER("(%s:%s)",GST_DEBUG_PAD_NAME(pad));
DEBUG("putting buffer in peer's pen\n"); DEBUG("putting buffer %p in peer's pen\n",buf);
pad->peer->bufpen = buf; pad->peer->bufpen = buf;
DEBUG("switching to %p (@%p)\n",threadstate,&(GST_ELEMENT(pad->parent)->threadstate)); DEBUG("switching to %p (@%p)\n",threadstate,&(GST_ELEMENT(pad->parent)->threadstate));
cothread_switch (threadstate); cothread_switch (threadstate);
@ -796,6 +796,8 @@ gst_bin_create_plan_func (GstBin *bin)
// If cothreads are needed, we need to not only find elements but // If cothreads are needed, we need to not only find elements but
// set up cothread states and various proxy functions. // set up cothread states and various proxy functions.
if (bin->need_cothreads) { if (bin->need_cothreads) {
DEBUG("bin is using cothreads\n");
// first create thread context // first create thread context
if (bin->threadcontext == NULL) { if (bin->threadcontext == NULL) {
DEBUG("initializing cothread context\n"); DEBUG("initializing cothread context\n");
@ -887,7 +889,27 @@ gst_bin_create_plan_func (GstBin *bin)
// otherwise, cothreads are not needed // otherwise, cothreads are not needed
} else { } else {
; DEBUG("bin is chained, no cothreads needed\n");
elements = bin->managed_elements;
while (elements) {
element = GST_ELEMENT (elements->data);
elements = g_list_next (elements);
pads = gst_element_get_pad_list (element);
while (pads) {
pad = GST_PAD (pads->data);
pads = g_list_next (pads);
if (gst_pad_get_direction (pad) == GST_PAD_SINK) {
DEBUG("copying chain function into push proxy for %s:%s\n",GST_DEBUG_PAD_NAME(pad));
pad->pushfunc = pad->chainfunc;
} else {
DEBUG("copying get function into pull proxy for %s:%s\n",GST_DEBUG_PAD_NAME(pad));
pad->pullfunc = pad->getfunc;
}
}
}
} }
DEBUG_LEAVE("(\"%s\")",gst_element_get_name(GST_ELEMENT(bin))); DEBUG_LEAVE("(\"%s\")",gst_element_get_name(GST_ELEMENT(bin)));
@ -924,9 +946,10 @@ gst_bin_iterate_func (GstBin *bin)
DEBUG("starting iteration via chain-functions\n"); DEBUG("starting iteration via chain-functions\n");
if (bin->num_entries <= 0) { if (bin->num_entries <= 0) {
//printf("gstbin: no entries in bin \"%s\" trying children...\n", gst_element_get_name(GST_ELEMENT(bin))); DEBUG("no entries in bin \"%s\", trying managed elements...\n",
gst_element_get_name(GST_ELEMENT(bin)));
// we will try loop over the elements then... // we will try loop over the elements then...
entries = bin->children; entries = bin->managed_elements;
} }
else { else {
entries = bin->entries; entries = bin->entries;
@ -936,6 +959,10 @@ gst_bin_iterate_func (GstBin *bin)
while (entries) { while (entries) {
entry = GST_ELEMENT (entries->data); entry = GST_ELEMENT (entries->data);
entries = g_list_next (entries);
DEBUG("have entry \"%s\"\n",gst_element_get_name(entry));
if (GST_IS_SRC (entry) || GST_IS_CONNECTION (entry)) { if (GST_IS_SRC (entry) || GST_IS_CONNECTION (entry)) {
pads = entry->pads; pads = entry->pads;
while (pads) { while (pads) {
@ -956,9 +983,8 @@ gst_bin_iterate_func (GstBin *bin)
gst_bin_iterate (GST_BIN (entry)); gst_bin_iterate (GST_BIN (entry));
else { else {
fprintf(stderr, "gstbin: entry \"%s\" cannot be handled\n", gst_element_get_name (entry)); fprintf(stderr, "gstbin: entry \"%s\" cannot be handled\n", gst_element_get_name (entry));
g_assert_not_reached (); // g_assert_not_reached ();
} }
entries = g_list_next (entries);
} }
} }