diff options
author | Tim-Philipp Müller <tim@centricular.net> | 2006-02-06 11:57:52 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2006-02-06 11:57:52 +0000 |
commit | 323331a0514009bf47b8a3142e75d9c4a2bcc1d2 (patch) | |
tree | 0882a79d6b7d5450c54e893e60574bde23b7453b | |
parent | 6f224b2556903b2205188508feadaaca286da9bd (diff) |
tests/check/elements/matroskamux.c: Collectpads in core got changed and now also holds a reference to any pad that is...
Original commit message from CVS:
* tests/check/elements/matroskamux.c: (setup_src_pad):
Collectpads in core got changed and now also holds a
reference to any pad that is part of it. Fix refcount
checks in test case accordingly.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | tests/check/elements/matroskamux.c | 7 |
2 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2006-02-06 Tim-Philipp Müller <tim at centricular dot net> + * tests/check/elements/matroskamux.c: (setup_src_pad): + Collectpads in core got changed and now also holds a + reference to any pad that is part of it. Fix refcount + checks in test case accordingly. + +2006-02-06 Tim-Philipp Müller <tim at centricular dot net> + * gst/apetag/gstapedemux.h: Fix include, for now GstTagDemux is in the apetag dir. diff --git a/tests/check/elements/matroskamux.c b/tests/check/elements/matroskamux.c index 6c1ee77a..c9d0e814 100644 --- a/tests/check/elements/matroskamux.c +++ b/tests/check/elements/matroskamux.c @@ -69,13 +69,16 @@ setup_src_pad (GstElement * element, sinkpad = gst_element_get_pad (element, "audio_%d"); fail_if (sinkpad == NULL, "Could not get sink pad from %s", GST_ELEMENT_NAME (element)); - ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 2); + /* references are owned by: 1) us, 2) matroskamux, 3) collect pads */ + ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 3); if (caps) fail_unless (gst_pad_set_caps (srcpad, caps)); fail_unless (gst_pad_link (srcpad, sinkpad) == GST_PAD_LINK_OK, "Could not link source and %s sink pads", GST_ELEMENT_NAME (element)); gst_object_unref (sinkpad); /* because we got it higher up */ - ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 1); + + /* references are owned by: 1) matroskamux, 2) collect pads */ + ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 2); return srcpad; } |