mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-10 10:04:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/base/: more detailed debug and formatting cleanup

Browse source 
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
This commit is contained in:
Stefan Kost 2006-04-28 18:48:38 +00:00
parent ef6f8ef784
commit 4852eda85a
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-04-28 Stefan Kost <ensonic@users.sf.net>
* 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 <ensonic@users.sf.net>
* gst/gstutils.c: (gst_element_link_pads):

3
libs/gst/base/gstbasesink.c
View file

@ -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:

24
libs/gst/base/gstcollectpads.c
View file

@ -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: