diff options
| author | Thiago Santos <thiagoss@osg.samsung.com> | 2015-10-31 17:35:53 -0300 |
|---|---|---|
| committer | Thiago Santos <thiagoss@osg.samsung.com> | 2015-11-01 09:35:38 -0300 |
| commit | f1f78d95562410fdff375616ae28b9d993696a6a (patch) | |
| tree | a70c27ddb01eaca8da4f0fc5a31153c73303cc73 | |
| parent | 9ce57c10744d752880068d471948a575bce2863c (diff) | |
tests: fixes after pad caps query cache additioncaps-cache
The caps query cache adds a new ref to the caps and some tests
were checking the caps refcount
Also push reconfigure for selector tests to force cache cleanup
| -rw-r--r-- | tests/check/gst/gstpad.c | 14 | ||||
| -rw-r--r-- | tests/check/gst/gstutils.c | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/tests/check/gst/gstpad.c b/tests/check/gst/gstpad.c index f74318f92..eee9564b5 100644 --- a/tests/check/gst/gstpad.c +++ b/tests/check/gst/gstpad.c @@ -94,7 +94,7 @@ GST_START_TEST (test_link_unlink_threaded) gst_pad_set_caps (src, caps); gst_pad_set_active (sink, TRUE); gst_pad_set_caps (sink, caps); - ASSERT_CAPS_REFCOUNT (caps, "caps", 3); + ASSERT_CAPS_REFCOUNT (caps, "caps", 5); MAIN_START_THREADS (5, thread_link_unlink, NULL); for (i = 0; i < 1000; ++i) { @@ -104,10 +104,7 @@ GST_START_TEST (test_link_unlink_threaded) } MAIN_STOP_THREADS (); - ASSERT_CAPS_REFCOUNT (caps, "caps", 3); gst_caps_unref (caps); - - ASSERT_CAPS_REFCOUNT (caps, "caps", 2); gst_object_unref (src); gst_object_unref (sink); } @@ -122,9 +119,11 @@ GST_START_TEST (test_refcount) sink = gst_pad_new ("sink", GST_PAD_SINK); fail_if (sink == NULL); + GST_PAD_UNSET_CACHE_CAPS (sink); src = gst_pad_new ("src", GST_PAD_SRC); fail_if (src == NULL); + GST_PAD_UNSET_CACHE_CAPS (src); caps = gst_caps_from_string ("foo/bar"); /* one for me */ @@ -193,7 +192,8 @@ GST_START_TEST (test_get_allowed_caps) gst_pad_set_active (sink, TRUE); /* sink pad is now active and will accept the caps event */ fail_unless (gst_pad_set_caps (sink, caps) == TRUE); - ASSERT_CAPS_REFCOUNT (caps, "caps", 3); + /* 1 for each pad, 1 for our reference */ + ASSERT_CAPS_REFCOUNT (caps, "caps", 5); plr = gst_pad_link (src, sink); fail_unless (GST_PAD_LINK_SUCCESSFUL (plr)); @@ -202,13 +202,12 @@ GST_START_TEST (test_get_allowed_caps) fail_if (gotcaps == NULL); fail_unless (gst_caps_is_equal (gotcaps, caps)); - ASSERT_CAPS_REFCOUNT (gotcaps, "gotcaps", 4); + ASSERT_CAPS_REFCOUNT (gotcaps, "gotcaps", 7); gst_caps_unref (gotcaps); gst_pad_unlink (src, sink); /* cleanup */ - ASSERT_CAPS_REFCOUNT (caps, "caps", 3); ASSERT_OBJECT_REFCOUNT (src, "src", 1); ASSERT_OBJECT_REFCOUNT (sink, "sink", 1); @@ -894,7 +893,6 @@ GST_START_TEST (test_push_linked) /* teardown */ gst_pad_unlink (src, sink); - ASSERT_CAPS_REFCOUNT (caps, "caps", 2); gst_object_unref (src); gst_object_unref (sink); ASSERT_CAPS_REFCOUNT (caps, "caps", 1); diff --git a/tests/check/gst/gstutils.c b/tests/check/gst/gstutils.c index 012a69a45..f2c42eb5c 100644 --- a/tests/check/gst/gstutils.c +++ b/tests/check/gst/gstutils.c @@ -1011,11 +1011,13 @@ GST_START_TEST (test_pad_proxy_query_caps_aggregation) fail_unless (gst_pad_set_caps (sink1_sink, caps)); gst_pad_use_fixed_caps (sink1_sink); gst_caps_unref (caps); + gst_pad_push_event (sink1_sink, gst_event_new_reconfigure ()); caps = gst_caps_new_empty_simple ("bar/ter"); fail_unless (gst_pad_set_caps (sink2_sink, caps)); gst_pad_use_fixed_caps (sink2_sink); gst_caps_unref (caps); + gst_pad_push_event (sink2_sink, gst_event_new_reconfigure ()); caps = gst_pad_query_caps (tee_sink, NULL); GST_INFO ("got caps: %" GST_PTR_FORMAT, caps); @@ -1029,6 +1031,7 @@ GST_START_TEST (test_pad_proxy_query_caps_aggregation) fail_unless (gst_pad_set_caps (sink2_sink, caps)); gst_pad_use_fixed_caps (sink2_sink); gst_caps_unref (caps); + gst_pad_push_event (sink2_sink, gst_event_new_reconfigure ()); caps = gst_pad_query_caps (tee_sink, NULL); GST_INFO ("got caps: %" GST_PTR_FORMAT, caps); |