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

Some minor DEBUG cleanups, renamed the various scheduler-specific routines to actually be called gst_schedule_ instea...

Browse source 
Original commit message from CVS:
Some minor DEBUG cleanups, renamed the various scheduler-specific routines
to actually be called gst_schedule_ instead of gst_bin_.
This commit is contained in:
Erik Walthinsen 2001-05-04 20:43:44 +00:00
parent 4902cf1f80
commit 649c98a5f7
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gstinfo.c
View file

@ -82,8 +82,8 @@ gst_get_category_name (gint category) {
*/ */
const gchar *_gst_category_colors[32] = { const gchar *_gst_category_colors[32] = {
[GST_CAT_GST_INIT] = "07;37", [GST_CAT_GST_INIT] = "07;37",
[GST_CAT_COTHREADS] = "07;32", [GST_CAT_COTHREADS] = "00;32",
[GST_CAT_COTHREAD_SWITCH] = "01;37;42", [GST_CAT_COTHREAD_SWITCH] = "00;37;42",
[GST_CAT_AUTOPLUG] = "00;34", [GST_CAT_AUTOPLUG] = "00;34",
[GST_CAT_AUTOPLUG_ATTEMPT] = "00;36;44", [GST_CAT_AUTOPLUG_ATTEMPT] = "00;36;44",
[GST_CAT_PARENTAGE] = "01;37;41", // !! [GST_CAT_PARENTAGE] = "01;37;41", // !!

4
gst/gstpad.c
View file

@ -1392,8 +1392,8 @@ gst_pad_pull (GstPad *pad)
GST_DEBUG_ENTER("(%s:%s)",GST_DEBUG_PAD_NAME(pad)); GST_DEBUG_ENTER("(%s:%s)",GST_DEBUG_PAD_NAME(pad));
if (peer->pullfunc) { if (peer->pullfunc) {
GST_DEBUG (GST_CAT_DATAFLOW,"calling pullfunc &%s (@%p) of peer pad %s:%s\n", GST_DEBUG (GST_CAT_DATAFLOW,"calling pullfunc %s of peer pad %s:%s\n",
GST_DEBUG_FUNCPTR_NAME(peer->pullfunc),&peer->pullfunc,GST_DEBUG_PAD_NAME(((GstPad*)peer))); GST_DEBUG_FUNCPTR_NAME(peer->pullfunc),GST_DEBUG_PAD_NAME(peer));
return (peer->pullfunc)(((GstPad*)peer)); return (peer->pullfunc)(((GstPad*)peer));
} else { } else {
GST_DEBUG (GST_CAT_DATAFLOW,"no pullfunc for peer pad %s:%s at %p\n",GST_DEBUG_PAD_NAME(((GstPad*)peer)),&peer->pullfunc); GST_DEBUG (GST_CAT_DATAFLOW,"no pullfunc for peer pad %s:%s at %p\n",GST_DEBUG_PAD_NAME(((GstPad*)peer)),&peer->pullfunc);

25
gst/gstscheduler.c
View file

@ -27,7 +27,7 @@
static int static int
gst_bin_loopfunc_wrapper (int argc,char *argv[]) gst_schedule_loopfunc_wrapper (int argc,char *argv[])
{ {
GstElement *element = GST_ELEMENT (argv); GstElement *element = GST_ELEMENT (argv);
G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element); G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element);
@ -47,7 +47,7 @@ gst_bin_loopfunc_wrapper (int argc,char *argv[])
} }
static int static int
gst_bin_chain_wrapper (int argc,char *argv[]) gst_schedule_chain_wrapper (int argc,char *argv[])
{ {
GstElement *element = GST_ELEMENT (argv); GstElement *element = GST_ELEMENT (argv);
G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element); G_GNUC_UNUSED const gchar *name = GST_ELEMENT_NAME (element);
@ -57,6 +57,7 @@ gst_bin_chain_wrapper (int argc,char *argv[])
GstBuffer *buf; GstBuffer *buf;
GST_DEBUG_ENTER("(\"%s\")",name); GST_DEBUG_ENTER("(\"%s\")",name);
GST_DEBUG (GST_CAT_DATAFLOW,"stepping through pads\n"); GST_DEBUG (GST_CAT_DATAFLOW,"stepping through pads\n");
do { do {
pads = element->pads; pads = element->pads;
@ -81,7 +82,7 @@ gst_bin_chain_wrapper (int argc,char *argv[])
} }
static int static int
gst_bin_src_wrapper (int argc,char *argv[]) gst_schedule_src_wrapper (int argc,char *argv[])
{ {
GstElement *element = GST_ELEMENT (argv); GstElement *element = GST_ELEMENT (argv);
GList *pads; GList *pads;
@ -126,7 +127,7 @@ gst_bin_src_wrapper (int argc,char *argv[])
} }
static void static void
gst_bin_pushfunc_proxy (GstPad *pad, GstBuffer *buf) gst_schedule_pushfunc_proxy (GstPad *pad, GstBuffer *buf)
{ {
GstRealPad *peer = GST_RPAD_PEER(pad); GstRealPad *peer = GST_RPAD_PEER(pad);
@ -156,7 +157,7 @@ gst_bin_pushfunc_proxy (GstPad *pad, GstBuffer *buf)
} }
static GstBuffer* static GstBuffer*
gst_bin_pullfunc_proxy (GstPad *pad) gst_schedule_pullfunc_proxy (GstPad *pad)
{ {
GstBuffer *buf; GstBuffer *buf;
GstRealPad *peer = GST_RPAD_PEER(pad); GstRealPad *peer = GST_RPAD_PEER(pad);
@ -186,7 +187,7 @@ gst_bin_pullfunc_proxy (GstPad *pad)
} }
static GstBuffer* static GstBuffer*
gst_bin_pullregionfunc_proxy (GstPad *pad,GstRegionType type,guint64 offset,guint64 len) gst_schedule_pullregionfunc_proxy (GstPad *pad,GstRegionType type,guint64 offset,guint64 len)
{ {
GstBuffer *buf; GstBuffer *buf;
GstRealPad *peer = GST_RPAD_PEER(pad); GstRealPad *peer = GST_RPAD_PEER(pad);
@ -247,7 +248,7 @@ gst_schedule_cothreaded_chain (GstBin *bin, GstScheduleChain *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_bin_loopfunc_wrapper); wrapper_function = GST_DEBUG_FUNCPTR(gst_schedule_loopfunc_wrapper);
GST_DEBUG (GST_CAT_SCHEDULING,"element '%s' is a loop-based\n",GST_ELEMENT_NAME(element)); GST_DEBUG (GST_CAT_SCHEDULING,"element '%s' is a loop-based\n",GST_ELEMENT_NAME(element));
} else { } else {
// otherwise we need to decide what kind of cothread // otherwise we need to decide what kind of cothread
@ -255,10 +256,10 @@ gst_schedule_cothreaded_chain (GstBin *bin, GstScheduleChain *chain) {
if (!GST_FLAG_IS_SET (element, GST_ELEMENT_DECOUPLED)) { if (!GST_FLAG_IS_SET (element, GST_ELEMENT_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_bin_src_wrapper); wrapper_function = GST_DEBUG_FUNCPTR(gst_schedule_src_wrapper);
GST_DEBUG (GST_CAT_SCHEDULING,"element '%s' is a source, using _src_wrapper\n",GST_ELEMENT_NAME(element)); GST_DEBUG (GST_CAT_SCHEDULING,"element '%s' is a source, using _src_wrapper\n",GST_ELEMENT_NAME(element));
} else { } else {
wrapper_function = GST_DEBUG_FUNCPTR(gst_bin_chain_wrapper); wrapper_function = GST_DEBUG_FUNCPTR(gst_schedule_chain_wrapper);
GST_DEBUG (GST_CAT_SCHEDULING,"element '%s' is a filter, using _chain_wrapper\n",GST_ELEMENT_NAME(element)); GST_DEBUG (GST_CAT_SCHEDULING,"element '%s' is a filter, using _chain_wrapper\n",GST_ELEMENT_NAME(element));
} }
} }
@ -290,11 +291,11 @@ gst_schedule_cothreaded_chain (GstBin *bin, GstScheduleChain *chain) {
} else { } else {
if (gst_pad_get_direction (pad) == GST_PAD_SINK) { if (gst_pad_get_direction (pad) == GST_PAD_SINK) {
GST_DEBUG (GST_CAT_SCHEDULING,"setting cothreaded push proxy for sinkpad %s:%s\n",GST_DEBUG_PAD_NAME(pad)); GST_DEBUG (GST_CAT_SCHEDULING,"setting cothreaded push proxy for sinkpad %s:%s\n",GST_DEBUG_PAD_NAME(pad));
GST_RPAD_PUSHFUNC(pad) = GST_DEBUG_FUNCPTR(gst_bin_pushfunc_proxy); GST_RPAD_PUSHFUNC(pad) = GST_DEBUG_FUNCPTR(gst_schedule_pushfunc_proxy);
} else { } else {
GST_DEBUG (GST_CAT_SCHEDULING,"setting cothreaded pull proxy for srcpad %s:%s\n",GST_DEBUG_PAD_NAME(pad)); GST_DEBUG (GST_CAT_SCHEDULING,"setting cothreaded pull proxy for srcpad %s:%s\n",GST_DEBUG_PAD_NAME(pad));
GST_RPAD_PULLFUNC(pad) = GST_DEBUG_FUNCPTR(gst_bin_pullfunc_proxy); GST_RPAD_PULLFUNC(pad) = GST_DEBUG_FUNCPTR(gst_schedule_pullfunc_proxy);
GST_RPAD_PULLREGIONFUNC(pad) = GST_DEBUG_FUNCPTR(gst_bin_pullregionfunc_proxy); GST_RPAD_PULLREGIONFUNC(pad) = GST_DEBUG_FUNCPTR(gst_schedule_pullregionfunc_proxy);
} }
} }
} }