diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-05-15 10:54:56 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-05-15 10:56:20 +0200 |
| commit | 71c131b63c86cae3df53c9e31a7e2c94d0f3fcb1 (patch) | |
| tree | 4ede4c5f95d5f2107e3c66cc3aedc0b02822a5be | |
| parent | 3de73279dfa9abb7c858bb48fc835cf9fb45d479 (diff) | |
| download | gstreamer-plugins-bad-71c131b63c86cae3df53c9e31a7e2c94d0f3fcb1.tar.gz | |
asfmux: Fix event handling in unit test
| -rw-r--r-- | tests/check/elements/asfmux.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/check/elements/asfmux.c b/tests/check/elements/asfmux.c index 91ae0396c..3c8084520 100644 --- a/tests/check/elements/asfmux.c +++ b/tests/check/elements/asfmux.c @@ -57,7 +57,7 @@ static GstStaticPadTemplate srcaudiotemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstPad * setup_src_pad (GstElement * element, - GstStaticPadTemplate * template, GstCaps * caps, const gchar * sinkname) + GstStaticPadTemplate * template, const gchar * sinkname) { GstPad *srcpad, *sinkpad; @@ -73,8 +73,6 @@ setup_src_pad (GstElement * element, GST_ELEMENT_NAME (element)); /* references are owned by: 1) us, 2) asfmux, 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 */ @@ -127,7 +125,7 @@ setup_asfmux (GstStaticPadTemplate * srctemplate, const gchar * sinkname) GST_DEBUG ("setup_asfmux"); asfmux = gst_check_setup_element ("asfmux"); - mysrcpad = setup_src_pad (asfmux, srctemplate, NULL, sinkname); + mysrcpad = setup_src_pad (asfmux, srctemplate, sinkname); mysinkpad = gst_check_setup_sink_pad (asfmux, &sinktemplate); gst_pad_set_active (mysrcpad, TRUE); gst_pad_set_active (mysinkpad, TRUE); @@ -163,7 +161,7 @@ check_asfmux_pad (GstStaticPadTemplate * srctemplate, inbuffer = gst_buffer_new_and_alloc (1); caps = gst_caps_from_string (src_caps_string); - gst_pad_set_caps (mysrcpad, caps); + gst_check_setup_events (mysrcpad, asfmux, caps, GST_FORMAT_TIME); gst_caps_unref (caps); GST_BUFFER_TIMESTAMP (inbuffer) = 0; ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1); |