From: Tim-Philipp Müller Date: Mon, 6 Feb 2006 11:57:52 +0000 (+0000) Subject: tests/check/elements/matroskamux.c: Collectpads in core got changed and now also... X-Git-Tag: 1.19.3~509^2~13069 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=323331a0514009bf47b8a3142e75d9c4a2bcc1d2;p=platform%2Fupstream%2Fgstreamer.git 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. --- diff --git a/ChangeLog b/ChangeLog index 6aada8f..c8d9cdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2006-02-06 Tim-Philipp Müller + * 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 + * 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 6c1ee77..c9d0e81 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; }