From 7958cf82abda2fa6e0de28a16f39480ce498d299 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Thu, 8 Jan 2009 15:56:46 +0000 Subject: gst/matroska/: Some cleanups, refactoring and minor enhancements in caps handling. Original commit message from CVS: * gst/matroska/matroska-demux.c: (gst_matroska_demux_video_caps): * gst/matroska/matroska-mux.c: (gst_matroska_mux_video_pad_setcaps): Some cleanups, refactoring and minor enhancements in caps handling. * gst/matroska/matroska-mux.c: (gst_matroska_mux_class_init), (gst_matroska_mux_init), (gst_matroska_pad_reset), (gst_matroska_pad_free), (gst_matroska_mux_reset), (gst_matroska_mux_video_pad_setcaps), (gst_matroska_mux_request_new_pad): * tests/check/elements/matroskamux.c: (teardown_src_pad): Only remove, release or reset what is appropriate upon state change. --- tests/check/elements/matroskamux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/check') diff --git a/tests/check/elements/matroskamux.c b/tests/check/elements/matroskamux.c index 0ec45180..5eb924fd 100644 --- a/tests/check/elements/matroskamux.c +++ b/tests/check/elements/matroskamux.c @@ -93,13 +93,14 @@ teardown_src_pad (GstElement * element) /* clean up floating src pad */ if (!(sinkpad = gst_element_get_static_pad (element, "audio_0"))) sinkpad = gst_element_get_request_pad (element, "audio_0"); - ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 2); + /* references are owned by: 1) us, 2) matroskamux, 3) collect pads */ + ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 3); srcpad = gst_pad_get_peer (sinkpad); gst_pad_unlink (srcpad, sinkpad); - /* pad refs held by both creator and this function (through _get) */ - ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 2); + /* references are owned by: 1) us, 2) matroskamux, 3) collect pads */ + ASSERT_OBJECT_REFCOUNT (sinkpad, "sinkpad", 3); gst_object_unref (sinkpad); /* one more ref is held by element itself */ -- cgit