From: Mathieu Duponchelle Date: Tue, 8 Jul 2014 20:54:31 +0000 (+0200) Subject: tests: Use compositor instead of videomixer X-Git-Tag: 1.19.3~493^2~1451 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7e7b047d0d42d833e5728d939fb219263d2f25b;p=platform%2Fupstream%2Fgstreamer.git tests: Use compositor instead of videomixer Co-Authored by: Thibault Saunier --- diff --git a/tests/check/gnl/gnloperation.c b/tests/check/gnl/gnloperation.c index 4af443c..86e0408 100644 --- a/tests/check/gnl/gnloperation.c +++ b/tests/check/gnl/gnloperation.c @@ -530,7 +530,7 @@ GST_START_TEST (test_complex_operations) */ oper = - new_operation ("oper", "videomixer", 2 * GST_SECOND, 2 * GST_SECOND, 1); + new_operation ("oper", "compositor", 2 * GST_SECOND, 2 * GST_SECOND, 1); fail_if (oper == NULL); ASSERT_OBJECT_REFCOUNT (source1, "source1", 1); @@ -587,7 +587,7 @@ GST_START_TEST (test_complex_operations_bis) * ---------------------------------------------------------------------------- * [ ......................[------ oper ----------]..........] | 1 EXPANDABLE * [--------------------- source1 ----------------] | 2 - * [------------ source2 ------] | 3 + * [------------ source2 ------------] | 3 * */ @@ -622,7 +622,7 @@ GST_START_TEST (test_complex_operations_bis) */ oper = - new_operation ("oper", "videomixer", 2 * GST_SECOND, 2 * GST_SECOND, 1); + new_operation ("oper", "compositor", 2 * GST_SECOND, 2 * GST_SECOND, 1); fail_if (oper == NULL); g_object_set (oper, "expandable", TRUE, NULL); @@ -684,12 +684,12 @@ gnonlin_suite (void) tcase_add_test (tc_chain, test_pyramid_operations); tcase_add_test (tc_chain, test_pyramid_operations2); tcase_add_test (tc_chain, test_pyramid_operations_expandable); - if (gst_registry_check_feature_version (gst_registry_get (), "videomixer", 0, + if (gst_registry_check_feature_version (gst_registry_get (), "compositor", 0, 11, 0)) { tcase_add_test (tc_chain, test_complex_operations); tcase_add_test (tc_chain, test_complex_operations_bis); } else - GST_WARNING ("videomixer element not available, skipping 1 test"); + GST_WARNING ("compositor element not available, skipping 1 test"); return s; }