From 4852eda85a58ce440b62772070c2ce3166a8b942 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Fri, 28 Apr 2006 18:48:38 +0000 Subject: [PATCH] libs/gst/base/: more detailed debug and formatting cleanup Original commit message from CVS: * libs/gst/base/gstbasesink.c: (gst_base_sink_event): * libs/gst/base/gstcollectpads.c: (gst_collect_pads_base_init), (gst_collect_pads_is_collected), (gst_collect_pads_event): more detailed debug and formatting cleanup --- ChangeLog | 7 +++++++ libs/gst/base/gstbasesink.c | 3 ++- libs/gst/base/gstcollectpads.c | 24 +++++++++++++----------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c4908a..255b43f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2006-04-28 Stefan Kost + * libs/gst/base/gstbasesink.c: (gst_base_sink_event): + * libs/gst/base/gstcollectpads.c: (gst_collect_pads_base_init), + (gst_collect_pads_is_collected), (gst_collect_pads_event): + more detailed debug and formatting cleanup + +2006-04-28 Stefan Kost + * gst/gstutils.c: (gst_element_link_pads): cleanup double code diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index cd9ff3d..4f8ef37 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -1707,7 +1707,8 @@ gst_base_sink_event (GstPad * pad, GstEvent * event) bclass = GST_BASE_SINK_GET_CLASS (basesink); - GST_DEBUG_OBJECT (basesink, "event %p", event); + GST_DEBUG_OBJECT (basesink, "event %p (%s)", event, + GST_EVENT_TYPE_NAME (event)); switch (GST_EVENT_TYPE (event)) { case GST_EVENT_EOS: diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c index b5026b9..3fe515c 100644 --- a/libs/gst/base/gstcollectpads.c +++ b/libs/gst/base/gstcollectpads.c @@ -74,16 +74,16 @@ GST_DEBUG_CATEGORY_STATIC (collect_pads_debug); #define GST_CAT_DEFAULT collect_pads_debug -GST_BOILERPLATE (GstCollectPads, gst_collect_pads, GstObject, GST_TYPE_OBJECT) +GST_BOILERPLATE (GstCollectPads, gst_collect_pads, GstObject, GST_TYPE_OBJECT); - static GstFlowReturn gst_collect_pads_chain (GstPad * pad, - GstBuffer * buffer); - static gboolean gst_collect_pads_event (GstPad * pad, GstEvent * event); - static void gst_collect_pads_finalize (GObject * object); - static void gst_collect_pads_init (GstCollectPads * pads, +static GstFlowReturn gst_collect_pads_chain (GstPad * pad, GstBuffer * buffer); +static gboolean gst_collect_pads_event (GstPad * pad, GstEvent * event); +static void gst_collect_pads_finalize (GObject * object); +static void gst_collect_pads_init (GstCollectPads * pads, GstCollectPadsClass * g_class); - static void gst_collect_pads_base_init (gpointer g_class) +static void +gst_collect_pads_base_init (gpointer g_class) { GST_DEBUG_CATEGORY_INIT (collect_pads_debug, "collectpads", 0, "GstCollectPads"); @@ -638,7 +638,9 @@ gst_collect_pads_is_collected (GstCollectPads * pads, GstFlowReturn * ret) /* We call the collected function as long as our condition matches. FIXME: should we error out if the collect function did not pop anything ? we can get a busy loop here if the element does not pop from the collect - function */ + function + FIXME: Shouldn't we also check gst_pad_is_blocked () somewhere + */ while (((pads->queuedpads + pads->eospads) >= pads->numpads) && pads->func) { GST_DEBUG ("All active pads (%d) have data, calling %s", pads->numpads, GST_DEBUG_FUNCPTR_NAME (pads->func)); @@ -652,7 +654,7 @@ gst_collect_pads_is_collected (GstCollectPads * pads, GstFlowReturn * ret) beach: if (!res) { - GST_DEBUG ("Not all active pads have data, continuing"); + GST_DEBUG ("Not all active pads (%d) have data, continuing", pads->numpads); } if (ret) { @@ -739,8 +741,8 @@ gst_collect_pads_event (GstPad * pad, GstEvent * event) data->abidata.ABI.new_segment = TRUE; - /* We eat this event */ - gst_event_unref (event); + /* forward to src-pad, sink-elements like to get the event */ + gst_pad_event_default (pad, event); return TRUE; } default: -- 2.7.4