diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2008-10-27 10:33:20 +0000 | 
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2008-10-27 10:33:20 +0000 | 
| commit | 2e24acaa5bb92ab3833b789c34796d9c1ef870ce (patch) | |
| tree | 75fca81ffeb51955d49a8eb70b45ba752bff4d99 | |
| parent | af1a12033d94712d219aea9deb2f0633dd302df6 (diff) | |
tests/check/elements/icydemux.c: Add some refcount check
Original commit message from CVS:
* tests/check/elements/icydemux.c: (icydemux_found_pad):
Add some refcount check
* tests/check/elements/rtp-payloading.c: (rtp_pipeline_run):
Don't ignore the result of write(), fixes a  compiler warning for me.
* tests/icles/videobox-test.c: (main):
Make the output a little more pretty.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | tests/check/elements/icydemux.c | 8 | ||||
| -rw-r--r-- | tests/check/elements/rtp-payloading.c | 4 | ||||
| -rw-r--r-- | tests/icles/videobox-test.c | 2 | 
4 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,14 @@ +2008-10-27  Wim Taymans  <wim.taymans@collabora.co.uk> + +	* tests/check/elements/icydemux.c: (icydemux_found_pad): +	Add some refcount check + +	* tests/check/elements/rtp-payloading.c: (rtp_pipeline_run): +	Don't ignore the result of write(), fixes a  compiler warning for me. + +	* tests/icles/videobox-test.c: (main): +	Make the output a little more pretty. +  2008-10-27  Stefan Kost  <ensonic@users.sf.net>  	* ext/esd/esdmon.c: diff --git a/tests/check/elements/icydemux.c b/tests/check/elements/icydemux.c index 9cfe3aae..e1686c8a 100644 --- a/tests/check/elements/icydemux.c +++ b/tests/check/elements/icydemux.c @@ -75,6 +75,8 @@ typefind_succeed (GstTypeFind * tf, gpointer private)  static void  icydemux_found_pad (GstElement * src, GstPad * pad, gpointer data)  { +  GST_DEBUG ("got new pad %" GST_PTR_FORMAT, pad); +    /* Turns out that this asserts a refcount which is wrong for this     * case (adding the pad from a pad-added callback), so just do the same     * thing inline... */ @@ -84,6 +86,12 @@ icydemux_found_pad (GstElement * src, GstPad * pad, gpointer data)    srcpad = gst_element_get_static_pad (icydemux, "src");    fail_if (srcpad == NULL, "Failed to get srcpad from icydemux");    gst_pad_set_chain_function (sinkpad, gst_check_chain_func); + +  GST_DEBUG ("checking srcpad %p refcount", srcpad); +  /* 1 from element, 1 from signal, 1 from us */ +  ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 3); + +  GST_DEBUG ("linking srcpad");    fail_unless (gst_pad_link (srcpad, sinkpad) == GST_PAD_LINK_OK,        "Failed to link pads");    gst_object_unref (srcpad); diff --git a/tests/check/elements/rtp-payloading.c b/tests/check/elements/rtp-payloading.c index 67060440..92fa875f 100644 --- a/tests/check/elements/rtp-payloading.c +++ b/tests/check/elements/rtp-payloading.c @@ -251,12 +251,14 @@ rtp_pipeline_run (rtp_pipeline * p)    for (i = 0; i < LOOP_COUNT; i++) {      const char *frame_data_pointer = p->frame_data; +    int res;      int frame_count = p->frame_count;      /* Write in to the pipe. */      while (frame_count > 0) { -      write (p->fd[1], frame_data_pointer, p->frame_data_size); +      res = write (p->fd[1], frame_data_pointer, p->frame_data_size); +        frame_data_pointer += p->frame_data_size;        frame_count--;      } diff --git a/tests/icles/videobox-test.c b/tests/icles/videobox-test.c index 708439ab..49697df9 100644 --- a/tests/icles/videobox-test.c +++ b/tests/icles/videobox-test.c @@ -85,7 +85,7 @@ main (int argc, char **argv)      ldir = rdir = 10;      for (round = 0; round < MAX_ROUND; round++) { -      g_print ("box to %d %d %d %d (%d/%d)   \r", top, bottom, left, right, +      g_print ("box to %4d %4d %4d %4d (%d/%d)   \r", top, bottom, left, right,            round, MAX_ROUND);        g_object_set (box, "top", top, "bottom", bottom, "left", left, "right",  | 
