mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-27 10:40:34 +00:00
Got ghostpads to work, even in -launch. Needs more testing still.
Original commit message from CVS: Got ghostpads to work, even in -launch. Needs more testing still.
This commit is contained in:
Erik Walthinsen
parent
9b3f1277ce
commit
4a5ed7bf58
6 changed files with 138 additions and 89 deletions
|
|
@ -178,28 +178,36 @@ gst_element_add_pad (GstElement *element, GstPad *pad)
|
|||
/**
|
||||
* gst_element_add_ghost_pad:
|
||||
* @element: element to add ghost pad to
|
||||
* @pad: ghost pad to add
|
||||
* @pad: pad from which the new ghost pad will be created
|
||||
* @name: name of the new ghost pad
|
||||
*
|
||||
* Add a ghost pad to the element, setting the ghost parent of the pad to
|
||||
* the element (and thus adding a reference).
|
||||
* Create a ghost pad from the given pad, and add it to the list of pads
|
||||
* for this element.
|
||||
*/
|
||||
void
|
||||
gst_element_add_ghost_pad (GstElement *element, GstPad *pad)
|
||||
gst_element_add_ghost_pad (GstElement *element, GstPad *pad, gchar *name)
|
||||
{
|
||||
GstPad *ghostpad;
|
||||
|
||||
g_return_if_fail (element != NULL);
|
||||
g_return_if_fail (GST_IS_ELEMENT (element));
|
||||
g_return_if_fail (pad != NULL);
|
||||
g_return_if_fail (GST_IS_PAD (pad));
|
||||
|
||||
/* set the pad's parent */
|
||||
gst_pad_add_ghost_parent (pad,GST_OBJECT (element));
|
||||
GST_DEBUG(0,"creating new ghost pad called %s, from pad %s:%s\n",name,GST_DEBUG_PAD_NAME(pad));
|
||||
ghostpad = gst_ghost_pad_new (name, pad);
|
||||
|
||||
/* add it to the list */
|
||||
element->pads = g_list_append (element->pads, pad);
|
||||
GST_DEBUG(0,"adding ghost pad %s to element %s\n",name,gst_element_get_name(element));
|
||||
element->pads = g_list_append (element->pads, ghostpad);
|
||||
element->numpads++;
|
||||
// set the parent of the ghostpad
|
||||
gst_pad_set_parent(ghostpad,element);
|
||||
|
||||
GST_DEBUG(0,"added ghostpad %s:%s\n",GST_DEBUG_PAD_NAME(ghostpad));
|
||||
|
||||
/* emit the NEW_GHOST_PAD signal */
|
||||
gtk_signal_emit (GTK_OBJECT (element), gst_element_signals[NEW_GHOST_PAD], pad);
|
||||
gtk_signal_emit (GTK_OBJECT (element), gst_element_signals[NEW_GHOST_PAD], ghostpad);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -218,7 +226,7 @@ gst_element_remove_ghost_pad (GstElement *element, GstPad *pad)
|
|||
g_return_if_fail (pad != NULL);
|
||||
g_return_if_fail (GST_IS_PAD (pad));
|
||||
|
||||
// FIXME
|
||||
// FIXME this is redundant?
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ GstPad* gst_element_get_pad (GstElement *element, const gchar *name);
|
|||
GList* gst_element_get_pad_list (GstElement *element);
|
||||
GList* gst_element_get_padtemplate_list (GstElement *element);
|
||||
GstPadTemplate* gst_element_get_padtemplate_by_name (GstElement *element, const guchar *name);
|
||||
void gst_element_add_ghost_pad (GstElement *element, GstPad *pad);
|
||||
void gst_element_add_ghost_pad (GstElement *element, GstPad *pad, gchar *name);
|
||||
void gst_element_remove_ghost_pad (GstElement *element, GstPad *pad);
|
||||
|
||||
GstPad* gst_element_request_pad (GstElement *element, GstPadTemplate *templ);
|
||||
|
|
|
|||
|
|
@ -110,8 +110,8 @@ G_GNUC_UNUSED static gchar *_debug_string = NULL;
|
|||
|
||||
/********** some convenience macros for debugging **********/
|
||||
#define GST_DEBUG_PAD_NAME(pad) \
|
||||
(((GstPad*)(pad))->parent != NULL) ? \
|
||||
gst_element_get_name(GST_ELEMENT(((GstPad*)(pad))->parent)) : \
|
||||
(GST_PAD_PARENT(pad) != NULL) ? \
|
||||
gst_element_get_name(GST_ELEMENT(GST_PAD_PARENT(pad))) : \
|
||||
"''", gst_pad_get_name((GstPad*)pad)
|
||||
|
||||
|
||||
|
|
|
|||
78
gst/gstpad.c
78
gst/gstpad.c
|
|
@ -165,7 +165,7 @@ gst_real_pad_init (GstRealPad *pad)
|
|||
pad->pullfunc = NULL;
|
||||
pad->pullregionfunc = NULL;
|
||||
|
||||
pad->ghostparents = NULL;
|
||||
pad->ghostpads = NULL;
|
||||
pad->caps = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -308,7 +308,7 @@ gst_pad_get_name (GstPad *pad)
|
|||
g_return_val_if_fail (pad != NULL, NULL);
|
||||
g_return_val_if_fail (GST_IS_PAD (pad), NULL);
|
||||
|
||||
return pad->name;
|
||||
return GST_PAD_NAME(pad);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -573,50 +573,50 @@ gst_pad_set_parent (GstPad *pad,
|
|||
}
|
||||
|
||||
/**
|
||||
* gst_pad_add_ghost_parent:
|
||||
* gst_pad_add_ghost_pad:
|
||||
* @pad: the pad to set the ghost parent
|
||||
* @parent: the object to set the ghost parent to
|
||||
* @ghostpad: the ghost pad to add
|
||||
*
|
||||
* Add a ghost parent object to a pad.
|
||||
* Add a ghost pad to a pad.
|
||||
*/
|
||||
void
|
||||
gst_pad_add_ghost_parent (GstPad *pad,
|
||||
GstObject *parent)
|
||||
gst_pad_add_ghost_pad (GstPad *pad,
|
||||
GstPad *ghostpad)
|
||||
{
|
||||
GstRealPad *realpad;
|
||||
|
||||
g_return_if_fail (pad != NULL);
|
||||
g_return_if_fail (GST_IS_REAL_PAD (pad)); // NOTE this restriction
|
||||
g_return_if_fail (parent != NULL);
|
||||
g_return_if_fail (GTK_IS_OBJECT (parent));
|
||||
g_return_if_fail (GST_IS_PAD (pad));
|
||||
g_return_if_fail (ghostpad != NULL);
|
||||
g_return_if_fail (GST_IS_GHOST_PAD (ghostpad));
|
||||
|
||||
realpad = GST_PAD_REALIZE(pad);
|
||||
|
||||
realpad->ghostparents = g_list_prepend (realpad->ghostparents, parent);
|
||||
realpad->ghostpads = g_list_prepend (realpad->ghostpads, ghostpad);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* gst_pad_remove_ghost_parent:
|
||||
* @pad: the pad to remove the ghost parent
|
||||
* @parent: the object to remove the ghost parent from
|
||||
* @ghostpad: the ghost pad to remove from the pad
|
||||
*
|
||||
* Remove a ghost parent object from a pad.
|
||||
* Remove a ghost pad from a pad.
|
||||
*/
|
||||
void
|
||||
gst_pad_remove_ghost_parent (GstPad *pad,
|
||||
GstObject *parent)
|
||||
GstPad *ghostpad)
|
||||
{
|
||||
GstRealPad *realpad;
|
||||
|
||||
g_return_if_fail (pad != NULL);
|
||||
g_return_if_fail (GST_IS_REAL_PAD (pad)); // NOTE this restriction
|
||||
g_return_if_fail (parent != NULL);
|
||||
g_return_if_fail (GTK_IS_OBJECT (parent));
|
||||
g_return_if_fail (GST_IS_PAD (pad));
|
||||
g_return_if_fail (ghostpad != NULL);
|
||||
g_return_if_fail (GST_IS_GHOST_PAD (ghostpad));
|
||||
|
||||
realpad = GST_PAD_REALIZE (pad);
|
||||
|
||||
realpad->ghostparents = g_list_remove (realpad->ghostparents, parent);
|
||||
realpad->ghostpads = g_list_remove (realpad->ghostpads, ghostpad);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -637,20 +637,20 @@ gst_pad_get_parent (GstPad *pad)
|
|||
}
|
||||
|
||||
/**
|
||||
* gst_pad_get_ghost_parents:
|
||||
* gst_pad_get_ghost_pad_list:
|
||||
* @pad: the pad to get the ghost parents from
|
||||
*
|
||||
* Get the ghost parents of this pad.
|
||||
*
|
||||
* Returns: a GList of ghost parent objects
|
||||
* Returns: a GList of ghost pads
|
||||
*/
|
||||
GList*
|
||||
gst_pad_get_ghost_parents (GstPad *pad)
|
||||
{
|
||||
g_return_val_if_fail (pad != NULL, NULL);
|
||||
g_return_val_if_fail (GST_IS_REAL_PAD (pad), NULL); // NOTE this restriction
|
||||
g_return_val_if_fail (GST_IS_PAD (pad), NULL);
|
||||
|
||||
return GST_PAD_REALIZE(pad)->ghostparents;
|
||||
return GST_PAD_REALIZE(pad)->ghostpads;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -783,7 +783,7 @@ gst_real_pad_destroy (GtkObject *object)
|
|||
|
||||
if (pad->name)
|
||||
g_free (pad->name);
|
||||
g_list_free (GST_REAL_PAD(pad)->ghostparents);
|
||||
g_list_free (GST_REAL_PAD(pad)->ghostpads);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1288,3 +1288,35 @@ gst_ghost_pad_init (GstGhostPad *pad)
|
|||
{
|
||||
pad->realpad = NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_ghost_pad_new:
|
||||
* @name: name of the new ghost pad
|
||||
* @pad: the pad to create a ghost pad of
|
||||
*
|
||||
* Create a new ghost pad associated with the given pad.
|
||||
*
|
||||
* Returns: new ghost pad
|
||||
*/
|
||||
GstPad*
|
||||
gst_ghost_pad_new (gchar *name,
|
||||
GstPad *pad)
|
||||
{
|
||||
GstGhostPad *ghostpad;
|
||||
|
||||
g_return_val_if_fail (name != NULL, NULL);
|
||||
g_return_val_if_fail (GST_IS_PAD(pad), NULL);
|
||||
|
||||
ghostpad = gtk_type_new (gst_ghost_pad_get_type ());
|
||||
GST_PAD_NAME(ghostpad) = g_strdup (name);
|
||||
GST_GPAD_REALPAD(ghostpad) = GST_PAD_REALIZE(pad);
|
||||
|
||||
// add ourselves to the real pad's list of ghostpads
|
||||
gst_pad_add_ghost_pad (pad, GST_PAD(ghostpad));
|
||||
|
||||
// FIXME need to ref the real pad here... ?
|
||||
|
||||
GST_DEBUG(0,"created ghost pad \"%s\"\n",name);
|
||||
|
||||
return GST_PAD(ghostpad);
|
||||
}
|
||||
|
|
|
|||
10
gst/gstpad.h
10
gst/gstpad.h
|
|
@ -129,7 +129,7 @@ struct _GstRealPad {
|
|||
GstPadPullFunction pullfunc;
|
||||
GstPadPullRegionFunction pullregionfunc;
|
||||
|
||||
GList *ghostparents;
|
||||
GList *ghostpads;
|
||||
};
|
||||
|
||||
struct _GstRealPadClass {
|
||||
|
|
@ -260,9 +260,9 @@ gpointer gst_pad_get_element_private (GstPad *pad);
|
|||
|
||||
void gst_pad_set_parent (GstPad *pad, GstObject *parent);
|
||||
GstObject* gst_pad_get_parent (GstPad *pad);
|
||||
void gst_pad_add_ghost_parent (GstPad *pad, GstObject *parent);
|
||||
void gst_pad_remove_ghost_parent (GstPad *pad, GstObject *parent);
|
||||
GList* gst_pad_get_ghost_parents (GstPad *pad);
|
||||
void gst_pad_add_ghost_pad (GstPad *pad, GstPad *ghostpad);
|
||||
void gst_pad_remove_ghost_pad (GstPad *pad, GstPad *ghostpad);
|
||||
GList* gst_pad_get_ghost_pad_list (GstPad *pad);
|
||||
|
||||
GstPad* gst_pad_get_peer (GstPad *pad);
|
||||
|
||||
|
|
@ -298,6 +298,8 @@ xmlNodePtr gst_pad_save_thyself (GstPad *pad, xmlNodePtr parent);
|
|||
void gst_pad_load_and_connect (xmlNodePtr parent, GstObject *element, GHashTable *elements);
|
||||
|
||||
|
||||
/* ghostpads */
|
||||
GstPad * gst_ghost_pad_new (gchar *name,GstPad *pad);
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
107
gst/gstparse.c
107
gst/gstparse.c
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#include "gst_private.h"
|
||||
#include "gstparse.h"
|
||||
|
||||
typedef struct _gst_parse_priv gst_parse_priv;
|
||||
|
|
@ -44,7 +45,7 @@ struct _gst_parse_delayed_pad {
|
|||
GstPad *peer;
|
||||
};
|
||||
|
||||
/*
|
||||
/* FIXME need to either revive this, or have pad->padtemplate connections in core
|
||||
static void
|
||||
gst_parse_newpad(GstElement *element,GstPad *pad,launch_delayed_pad *peer)
|
||||
{
|
||||
|
|
@ -87,13 +88,13 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
gint elementcount = 0;
|
||||
gint retval = 0;
|
||||
|
||||
priv->binlevel++;
|
||||
priv->binlevel++;
|
||||
|
||||
if (GST_IS_PIPELINE(parent)) { closingchar = '\0';DEBUG("in pipeline "); }
|
||||
else if (GST_IS_THREAD(parent)) { closingchar = '}';DEBUG("in thread "); }
|
||||
else { closingchar = ')';DEBUG("in bin "); }
|
||||
DEBUG_NOPREFIX("%s\n",gst_element_get_name (GST_ELEMENT (parent)));
|
||||
|
||||
|
||||
while (i < argc) {
|
||||
arg = argv[i];
|
||||
// FIXME this is a lame solution for problems with the first parser
|
||||
|
|
@ -101,21 +102,21 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
len = strlen(arg);
|
||||
element = NULL;
|
||||
DEBUG("** ARGUMENT is '%s'\n",arg);
|
||||
|
||||
|
||||
// a null that slipped through the reconstruction
|
||||
if (len == 0) {
|
||||
DEBUG("random arg, FIXME\n");
|
||||
i++;
|
||||
continue;
|
||||
|
||||
// end of the container
|
||||
// end of the container
|
||||
} else if (arg[0] == closingchar) {
|
||||
// time to finish off this bin
|
||||
DEBUG("exiting container %s\n",gst_element_get_name (GST_ELEMENT (parent)));
|
||||
retval = i+1;
|
||||
break;
|
||||
|
||||
// a pad connection
|
||||
|
||||
// a pad connection
|
||||
} else if ((ptr = strchr(arg,'!'))) {
|
||||
DEBUG("attempting to connect pads together....\n");
|
||||
|
||||
|
|
@ -124,7 +125,7 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
srcpadname = NULL;
|
||||
// if there's a sinkpad...
|
||||
if (len > 1)
|
||||
sinkpadname = &arg[1];
|
||||
sinkpadname = &arg[1];
|
||||
else
|
||||
sinkpadname = NULL;
|
||||
} else {
|
||||
|
|
@ -135,32 +136,35 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
else
|
||||
sinkpadname = NULL;
|
||||
}
|
||||
|
||||
DEBUG("have sinkpad %s, srcpad %s\n",sinkpadname,srcpadname);
|
||||
|
||||
|
||||
GST_DEBUG(0,"have srcpad %s, sinkpad %s\n",srcpadname,sinkpadname);
|
||||
|
||||
srcpad = NULL;
|
||||
|
||||
|
||||
// if the srcpadname doesn't have any commas in it, find an actual pad
|
||||
if (!srcpadname || !strchr(srcpadname,',')) {
|
||||
if (srcpadname != NULL) {
|
||||
srcpad = gst_element_get_pad(previous,srcpadname);
|
||||
if (!srcpad)
|
||||
VERBOSE("NO SUCH pad %s in element %s\n",srcpadname,gst_element_get_name(previous));
|
||||
GST_DEBUG(0,"NO SUCH pad %s in element %s\n",srcpadname,gst_element_get_name(previous));
|
||||
}
|
||||
|
||||
if (srcpad == NULL) {
|
||||
// check through the list to find the first sink pad
|
||||
// check through the list to find the first sink pad
|
||||
GST_DEBUG(0,"CHECKING through element %s for pad named %s\n",gst_element_get_name(previous),srcpadname);
|
||||
pads = gst_element_get_pad_list(previous);
|
||||
while (pads) {
|
||||
srcpad = GST_PAD(pads->data);
|
||||
GST_DEBUG(0,"have pad %s:%s\n",GST_DEBUG_PAD_NAME(srcpad));
|
||||
if (GST_IS_GHOST_PAD(srcpad)) GST_DEBUG(0,"it's a ghost pad\n");
|
||||
pads = g_list_next (pads);
|
||||
if (gst_pad_get_direction (srcpad) == GST_PAD_SRC) break;
|
||||
srcpad = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (!srcpad) DEBUG("error, can't find a src pad!!!\n");
|
||||
else DEBUG("have src pad %s:%s\n",GST_DEBUG_PAD_NAME(srcpad));
|
||||
|
||||
if (!srcpad) GST_DEBUG(0,"error, can't find a src pad!!!\n");
|
||||
else GST_DEBUG(0,"have src pad %s:%s\n",GST_DEBUG_PAD_NAME(srcpad));
|
||||
}
|
||||
|
||||
// argument with = in it
|
||||
|
|
@ -181,15 +185,15 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
} else {
|
||||
DEBUG("have element or bin/thread\n");
|
||||
// if we have a bin or thread starting
|
||||
if (strchr("({",arg[0])) {
|
||||
if (strchr("({",arg[0])) {
|
||||
if (arg[0] == '(') {
|
||||
// create a bin and add it to the current parent
|
||||
element = gst_bin_new(g_strdup_printf("bin%d",priv->bincount++));
|
||||
if (!element) {
|
||||
if (!element) {
|
||||
fprintf(stderr,"Couldn't create a bin!\n");
|
||||
// exit(-1);
|
||||
}
|
||||
VERBOSE("CREATED bin %s\n",gst_element_get_name(element));
|
||||
GST_DEBUG(0,"CREATED bin %s\n",gst_element_get_name(element));
|
||||
} else if (arg[0] == '{') {
|
||||
// create a thread and add it to the current parent
|
||||
element = gst_thread_new(g_strdup_printf("thread%d",priv->threadcount++));
|
||||
|
|
@ -197,11 +201,11 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
fprintf(stderr,"Couldn't create a thread!\n");
|
||||
// exit(-1);
|
||||
}
|
||||
VERBOSE("CREATED thread %s\n",gst_element_get_name(element));
|
||||
GST_DEBUG(0,"CREATED thread %s\n",gst_element_get_name(element));
|
||||
}
|
||||
|
||||
i += gst_parse_launch_cmdline(argc - i, argv + i + 1, GST_BIN (element), priv);
|
||||
|
||||
|
||||
} else {
|
||||
// we have an element
|
||||
DEBUG("attempting to create element '%s'\n",arg);
|
||||
|
|
@ -211,25 +215,24 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
if (!element) {
|
||||
fprintf(stderr,"Couldn't create a '%s', no such element or need to run gstraemer-register?\n",arg);
|
||||
// exit(-1);
|
||||
}
|
||||
VERBOSE("CREATED element %s\n",gst_element_get_name(element));
|
||||
DEBUG("created element %s\n",gst_element_get_name(element));
|
||||
}
|
||||
GST_DEBUG(0,"CREATED element %s\n",gst_element_get_name(element));
|
||||
}
|
||||
|
||||
|
||||
gst_bin_add (GST_BIN (parent), element);
|
||||
elementcount++;
|
||||
|
||||
|
||||
if (srcpad != NULL) {
|
||||
DEBUG("need to connect to sinkpad %s:%s\n",GST_DEBUG_PAD_NAME(srcpad));
|
||||
|
||||
|
||||
sinkpad = NULL;
|
||||
|
||||
|
||||
if (sinkpadname != NULL)
|
||||
sinkpad = gst_element_get_pad(previous,sinkpadname);
|
||||
|
||||
if (!sinkpad) {
|
||||
// check through the list to find the first sink pad
|
||||
pads = gst_element_get_pad_list(element);
|
||||
// check through the list to find the first sink pad
|
||||
pads = gst_element_get_pad_list(element);
|
||||
while (pads) {
|
||||
sinkpad = GST_PAD(pads->data);
|
||||
pads = g_list_next (pads);
|
||||
|
|
@ -237,17 +240,17 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
sinkpad = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!sinkpad) DEBUG("error, can't find a sink pad!!!\n");
|
||||
else DEBUG("have sink pad %s:%s\n",GST_DEBUG_PAD_NAME(sinkpad));
|
||||
|
||||
VERBOSE("CONNECTING %s:%s and %s:%s\n",GST_DEBUG_PAD_NAME(srcpad),GST_DEBUG_PAD_NAME(sinkpad));
|
||||
|
||||
GST_DEBUG(0,"CONNECTING %s:%s and %s:%s\n",GST_DEBUG_PAD_NAME(srcpad),GST_DEBUG_PAD_NAME(sinkpad));
|
||||
gst_pad_connect(srcpad,sinkpad);
|
||||
|
||||
|
||||
sinkpad = NULL;
|
||||
srcpad = NULL;
|
||||
}
|
||||
|
||||
|
||||
// if we're the first element, ghost all the sinkpads
|
||||
if (elementcount == 1) {
|
||||
DEBUG("first element, ghosting all of %s's sink pads to parent %s\n",
|
||||
|
|
@ -258,19 +261,21 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
pads = g_list_next (pads);
|
||||
if (!sinkpad) DEBUG("much oddness, pad doesn't seem to exist\n");
|
||||
else if (gst_pad_get_direction (sinkpad) == GST_PAD_SINK) {
|
||||
gst_element_add_ghost_pad (GST_ELEMENT (parent), sinkpad);
|
||||
DEBUG("ghosted %s:%s\n",GST_DEBUG_PAD_NAME(sinkpad));
|
||||
gst_element_add_ghost_pad (GST_ELEMENT (parent), sinkpad,
|
||||
g_strdup_printf("%s-ghost",gst_pad_get_name(sinkpad)));
|
||||
GST_DEBUG(0,"GHOSTED %s:%s to %s as %s-ghost\n",
|
||||
GST_DEBUG_PAD_NAME(sinkpad),gst_element_get_name(GST_ELEMENT(parent)),gst_pad_get_name(sinkpad));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
previous = element;
|
||||
if (!GST_IS_BIN(element)) prevelement = element;
|
||||
previous = element;
|
||||
if (!GST_IS_BIN(element)) prevelement = element;
|
||||
}
|
||||
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
|
||||
// ghost all the src pads of the bin
|
||||
if (prevelement != NULL) {
|
||||
DEBUG("last element, ghosting all of %s's src pads to parent %s\n",
|
||||
|
|
@ -281,21 +286,23 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr
|
|||
pads = g_list_next (pads);
|
||||
if (!srcpad) DEBUG("much oddness, pad doesn't seem to exist\n");
|
||||
else if (gst_pad_get_direction (srcpad) == GST_PAD_SRC) {
|
||||
gst_element_add_ghost_pad (GST_ELEMENT (parent), srcpad);
|
||||
DEBUG("ghosted %s:%s\n",GST_DEBUG_PAD_NAME(srcpad));
|
||||
gst_element_add_ghost_pad (GST_ELEMENT (parent), srcpad,
|
||||
g_strdup_printf("%s-ghost",gst_pad_get_name(srcpad)));
|
||||
GST_DEBUG(0,"GHOSTED %s:%s to %s as %s-ghost\n",
|
||||
GST_DEBUG_PAD_NAME(srcpad),gst_element_get_name(GST_ELEMENT(parent)),gst_pad_get_name(srcpad));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
priv->binlevel--;
|
||||
|
||||
|
||||
if (retval) return retval;
|
||||
|
||||
|
||||
if (closingchar != '\0')
|
||||
DEBUG("returning IN THE WRONG PLACE\n");
|
||||
else DEBUG("ending pipeline\n");
|
||||
return i+1;
|
||||
}
|
||||
}
|
||||
|
||||
gint gst_parse_launch(const gchar *cmdline,GstBin *parent) {
|
||||
gst_parse_priv priv;
|
||||
|
|
@ -326,7 +333,7 @@ gint gst_parse_launch(const gchar *cmdline,GstBin *parent) {
|
|||
|
||||
// now allocate the new argv array
|
||||
argvn = g_new0(char *,newargc+1);
|
||||
DEBUG("supposed to have %d args\n",newargc);
|
||||
GST_DEBUG(0,"supposed to have %d args\n",newargc);
|
||||
|
||||
// now attempt to construct the new arg list
|
||||
j = 0;k = 0;
|
||||
|
|
@ -354,7 +361,7 @@ gint gst_parse_launch(const gchar *cmdline,GstBin *parent) {
|
|||
|
||||
// print them out
|
||||
for (i=0;i<newargc;i++) {
|
||||
DEBUG("arg %d is: %s\n",i,argvn[i]);
|
||||
GST_DEBUG(0,"arg %d is: %s\n",i,argvn[i]);
|
||||
}
|
||||
|
||||
// set up the elementcounts hash
|
||||
|
|
|
|||
Loading…
Reference in a new issue