From 33b5172822a6a5c3c4810952de569ea55f41db22 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 21 May 2010 18:16:07 +0100 Subject: [PATCH] videorate: pass object to logging functions, use GST_DEBUG_FUNCPTR --- gst/videorate/gstvideorate.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/gst/videorate/gstvideorate.c b/gst/videorate/gstvideorate.c index fe04dc6..0aaf069 100644 --- a/gst/videorate/gstvideorate.c +++ b/gst/videorate/gstvideorate.c @@ -196,7 +196,7 @@ gst_video_rate_class_init (GstVideoRateClass * klass) "Don't produce buffers before the first one we receive", DEFAULT_SKIP_TO_FIRST, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - element_class->change_state = gst_video_rate_change_state; + element_class->change_state = GST_DEBUG_FUNCPTR (gst_video_rate_change_state); } /* return the caps that can be used on out_pad given in_caps on in_pad */ @@ -279,7 +279,7 @@ gst_video_rate_setcaps (GstPad * pad, GstCaps * caps) videorate = GST_VIDEO_RATE (gst_pad_get_parent (pad)); - GST_DEBUG ("setcaps called %" GST_PTR_FORMAT, caps); + GST_DEBUG_OBJECT (pad, "setcaps called %" GST_PTR_FORMAT, caps); structure = gst_caps_get_structure (caps, 0); if (!gst_structure_get_fraction (structure, "framerate", @@ -317,15 +317,15 @@ gst_video_rate_setcaps (GstPad * pad, GstCaps * caps) /* see what the peer can do */ peercaps = gst_pad_get_caps (opeer); - GST_DEBUG ("icaps %" GST_PTR_FORMAT, peercaps); - GST_DEBUG ("transform %" GST_PTR_FORMAT, transform); + GST_DEBUG_OBJECT (opeer, "icaps %" GST_PTR_FORMAT, peercaps); + GST_DEBUG_OBJECT (videorate, "transform %" GST_PTR_FORMAT, transform); /* filter against our possibilities */ caps = gst_caps_intersect (peercaps, transform); gst_caps_unref (peercaps); gst_caps_unref (transform); - GST_DEBUG ("intersect %" GST_PTR_FORMAT, caps); + GST_DEBUG_OBJECT (videorate, "intersect %" GST_PTR_FORMAT, caps); /* take first possibility */ gst_caps_truncate (caps); @@ -354,7 +354,7 @@ gst_video_rate_setcaps (GstPad * pad, GstCaps * caps) done: /* After a setcaps, our caps may have changed. In that case, we can't use * the old buffer, if there was one (it might have different dimensions) */ - GST_DEBUG ("swapping old buffers"); + GST_DEBUG_OBJECT (videorate, "swapping old buffers"); gst_video_rate_swap_prev (videorate, NULL, GST_CLOCK_TIME_NONE); gst_object_unref (videorate); @@ -376,7 +376,7 @@ no_transform: static void gst_video_rate_reset (GstVideoRate * videorate) { - GST_DEBUG ("resetting internal variables"); + GST_DEBUG_OBJECT (videorate, "resetting internal variables"); videorate->in = 0; videorate->out = 0; @@ -394,20 +394,26 @@ gst_video_rate_reset (GstVideoRate * videorate) static void gst_video_rate_init (GstVideoRate * videorate, GstVideoRateClass * klass) { - GST_DEBUG ("gst_video_rate_init"); videorate->sinkpad = gst_pad_new_from_static_template (&gst_video_rate_sink_template, "sink"); - gst_pad_set_event_function (videorate->sinkpad, gst_video_rate_event); - gst_pad_set_chain_function (videorate->sinkpad, gst_video_rate_chain); - gst_pad_set_getcaps_function (videorate->sinkpad, gst_video_rate_getcaps); - gst_pad_set_setcaps_function (videorate->sinkpad, gst_video_rate_setcaps); + gst_pad_set_event_function (videorate->sinkpad, + GST_DEBUG_FUNCPTR (gst_video_rate_event)); + gst_pad_set_chain_function (videorate->sinkpad, + GST_DEBUG_FUNCPTR (gst_video_rate_chain)); + gst_pad_set_getcaps_function (videorate->sinkpad, + GST_DEBUG_FUNCPTR (gst_video_rate_getcaps)); + gst_pad_set_setcaps_function (videorate->sinkpad, + GST_DEBUG_FUNCPTR (gst_video_rate_setcaps)); gst_element_add_pad (GST_ELEMENT (videorate), videorate->sinkpad); videorate->srcpad = gst_pad_new_from_static_template (&gst_video_rate_src_template, "src"); - gst_pad_set_query_function (videorate->srcpad, gst_video_rate_query); - gst_pad_set_getcaps_function (videorate->srcpad, gst_video_rate_getcaps); - gst_pad_set_setcaps_function (videorate->srcpad, gst_video_rate_setcaps); + gst_pad_set_query_function (videorate->srcpad, + GST_DEBUG_FUNCPTR (gst_video_rate_query)); + gst_pad_set_getcaps_function (videorate->srcpad, + GST_DEBUG_FUNCPTR (gst_video_rate_getcaps)); + gst_pad_set_setcaps_function (videorate->srcpad, + GST_DEBUG_FUNCPTR (gst_video_rate_setcaps)); gst_element_add_pad (GST_ELEMENT (videorate), videorate->srcpad); gst_video_rate_reset (videorate); -- 2.7.4